X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAnnotationSorter.java;h=c9ed5705313ab89a69396ce42bb912dcaad59e7b;hb=f62dc5899b5bbcb87cc3f6b06fb1420f7768df82;hp=711e8c9c8600350871b63c7ef460a58f07966941;hpb=37de9310bec3501cbc6381e0c3dcb282fcaad812;p=jalview.git
diff --git a/src/jalview/analysis/AnnotationSorter.java b/src/jalview/analysis/AnnotationSorter.java
index 711e8c9..c9ed570 100644
--- a/src/jalview/analysis/AnnotationSorter.java
+++ b/src/jalview/analysis/AnnotationSorter.java
@@ -20,6 +20,8 @@
*/
package jalview.analysis;
+import java.util.Locale;
+
import jalview.datamodel.AlignmentAnnotation;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.SequenceI;
@@ -50,8 +52,8 @@ public class AnnotationSorter
public enum SequenceAnnotationOrder
{
// Text descriptions surface in the Preferences Sort by... options
- SEQUENCE_AND_LABEL("Sequence"), LABEL_AND_SEQUENCE("Label"), NONE(
- "No sort");
+ SEQUENCE_AND_LABEL("Sequence"), LABEL_AND_SEQUENCE("Label"),
+ NONE("No sort");
private String description;
@@ -108,7 +110,8 @@ public class AnnotationSorter
*
* - annotations with a reference to a sequence in the alignment are sorted
* on sequence ordering
- * - other annotations go 'at the end', with their mutual order unchanged
+ * - other annotations go 'at the end', with their mutual order
+ * unchanged
* - within the same sequence ref, sort by label (non-case-sensitive)
*
*/
@@ -169,7 +172,8 @@ public class AnnotationSorter
*
* - annotations with a reference to a sequence in the alignment are sorted
* on label (non-case-sensitive)
- * - other annotations go 'at the end', with their mutual order unchanged
+ * - other annotations go 'at the end', with their mutual order
+ * unchanged
* - within the same label, sort by order of the related sequences
*
*/
@@ -278,7 +282,8 @@ public class AnnotationSorter
// cache 'alignment sequence position' for the annotations
saveSequenceIndices(alignmentAnnotations);
- Comparator super AlignmentAnnotation> comparator = getComparator(order);
+ Comparator super AlignmentAnnotation> comparator = getComparator(
+ order);
if (alignmentAnnotations != null)
{
@@ -365,7 +370,7 @@ public class AnnotationSorter
{
return 1;
}
- return label1.toUpperCase().compareTo(label2.toUpperCase());
+ return label1.toUpperCase(Locale.ROOT).compareTo(label2.toUpperCase(Locale.ROOT));
}
/**