X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemes.java;fp=src%2Fjalview%2Fschemes%2FColourSchemes.java;h=14daed6953f7d95f9258462f7d7a8d066b1cdd2a;hb=5e20c0116864d77705d951e35c41a13197791156;hp=d31fbba4c752c19aaffd3be8c6def41e13b3c1ac;hpb=1bad3c3f74b2e204e0d7ba93a745f5ec775c8a3e;p=jalview.git diff --git a/src/jalview/schemes/ColourSchemes.java b/src/jalview/schemes/ColourSchemes.java index d31fbba..14daed6 100644 --- a/src/jalview/schemes/ColourSchemes.java +++ b/src/jalview/schemes/ColourSchemes.java @@ -20,6 +20,8 @@ */ package jalview.schemes; +import java.util.Locale; + import jalview.api.AlignViewportI; import jalview.datamodel.AnnotatedCollectionI; import jalview.datamodel.SequenceCollectionI; @@ -104,7 +106,7 @@ public class ColourSchemes * name is lower-case for non-case-sensitive lookup * (name in the colour keeps its true case) */ - String lower = name.toLowerCase(); + String lower = name.toLowerCase(Locale.ROOT); if (schemes.containsKey(lower)) { System.err @@ -122,7 +124,7 @@ public class ColourSchemes { if (name != null) { - schemes.remove(name.toLowerCase()); + schemes.remove(name.toLowerCase(Locale.ROOT)); } } @@ -140,17 +142,16 @@ public class ColourSchemes * represent * @return */ - public ColourSchemeI getColourScheme(String name, - AlignViewportI viewport, AnnotatedCollectionI forData, + public ColourSchemeI getColourScheme(String name, AlignViewportI viewport, + AnnotatedCollectionI forData, Map hiddenRepSequences) { if (name == null) { return null; } - ColourSchemeI cs = schemes.get(name.toLowerCase()); - return cs == null ? null - : cs.getInstance(viewport, forData); + ColourSchemeI cs = schemes.get(name.toLowerCase(Locale.ROOT)); + return cs == null ? null : cs.getInstance(viewport, forData); } /** @@ -193,6 +194,6 @@ public class ColourSchemes { return false; } - return schemes.containsKey(name.toLowerCase()); + return schemes.containsKey(name.toLowerCase(Locale.ROOT)); } }