Merge branch 'develop' into spike/JAL-4047/JAL-4048_columns_in_sequenceID

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

diff --git a/src/jalview/analysis/AnnotationSorter.java b/src/jalview/analysis/AnnotationSorter.java
index 0f0cf68..1f2e78f 100644 (file)
--- a/src/jalview/analysis/AnnotationSorter.java
+++ b/src/jalview/analysis/AnnotationSorter.java
@@ -157,12 +157,13 @@ public class AnnotationSorter
         return showAutocalcAbove ? 1 : -1;
       }
       int computedOrder = compareSequences(o1, o2);
-      if (computedOrder==0) {
+      if (computedOrder == 0)
+      {
         computedOrder = compareLabels(o1, o2);
       }
-      if (computedOrder==0)
+      if (computedOrder == 0)
       {
-        computedOrder = compareDescriptions(o1,o2);
+        computedOrder = compareDescriptions(o1, o2);
       }
       return computedOrder;
     }
@@ -365,18 +366,19 @@ public class AnnotationSorter
     }
     String label1 = o1.label;
     String label2 = o2.label;
-    return compareString(label1,label2);
+    return compareString(label1, label2);
   }
 
   /**
-   * Non-case-sensitive comparison of annotation descriptions. Returns zero if either
-   * argument is null.
+   * Non-case-sensitive comparison of annotation descriptions. Returns zero if
+   * either argument is null.
    * 
    * @param o1
    * @param o2
    * @return
    */
-  private int compareDescriptions(AlignmentAnnotation o1, AlignmentAnnotation o2)
+  private int compareDescriptions(AlignmentAnnotation o1,
+          AlignmentAnnotation o2)
   {
     if (o1 == null || o2 == null)
     {
@@ -384,8 +386,9 @@ public class AnnotationSorter
     }
     String label1 = o1.description;
     String label2 = o2.description;
-    return compareString(label1,label2);
+    return compareString(label1, label2);
   }
+
   private int compareString(String label1, String label2)
   {
     if (label1 == null && label2 == null)