X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=ec4ad5526196ea40068f3f33e2ae59039709102b;hb=refs%2Fheads%2FvamsasDemo;hp=0477391df7a4ba04311a2daabe7b7fb838f254de;hpb=4fe5e959d104419f1f313f493e00d683b6b5cd0a;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 0477391..ec4ad55 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -68,7 +68,7 @@ public class UserDefinedColours extends GUserDefinedColours
 
         if (System.getProperty("os.name").startsWith("Mac"))
         {
-            frame.setSize(450, 560);
+            frame.setSize(760, 370);
         }
 
         if (sg != null)
@@ -139,8 +139,12 @@ public class UserDefinedColours extends GUserDefinedColours
 
       if(e.isShiftDown())
       {
-        JButton start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);
-        JButton end = (JButton) e.getSource();
+        JButton start, end = (JButton) e.getSource();
+        if(selectedButtons.size()>1)
+          start = (JButton)selectedButtons.elementAt(selectedButtons.size()-1);
+        else
+          start = (JButton) e.getSource();
+
         int startIndex=0, endIndex=0;
         for(int b=0; b<buttonPanel.getComponentCount(); b++)
         {
@@ -336,18 +340,28 @@ public class UserDefinedColours extends GUserDefinedColours
      */
     public static UserColourScheme loadDefaultColours()
     {
-      String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
-        if ( colours != null)
+        UserColourScheme ret = null;
+
+        String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
+        if ( colours != null )
         {
           if(colours.indexOf("|")>-1)
             colours = colours.substring(0, colours.indexOf("|"));
 
-            return loadColours(colours);
+          ret = loadColours(colours);
         }
-        else
+
+        if(ret == null)
         {
-            return null;
+          Color[] newColours = new Color[24];
+          for (int i = 0; i < 24; i++)
+          {
+            newColours[i] = Color.white;
+          }
+          ret =  new UserColourScheme(newColours);
         }
+
+        return ret;
     }
 
     /**
@@ -357,7 +371,7 @@ public class UserDefinedColours extends GUserDefinedColours
      *
      * @return DOCUMENT ME!
      */
-    public static UserColourScheme loadColours(String file)
+    static UserColourScheme loadColours(String file)
     {
          UserColourScheme ucs = null;
          Color[]  newColours = null;
@@ -435,7 +449,7 @@ public class UserDefinedColours extends GUserDefinedColours
             String defaultColours = jalview.bin.Cache.getDefault("USER_DEFINED_COLOURS", choice);
             if(defaultColours.indexOf(choice)==-1)
             {
-              if(defaultColours.length()<1)
+              if(defaultColours.length()>0)
                 defaultColours = defaultColours.concat("|");
               defaultColours = defaultColours.concat(choice);
             }
@@ -512,9 +526,10 @@ public class UserDefinedColours extends GUserDefinedColours
     {
       userColourSchemes = new Hashtable();
 
-      if(files==null)
+      if(files==null || files.length()==0)
         return;
 
+
       // In case colours can't be loaded, we'll remove them
       // from the default list here.
       StringBuffer coloursFound = new StringBuffer();
@@ -540,7 +555,50 @@ public class UserDefinedColours extends GUserDefinedColours
       }
       if (!files.equals(coloursFound.toString()))
       {
-        jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());
+        if (coloursFound.toString().length() > 1)
+          jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS",
+                                        coloursFound.toString());
+        else
+          jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+      }
+    }
+
+    public static void removeColourFromDefaults(String target)
+    {
+      // The only way to find colours by name is to load them in
+      // In case colours can't be loaded, we'll remove them
+      // from the default list here.
+
+      userColourSchemes = new Hashtable();
+
+      StringBuffer coloursFound = new StringBuffer();
+      StringTokenizer st = new StringTokenizer(
+           jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS"), "|");
+
+      while (st.hasMoreElements())
+      {
+        String file = st.nextToken();
+        try
+        {
+          UserColourScheme ucs = loadColours(file);
+          if (ucs != null && !ucs.getName().equals(target))
+          {
+            if (coloursFound.length() > 0)
+              coloursFound.append("|");
+            coloursFound.append(file);
+            userColourSchemes.put(ucs.getName(), ucs);
+          }
+        }
+        catch (Exception ex)
+        {
+          System.out.println("Error loading User ColourFile\n" + ex);
+        }
       }
+
+      if (coloursFound.toString().length() > 1)
+        jalview.bin.Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());
+      else
+        jalview.bin.Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+
     }
 }