JAL-3081 autocalculated annotation first/last leaves others unchanged

[jalview.git] / src / jalview / analysis / AnnotationSorter.java

diff --git a/src/jalview/analysis/AnnotationSorter.java b/src/jalview/analysis/AnnotationSorter.java
index 2f556f1..f16d9ea 100644 (file)
--- a/src/jalview/analysis/AnnotationSorter.java
+++ b/src/jalview/analysis/AnnotationSorter.java
@@ -38,7 +38,6 @@ import java.util.Map;
  */
 public class AnnotationSorter
 {
-
   /**
    * enum for annotation sort options. The text description is used in the
    * Preferences drop-down options. The enum name is saved in the preferences
@@ -51,7 +50,12 @@ public class AnnotationSorter
   {
     // Text descriptions surface in the Preferences Sort by... options
     SEQUENCE_AND_LABEL("Sequence"), LABEL_AND_SEQUENCE("Label"),
-    NONE("No sort");
+    NONE("No sort"),
+
+    /**
+     * custom is set if user drags to reorder annotations
+     */
+    CUSTOM("Customised");
 
     private String description;
 
@@ -86,7 +90,11 @@ public class AnnotationSorter
   private boolean showAutocalcAbove;
 
   // working map of sequence index in alignment
-  private final Map<SequenceI, Integer> sequenceIndices = new HashMap<SequenceI, Integer>();
+  private final Map<SequenceI, Integer> sequenceIndices = new HashMap<>();
+
+  // if true, sort only repositions auto-calculated annotation (to top or
+  // bottom)
+  private final boolean autocalcOnly;
 
   /**
    * Constructor given an alignment and the location (top or bottom) of
@@ -94,12 +102,14 @@ public class AnnotationSorter
    * 
    * @param alignmentI
    * @param showAutocalculatedAbove
+   * @param autoCalcOnly
    */
   public AnnotationSorter(AlignmentI alignmentI,
-          boolean showAutocalculatedAbove)
+          boolean showAutocalculatedAbove, boolean autoCalcOnly)
   {
     this.alignment = alignmentI;
     this.showAutocalcAbove = showAutocalculatedAbove;
+    this.autocalcOnly = autoCalcOnly;
   }
 
   /**
@@ -154,6 +164,10 @@ public class AnnotationSorter
       {
         return showAutocalcAbove ? 1 : -1;
       }
+      if (autocalcOnly)
+      {
+        return 0; // don't reorder other annotations
+      }
       int sequenceOrder = compareSequences(o1, o2);
       return sequenceOrder == 0 ? compareLabels(o1, o2) : sequenceOrder;
     }
@@ -216,6 +230,10 @@ public class AnnotationSorter
       {
         return showAutocalcAbove ? 1 : -1;
       }
+      if (autocalcOnly)
+      {
+        return 0; // don't reorder other annotations
+      }
       int labelOrder = compareLabels(o1, o2);
       return labelOrder == 0 ? compareSequences(o1, o2) : labelOrder;
     }
@@ -273,12 +291,20 @@ public class AnnotationSorter
   public void sort(AlignmentAnnotation[] alignmentAnnotations,
           SequenceAnnotationOrder order)
   {
-    if (alignmentAnnotations == null)
+    if (alignmentAnnotations == null
+            || order == SequenceAnnotationOrder.CUSTOM)
     {
       return;
     }
-    // cache 'alignment sequence position' for the annotations
-    saveSequenceIndices(alignmentAnnotations);
+
+    /*
+     * cache 'alignment sequence positions' if required for sorting
+     */
+    if (order == SequenceAnnotationOrder.SEQUENCE_AND_LABEL
+            || order == SequenceAnnotationOrder.LABEL_AND_SEQUENCE)
+    {
+      saveSequenceIndices(alignmentAnnotations);
+    }
 
     Comparator<? super AlignmentAnnotation> comparator = getComparator(
             order);
@@ -303,13 +329,19 @@ public class AnnotationSorter
           AlignmentAnnotation[] alignmentAnnotations)
   {
     sequenceIndices.clear();
+
+    Map<SequenceI, Integer> seqPositions = alignment.getSequencePositions();
+
     for (AlignmentAnnotation ann : alignmentAnnotations)
     {
       SequenceI seq = ann.sequenceRef;
       if (seq != null)
       {
-        int index = AlignmentUtils.getSequenceIndex(alignment, seq);
-        sequenceIndices.put(seq, index);
+        Integer index = seqPositions.get(seq);
+        if (index != null)
+        {
+          sequenceIndices.put(seq, index);
+        }
       }
     }
   }
@@ -373,7 +405,7 @@ public class AnnotationSorter
 
   /**
    * Comparison based on position of associated sequence (if any) in the
-   * alignment. Returns zero if either argument is null.
+   * alignment
    * 
    * @param o1
    * @param o2
@@ -388,8 +420,9 @@ public class AnnotationSorter
     {
       return 0;
     }
+
     /*
-     * Sort non-sequence-related before or after sequence-related.
+     * Sort non-sequence-related before or after sequence-related
      */
     if (seq1 == null)
     {
@@ -399,21 +432,20 @@ public class AnnotationSorter
     {
       return showAutocalcAbove ? 1 : -1;
     }
-    // get sequence index - but note -1 means 'at end' so needs special handling
-    int index1 = sequenceIndices.get(seq1);
-    int index2 = sequenceIndices.get(seq2);
-    if (index1 == index2)
-    {
-      return 0;
-    }
-    if (index1 == -1)
+
+    /*
+     * else sort by associated sequence position
+     */
+    Integer index1 = sequenceIndices.get(seq1);
+    Integer index2 = sequenceIndices.get(seq2);
+    if (index1 == null)
     {
-      return -1;
+      return index2 == null ? 0 : -1;
     }
-    if (index2 == -1)
+    if (index2 == null)
     {
       return 1;
     }
-    return Integer.compare(index1, index2);
+    return Integer.compare(index1.intValue(), index2.intValue());
   }
 }