X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAnnotationSorter.java;h=1f2e78f9ad01b30c7d5e8057aaafba3d093cc890;hb=4b7d3640209c4434d569c746672cf9eed4250ace;hp=0f0cf6849eedc9e60c3cbe29d02a3cb3c2fa3fb8;hpb=b3fb6325a8bc315c5c938faf10ffd2e73d965f16;p=jalview.git diff --git a/src/jalview/analysis/AnnotationSorter.java b/src/jalview/analysis/AnnotationSorter.java index 0f0cf68..1f2e78f 100644 --- 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)