usercolourscheme changed

diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java
index 9f1eb6d..071bad8 100755 (executable)
--- a/src/jalview/appletgui/UserDefinedColours.java
+++ b/src/jalview/appletgui/UserDefinedColours.java
@@ -22,6 +22,12 @@ public class UserDefinedColours extends GUserDefinedColours
 \r
   int R = 0, G = 0, B = 0;\r
 \r
+  public ColourSchemeI loadDefaultColours()\r
+  {\r
+    // NOT IMPLEMENTED YET IN APPLET VERSION\r
+    return null;\r
+  }\r
+\r
   public UserDefinedColours(AlignmentPanel ap, SequenceGroup sg)\r
   {\r
     super();\r
@@ -164,9 +170,8 @@ public class UserDefinedColours extends GUserDefinedColours
           newColours[i] = button.getBackground();\r
     }\r
 \r
-    UserColourScheme ucs = new UserColourScheme();\r
+    UserColourScheme ucs = new UserColourScheme( newColours );\r
     ucs.setThreshold(0);\r
-    ucs.setColourScheme( newColours );\r
 \r
     if(seqGroup!=null)\r
       seqGroup.cs = ucs;\r
@@ -189,9 +194,8 @@ public class UserDefinedColours extends GUserDefinedColours
         newColours[i] = new Color(Integer.parseInt(in.readLine()));\r
       }\r
 \r
-      ucs = new UserColourScheme();\r
+      ucs = new UserColourScheme(newColours);\r
       ucs.setThreshold(0);\r
-      ucs.setColourScheme(newColours);\r
 \r
     }\r
     catch (Exception ex)\r
@@ -203,7 +207,7 @@ public class UserDefinedColours extends GUserDefinedColours
 \r
   protected void cancelButton_actionPerformed(ActionEvent e)\r
   {\r
-    UserColourScheme ucs = new UserColourScheme();\r
+\r
     Color [] newColours = new Color[24];\r
     for(int i=0; i<24; i++)\r
     {\r
@@ -211,7 +215,8 @@ public class UserDefinedColours extends GUserDefinedColours
           buttonPanel.getComponent(i).setBackground(newColours[i]);\r
     }\r
 \r
-    ucs.setColourScheme( newColours );\r
+    UserColourScheme ucs = new UserColourScheme( newColours );\r
+\r
     if (seqGroup != null)\r
       seqGroup.cs = ucs;\r
     else\r