From ed4b153fcf35496ccf42b074bf90d64ab71ed328 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 25 May 2005 16:32:31 +0000
Subject: [PATCH] usercolourscheme changed

---
 src/jalview/appletgui/UserDefinedColours.java |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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