X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemes.java;h=18f24fbc9994ce45a77871467fcfdf38a77aa499;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=0ff7c6e736cb8972d62b2b250ff3b5f2fb117ef0;hpb=3efc513242af226b2829a887afdb65fb4c6a1bb7;p=jalview.git diff --git a/src/jalview/schemes/ColourSchemes.java b/src/jalview/schemes/ColourSchemes.java index 0ff7c6e..18f24fb 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.bin.ApplicationSingletonProvider; import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI; @@ -145,7 +147,7 @@ public class ColourSchemes implements ApplicationSingletonI * 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 @@ -163,7 +165,7 @@ public class ColourSchemes implements ApplicationSingletonI { if (name != null) { - schemes.remove(name.toLowerCase()); + schemes.remove(name.toLowerCase(Locale.ROOT)); } } @@ -181,17 +183,16 @@ public class ColourSchemes implements ApplicationSingletonI * 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); } /** @@ -234,6 +235,6 @@ public class ColourSchemes implements ApplicationSingletonI { return false; } - return schemes.containsKey(name.toLowerCase()); + return schemes.containsKey(name.toLowerCase(Locale.ROOT)); } }