JAL-3199 promote sortAnnotations to AlignmentViewPanel

diff --git a/src/jalview/api/AlignmentViewPanel.java b/src/jalview/api/AlignmentViewPanel.java
index 0b1ca21..8918944 100644 (file)
--- a/src/jalview/api/AlignmentViewPanel.java
+++ b/src/jalview/api/AlignmentViewPanel.java
@@ -63,4 +63,11 @@ public interface AlignmentViewPanel extends OOMHandlerI
    * @return displayed name for the view
    */
   String getViewName();
+
+  /**
+   * Sorts annotations according to currently selected preferences. Does nothing
+   * if currently set to 'Custom' (manual) ordering, so as not to trash user
+   * customised annotation ordering.
+   */
+  void sortAnnotations();
 }

diff --git a/src/jalview/appletgui/AlignmentPanel.java b/src/jalview/appletgui/AlignmentPanel.java
index e9081b0..25974d4 100644 (file)
--- a/src/jalview/appletgui/AlignmentPanel.java
+++ b/src/jalview/appletgui/AlignmentPanel.java
@@ -1157,4 +1157,9 @@ public class AlignmentPanel extends Panel
 
   }
 
+  @Override
+  public void sortAnnotations()
+  {
+  }
+
 }

diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java
index c606b9f..aba1e3d 100644 (file)
--- a/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@ -825,7 +825,8 @@ public class AlignmentPanel extends GAlignmentPanel implements
    * Sorts annotations according to currently selected preferences. Does nothing
    * if currently set to 'Custom' (manual) ordering.
    */
-  void sortAnnotations()
+  @Override
+  public void sortAnnotations()
   {
     SequenceAnnotationOrder sortBy = av.getSortAnnotationsBy();
     if (sortBy != SequenceAnnotationOrder.CUSTOM)