JAL-1152 with sticky annotation sort order that updates as sequences are

[jalview.git] / src / jalview / gui / AlignFrame.java

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index a048721..a50776e 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -23,7 +23,7 @@ package jalview.gui;
 import jalview.analysis.AAFrequency;
 import jalview.analysis.AlignmentSorter;
 import jalview.analysis.AlignmentUtils;
-import jalview.analysis.AnnotationSorter;
+import jalview.analysis.AnnotationSorter.SortOrder;
 import jalview.analysis.Conservation;
 import jalview.analysis.CrossRef;
 import jalview.analysis.NJTree;
@@ -5782,23 +5782,13 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
     this.alignPanel.paintAlignment(true);
   }
 
+  /**
+   * Store selected annotation sort order for the view and repaint.
+   */
   @Override
-  protected void sortAnnotationsByType_actionPerformed()
-  {
-    AnnotationSorter sorter = new AnnotationSorter(
-            this.alignPanel.getAlignment());
-    sorter.sortByTypeAndSequence(this.alignPanel.getAlignment()
-            .getAlignmentAnnotation());
-    alignPanel.updateAnnotation(applyAutoAnnotationSettings.getState());
-  }
-
-  @Override
-  protected void sortAnnotationsBySequence_actionPerformed()
+  protected void sortAnnotations_actionPerformed(SortOrder sortOrder)
   {
-    AnnotationSorter sorter = new AnnotationSorter(
-            this.alignPanel.getAlignment());
-    sorter.sortBySequenceAndType(this.alignPanel.getAlignment()
-            .getAlignmentAnnotation());
+    this.alignPanel.av.setSortAnnotationsBy(sortOrder);
     alignPanel.updateAnnotation(applyAutoAnnotationSettings.getState());
   }
 }