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