JAL-2360 added UserColourScheme.toAppletParameter+test, hid

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

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 425b3a1..cee2cae 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -60,6 +60,7 @@ public class ColourSchemeProperty
    * <li>RNA Helices</li>
    * <li>User Defined</li>
    * <li>an AWT colour name e.g. red</li>
+   * <li>an AWT hex rgb colour e.g. ff2288</li>
    * <li>residue colours list e.g. D,E=red;K,R,H=0022FF;c=yellow</li>
    * </ul>
    * If none of these formats is matched, the string is converted to a colour
@@ -83,26 +84,17 @@ public class ColourSchemeProperty
       return scheme.getColourScheme(forData);
     }
 
-    if (name.indexOf('=') == -1)
-    {
-      /*
-       * parse the name as a colour specification
-       * e.g. "red" or "ff00ed",
-       * or failing that hash the name to a colour
-       */
-      return new UserColourScheme(name);
-    }
-
     /*
      * try to parse the string as a residues colour scheme
      * e.g. A=red;T,G=blue etc
+     * else parse the name as a colour specification
+     * e.g. "red" or "ff00ed",
+     * or failing that hash the name to a colour
      */
     UserColourScheme ucs = null;
     try
     {
-      // fix the launchApp user defined colourscheme transfer bug
-      ucs = new UserColourScheme("white");
-      ucs.parseAppletParameter(name);
+      ucs = new UserColourScheme(name);
     } catch (Exception e)
     {
       // System.err.println("Ignoring exception when parsing colourscheme as applet-parameter");