X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemes.java;h=faada0e37de89922b65042c6f376c6075002a3c1;hb=1c721468246c2aafd86fc52d954512374f576b11;hp=42465f28c29ab2fe9c7070e6b0dfa37ab324d929;hpb=4265a395749b667cf7d558b8bad40ee2a57b6972;p=jalview.git

diff --git a/src/jalview/schemes/ColourSchemes.java b/src/jalview/schemes/ColourSchemes.java
index 42465f2..faada0e 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;
@@ -72,12 +74,16 @@ public class ColourSchemes
     {
       try
       {
-        registerColourScheme(cs.getSchemeClass().newInstance());
+        registerColourScheme(
+                cs.getSchemeClass().getDeclaredConstructor().newInstance());
       } catch (InstantiationException | IllegalAccessException e)
       {
         System.err.println("Error instantiating colour scheme for "
                 + cs.toString() + " " + e.getMessage());
         e.printStackTrace();
+      } catch (ReflectiveOperationException roe)
+      {
+        roe.printStackTrace();
       }
     }
   }
@@ -100,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
@@ -118,7 +124,7 @@ public class ColourSchemes
   {
     if (name != null)
     {
-      schemes.remove(name.toLowerCase());
+      schemes.remove(name.toLowerCase(Locale.ROOT));
     }
   }
 
@@ -144,7 +150,7 @@ public class ColourSchemes
     {
       return null;
     }
-    ColourSchemeI cs = schemes.get(name.toLowerCase());
+    ColourSchemeI cs = schemes.get(name.toLowerCase(Locale.ROOT));
     return cs == null ? null
             : cs.getInstance(viewport, forData);
   }
@@ -189,6 +195,6 @@ public class ColourSchemes
     {
       return false;
     }
-    return schemes.containsKey(name.toLowerCase());
+    return schemes.containsKey(name.toLowerCase(Locale.ROOT));
   }
 }