Merge branch 'develop' into releases/Release_2_11_2_Branch

[jalview.git] / src / jalview / schemes / ColourSchemeLoader.java

diff --git a/src/jalview/schemes/ColourSchemeLoader.java b/src/jalview/schemes/ColourSchemeLoader.java
index 481f809..061ccd4 100644 (file)
--- a/src/jalview/schemes/ColourSchemeLoader.java
+++ b/src/jalview/schemes/ColourSchemeLoader.java
@@ -20,6 +20,8 @@
  */
 package jalview.schemes;
 
+import java.util.Locale;
+
 import jalview.xml.binding.jalview.JalviewUserColours;
 
 import java.awt.Color;
@@ -92,7 +94,7 @@ public class ColourSchemeLoader
 
         Color color = new Color(
                 Integer.parseInt(jucs.getColour().get(i).getRGB(), 16));
-        if (name.toLowerCase().equals(name))
+        if (name.toLowerCase(Locale.ROOT).equals(name))
         {
           caseSensitive = true;
           lowerCase[index] = color;
@@ -114,34 +116,9 @@ public class ColourSchemeLoader
       }
     } catch (Exception ex)
     {
-      // Could be old Jalview Archive format
-      try
-      {
-        InputStreamReader in = new InputStreamReader(
-                new FileInputStream(file), "UTF-8");
-
-        jalview.binding.JalviewUserColours jucs = new jalview.binding.JalviewUserColours();
-
-        jucs = jalview.binding.JalviewUserColours.unmarshal(in);
-
-        newColours = new Color[jucs.getColourCount()];
-
-        for (int i = 0; i < 24; i++)
-        {
-          newColours[i] = new Color(
-                  Integer.parseInt(jucs.getColour(i).getRGB(), 16));
-        }
-        ucs = new UserColourScheme(newColours);
-        ucs.setName(jucs.getSchemeName());
-      } catch (Exception ex2)
-      {
-        ex2.printStackTrace();
-      }
-
-      if (newColours == null)
-      {
-        System.out.println("Error loading User ColourFile\n" + ex);
-      }
+      // used to try to parse a V1 Castor generated colours file
+      System.err.println("Failed to read colour scheme from " + filePath
+              + " : " + ex.toString());
     }
 
     return ucs;