JAL-1807 Bob's first commit -- Applet loaded; needs image

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

diff --git a/src/jalview/appletgui/UserDefinedColours.java b/src/jalview/appletgui/UserDefinedColours.java
index 277bd55..af8a155 100644 (file)
--- a/src/jalview/appletgui/UserDefinedColours.java
+++ b/src/jalview/appletgui/UserDefinedColours.java
@@ -20,19 +20,27 @@
  */
 package jalview.appletgui;
 
-import java.awt.Button;
+import jalview.bin.JalviewLite;
+import jalview.datamodel.SequenceGroup;
+import jalview.schemes.ColourSchemeI;
+import jalview.schemes.GraduatedColor;
+import jalview.schemes.ResidueProperties;
+import jalview.schemes.UserColourScheme;
+import jalview.util.MessageManager;
+
+import awt2swing.Button;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dialog;
 import java.awt.Font;
-import java.awt.Frame;
+import awt2swing.Frame;
 import java.awt.GridLayout;
-import java.awt.Label;
-import java.awt.Panel;
+import awt2swing.Label;
+import awt2swing.Panel;
 import java.awt.Rectangle;
-import java.awt.Scrollbar;
-import java.awt.TextField;
+import awt2swing.Scrollbar;
+import awt2swing.TextField;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.AdjustmentEvent;
@@ -42,13 +50,6 @@ import java.awt.event.FocusListener;
 import java.awt.event.MouseEvent;
 import java.util.Vector;
 
-import jalview.datamodel.SequenceGroup;
-import jalview.schemes.ColourSchemeI;
-import jalview.schemes.GraduatedColor;
-import jalview.schemes.ResidueProperties;
-import jalview.schemes.UserColourScheme;
-import jalview.util.MessageManager;
-
 public class UserDefinedColours extends Panel implements ActionListener,
         AdjustmentListener, FocusListener
 {
@@ -65,7 +66,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
 
   Frame frame;
 
-  MCview.AppletPDBCanvas pdbcanvas;
+//  MCview.AppletPDBCanvas pdbcanvas;
 
   AppletJmol jmol;
 
@@ -102,11 +103,11 @@ public class UserDefinedColours extends Panel implements ActionListener,
     init();
   }
 
-  public UserDefinedColours(MCview.AppletPDBCanvas pdb)
-  {
-    this.pdbcanvas = pdb;
-    init();
-  }
+//  public UserDefinedColours(MCview.AppletPDBCanvas pdb)
+//  {
+//    this.pdbcanvas = pdb;
+//    init();
+//  }
 
   public UserDefinedColours(AppletJmol jmol)
   {
@@ -281,7 +282,7 @@ public class UserDefinedColours extends Panel implements ActionListener,
     }
     frame = new Frame();
     frame.add(this);
-    jalview.bin.JalviewLite.addFrame(frame,
+    JalviewLite.addFrame(frame,
             MessageManager.getString("label.user_defined_colours"), 420,
             345);
 
@@ -514,10 +515,10 @@ public class UserDefinedColours extends Panel implements ActionListener,
     {
       jmol.setJalviewColourScheme(ucs);
     }
-    else if (pdbcanvas != null)
-    {
-      pdbcanvas.setColours(ucs);
-    }
+//    else if (pdbcanvas != null)
+//    {
+//      pdbcanvas.setColours(ucs);
+//    }
   }
 
   protected void cancelButton_actionPerformed()
@@ -595,10 +596,10 @@ public class UserDefinedColours extends Panel implements ActionListener,
     {
       jmol.setJalviewColourScheme(ucs);
     }
-    else if (pdbcanvas != null)
-    {
-      pdbcanvas.pdb.setColours(ucs);
-    }
+//    else if (pdbcanvas != null)
+//    {
+//      pdbcanvas.pdb.setColours(ucs);
+//    }
 
     frame.setVisible(false);
   }