Merge branch 'releases/Release_2_11_3_Branch'

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

diff --git a/src/jalview/schemes/ColourSchemes.java b/src/jalview/schemes/ColourSchemes.java
index d31fbba..303d500 100644 (file)
--- a/src/jalview/schemes/ColourSchemes.java
+++ b/src/jalview/schemes/ColourSchemes.java
@@ -20,14 +20,15 @@
  */
 package jalview.schemes;
 
+import java.util.LinkedHashMap;
+import java.util.Locale;
+import java.util.Map;
+
 import jalview.api.AlignViewportI;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 public class ColourSchemes
 {
   /*
@@ -76,8 +77,9 @@ public class ColourSchemes
                 cs.getSchemeClass().getDeclaredConstructor().newInstance());
       } catch (InstantiationException | IllegalAccessException e)
       {
-        System.err.println("Error instantiating colour scheme for "
-                + cs.toString() + " " + e.getMessage());
+        jalview.bin.Console
+                .errPrintln("Error instantiating colour scheme for "
+                        + cs.toString() + " " + e.getMessage());
         e.printStackTrace();
       } catch (ReflectiveOperationException roe)
       {
@@ -96,7 +98,7 @@ public class ColourSchemes
     String name = cs.getSchemeName();
     if (name == null)
     {
-      System.err.println("ColourScheme name may not be null");
+      jalview.bin.Console.errPrintln("ColourScheme name may not be null");
       return;
     }
 
@@ -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 = getColourSchemeShortName(cs);
     if (schemes.containsKey(lower))
     {
       System.err
@@ -113,6 +115,19 @@ public class ColourSchemes
     schemes.put(lower, cs);
   }
 
+  private String getColourSchemeShortName(ColourSchemeI cs)
+  {
+    return getColourSchemeShortName(cs.getSchemeName());
+  }
+
+  private String getColourSchemeShortName(String name)
+  {
+    if (name == null)
+      return null;
+    return name.toLowerCase(Locale.ROOT).replaceAll("%", "pc")
+            .replaceAll("[^a-z0-9]", "-").replaceAll("--+", "-");
+  }
+
   /**
    * Removes a colour scheme by name
    * 
@@ -122,7 +137,7 @@ public class ColourSchemes
   {
     if (name != null)
     {
-      schemes.remove(name.toLowerCase());
+      schemes.remove(getColourSchemeShortName(name));
     }
   }
 
@@ -140,17 +155,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<SequenceI, SequenceCollectionI> hiddenRepSequences)
   {
     if (name == null)
     {
       return null;
     }
-    ColourSchemeI cs = schemes.get(name.toLowerCase());
-    return cs == null ? null
-            : cs.getInstance(viewport, forData);
+    ColourSchemeI cs = schemes.get(getColourSchemeShortName(name));
+    return cs == null ? null : cs.getInstance(viewport, forData);
   }
 
   /**
@@ -193,6 +207,6 @@ public class ColourSchemes
     {
       return false;
     }
-    return schemes.containsKey(name.toLowerCase());
+    return schemes.containsKey(getColourSchemeShortName(name));
   }
 }