Fix sort numerical annotations at popup menu. Fix #146

jordeu · jordeu · commit 99fa7140560f · 2014-08-25T15:39:56.000+02:00
diff --git a/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapDecoratorHeader.java b/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapDecoratorHeader.java
@@ -183,6 +183,11 @@ public Function<String, String> getIdentifierTransform() {
         return new AnnotationFunction(sortLabel, getHeatmapDimension().getAnnotations());
     }
 
+    @Override
+    public String getAnnotationPattern() {
+        return "${" + getSortLabel() + "}";
+    }
+
     public String getSortLabel() {
         return sortLabel;
     }
diff --git a/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapTextLabelsHeader.java b/org.gitools.heatmap/src/main/java/org/gitools/heatmap/header/HeatmapTextLabelsHeader.java
@@ -132,6 +132,11 @@ public void setLabelPattern(String pattern) {
         firePropertyChange(LABEL_PATTERN_CHANGED, old, pattern);
     }
 
+    @Override
+    public String getAnnotationPattern() {
+        return "${" + getLabelAnnotation() + "}";
+    }
+
     @Override
     public void populateDetails(List<DetailsDecoration> details, String identifier, boolean selected) {
         String value = (identifier == null ? "None" : getIdentifierTransform().apply(identifier));
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/data/SortByHeaderAction.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/data/SortByHeaderAction.java
@@ -68,7 +68,7 @@ public void run(IProgressMonitor monitor) {
                 MatrixViewSorter.sortByLabel(dimension,
                         header.isSortAscending() ? ASCENDING : DESCENDING,
                         header.getAnnotationPattern(),
-                        false);
+                        header instanceof HeatmapDecoratorHeader);
                 header.setSortAscending(!header.isSortAscending());
 
             }

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,11 @@ public Function<String, String> getIdentifierTransform() {`
`183`	`183`	`return new AnnotationFunction(sortLabel, getHeatmapDimension().getAnnotations());`
`184`	`184`	`}`
`185`	`185`
	`186`	`+ @Override`
	`187`	`+ public String getAnnotationPattern() {`
	`188`	`+ return "${" + getSortLabel() + "}";`
	`189`	`+ }`
	`190`	`+`
`186`	`191`	`public String getSortLabel() {`
`187`	`192`	`return sortLabel;`
`188`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void run(IProgressMonitor monitor) {`
`68`	`68`	`MatrixViewSorter.sortByLabel(dimension,`
`69`	`69`	`header.isSortAscending() ? ASCENDING : DESCENDING,`
`70`	`70`	`header.getAnnotationPattern(),`
`71`		`- false);`
	`71`	`+ header instanceof HeatmapDecoratorHeader);`
`72`	`72`	`header.setSortAscending(!header.isSortAscending());`
`73`	`73`
`74`	`74`	`}`