JAL-3081 restore annotation ordering from project (work in progress)

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

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index e3c42a7..092cf47 100644 (file)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -5442,7 +5442,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
    * Sorts annotations and repaints the alignment
    */
   @Override
-  protected void sortAnnotations()
+  public void sortAnnotations()
   {
     alignPanel.sortAnnotations();
     alignPanel.paintAlignment(false, false);
@@ -5673,13 +5673,19 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener,
 
   }
 
+  /**
+   * Sets the flag for whether auto-calculated annotations should be shown above
+   * other annotations. If the given value is the same as the current setting,
+   * simply returns false. Otherwise updates the setting, and returns true. If
+   * annotation sort order is currently set to 'Custom', this is changed to
+   * 'None', because 'Custom' ordering ignores all sort options.
+   */
   @Override
-  protected boolean setShowAutoCalculatedAbove(
-          boolean showAutoCalculatedAbove)
+  public boolean setShowAutoCalculatedAbove(boolean b)
   {
-    if (viewport.isShowAutocalculatedAbove() != showAutoCalculatedAbove)
+    if (viewport.isShowAutocalculatedAbove() != b)
     {
-      viewport.setShowAutocalculatedAbove(showAutoCalculatedAbove);
+      viewport.setShowAutocalculatedAbove(b);
 
       /*
        * change CUSTOM annotation ordering to NONE