Colours set globally in viewport

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index c78c093..a12672e 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -13,20 +13,19 @@ import java.util.*;
 public class UserDefinedColours extends GUserDefinedColours implements ChangeListener\r
 {\r
 \r
-  SeqPanel seqPanel;\r
+  AlignViewport av;\r
   ColourSchemeI colourScheme;\r
   JButton selectedButton;\r
   Vector oldColours = new Vector();\r
   JInternalFrame frame;\r
 \r
-  public UserDefinedColours(JInternalFrame f, SeqPanel sp)\r
+  public UserDefinedColours(JInternalFrame f, AlignViewport av)\r
   {\r
     super();\r
     colorChooser.getSelectionModel().addChangeListener(this);\r
-    seqPanel = sp;\r
+    this.av = av;\r
     frame = f;\r
-    colourScheme = seqPanel.getColourScheme();\r
-   // colourScheme.\r
+    colourScheme = av.getGlobalColourScheme();\r
 \r
     for(int i=0; i<20; i++)\r
       makeButton(ResidueProperties.aa2Triplet.get( ResidueProperties.aa[i] )+"", ResidueProperties.aa[i]);\r
@@ -89,7 +88,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
 \r
     ucs.setThreshold(0);\r
     ucs.setColourScheme( newColours );\r
-    seqPanel.setColourScheme( ucs, false );\r
+    av.setGlobalColourScheme( ucs );\r
   }\r
 \r
   protected void loadbutton_actionPerformed(ActionEvent e)\r
@@ -157,7 +156,7 @@ public class UserDefinedColours extends GUserDefinedColours implements ChangeLis
     }\r
 \r
     ucs.setColourScheme( newColours );\r
-    seqPanel.setColourScheme( ucs, false );\r
+    av.setGlobalColourScheme( ucs );\r
 \r
   }\r
 \r