Jalview colours added to Jmol

[jalview.git] / src / jalview / gui / UserDefinedColours.java

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index d5a9211..d3916ab 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -45,7 +45,7 @@ public class UserDefinedColours
   Vector selectedButtons;\r
   ColourSchemeI oldColourScheme;\r
   JInternalFrame frame;\r
-  MCview.PDBCanvas pdbcanvas;\r
+  AppJMol jmol;\r
   Vector upperCaseButtons;\r
   Vector lowerCaseButtons;\r
 \r
@@ -95,10 +95,10 @@ public class UserDefinedColours
     showFrame();\r
   }\r
 \r
-  public UserDefinedColours(MCview.PDBCanvas pdb, ColourSchemeI oldcs)\r
+  public UserDefinedColours(AppJMol jmol, ColourSchemeI oldcs)\r
   {\r
     super();\r
-    pdbcanvas = pdb;\r
+    this.jmol = jmol;\r
 \r
     colorChooser.getSelectionModel().addChangeListener(this);\r
 \r
@@ -424,10 +424,9 @@ public class UserDefinedColours
     {\r
       ap.alignFrame.changeColour(ucs);\r
     }\r
-    else if (pdbcanvas != null)\r
+    else if (jmol != null)\r
     {\r
-      pdbcanvas.pdb.setColours(ucs);\r
-      pdbcanvas.updateSeqColours();\r
+      jmol.setJalviewColourScheme(ucs);\r
     }\r
   }\r
 \r
@@ -792,9 +791,9 @@ public class UserDefinedColours
       ap.paintAlignment(true);\r
     }\r
 \r
-    if (pdbcanvas != null)\r
+    if (jmol != null)\r
     {\r
-      pdbcanvas.pdb.setColours(oldColourScheme);\r
+      jmol.setJalviewColourScheme(oldColourScheme);\r
     }\r
 \r
     try\r