X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2FMCview%2FAppletPDBViewer.java;h=ce2083ae91449e3008b3dc763b9b3903b496fc28;hb=182d6f907cbe252b377af82f0ab58dfd83c6d9b7;hp=2c0080ee918a219a999eb8cece0d0ef914d36925;hpb=dfb45c8f874124d3ff3caac2902ed0c4a0e87cf5;p=jalview.git

diff --git a/src/MCview/AppletPDBViewer.java b/src/MCview/AppletPDBViewer.java
index 2c0080e..ce2083a 100755
--- a/src/MCview/AppletPDBViewer.java
+++ b/src/MCview/AppletPDBViewer.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -28,18 +28,13 @@ import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
 
 
-public class AppletPDBViewer extends Frame
+public class AppletPDBViewer extends Frame implements ActionListener, ItemListener
 {
-      PDBEntry pdb;
-      Sequence sequence;
       AppletPDBCanvas pdbcanvas;
-
-
       public AppletPDBViewer(String pdbtext,String type,
                        Sequence seq,
                        SeqCanvas seqcanvas)
       {
-        sequence = seq;
 
         try
         {
@@ -54,7 +49,7 @@ public class AppletPDBViewer extends Frame
 
         add(pdbcanvas, BorderLayout.CENTER);
 
-        StringBuffer title = new StringBuffer(sequence.getName() + ":");
+        StringBuffer title = new StringBuffer(seq.getName() + ":");
 
         jalview.bin.JalviewLite.addFrame(this,title.toString(),400, 400);
 
@@ -63,149 +58,104 @@ public class AppletPDBViewer extends Frame
         pdbcanvas.setPDBFile(pdbfile);
         }
         catch(Exception ex){
+          ex.printStackTrace();
           pdbcanvas.errorLoading = true;
           pdbcanvas.repaint();
         }
       }
 
+      public void actionPerformed(ActionEvent evt)
+      {
+        if(evt.getSource()==mapping)
+               mapping_actionPerformed();
+       else if(evt.getSource()==wire)
+               wire_actionPerformed();
+       else if(evt.getSource()==depth)
+               depth_actionPerformed();
+       else if(evt.getSource()==zbuffer)
+               zbuffer_actionPerformed();
+       else if(evt.getSource()==charge)
+               charge_actionPerformed();
+
+       else if(evt.getSource()==chain)
+               chain_actionPerformed();
+       else if(evt.getSource()==seqButton)
+               seqButton_actionPerformed();
+       else if(evt.getSource()==zappo)
+                pdbcanvas.setColours(new ZappoColourScheme());
+       else if(evt.getSource()==taylor)
+               pdbcanvas.setColours(new TaylorColourScheme());
+      else if(evt.getSource()==hydro)
+               pdbcanvas.setColours(new HydrophobicColourScheme());
+      else if(evt.getSource()==helix)
+               pdbcanvas.setColours(new HelixColourScheme());
+       else if(evt.getSource()==strand)
+               pdbcanvas.setColours(new StrandColourScheme());
+       else if(evt.getSource()==turn)
+               pdbcanvas.setColours(new TurnColourScheme());
+       else if(evt.getSource()==buried)
+              pdbcanvas.setColours(new BuriedColourScheme());
+       else if(evt.getSource()==user)
+       {
+         pdbcanvas.bysequence = false;
+         new jalview.appletgui.UserDefinedColours(pdbcanvas);
+       }
+      }
+
+      public void itemStateChanged(ItemEvent evt)
+      {
+        if (evt.getSource() == allchains)
+          allchains_itemStateChanged();
+        else if (evt.getSource() == wire)
+          wire_actionPerformed();
+        else if (evt.getSource() == depth)
+          depth_actionPerformed();
+        else if (evt.getSource() == zbuffer)
+          zbuffer_actionPerformed();
+      }
+
 
       private void jbInit()
           throws Exception
       {
-        this.setMenuBar(jMenuBar1);
+        setMenuBar(jMenuBar1);
         fileMenu.setLabel("File");
         coloursMenu.setLabel("Colours");
         mapping.setLabel("View Mapping");
-        mapping.addActionListener(new ActionListener()
-        {
-          public void actionPerformed(ActionEvent e)
-          {
-            mapping_actionPerformed();
-          }
-        });
+        mapping.addActionListener(this);
         wire.setLabel("Wireframe");
-        wire.addItemListener(new ItemListener()
-        {
-          public void itemStateChanged(ItemEvent e)
-          {
-            wire_actionPerformed();
-          }
-        });
+        wire.addItemListener(this);
         depth.setState(true);
         depth.setLabel("Depthcue");
-        depth.addItemListener(new ItemListener()
-        {
-          public void itemStateChanged(ItemEvent e)
-          {
-            depth_actionPerformed();
-          }
-        });
+        depth.addItemListener(this);
         zbuffer.setState(true);
         zbuffer.setLabel("Z Buffering");
-        zbuffer.addItemListener(new ItemListener()
-        {
-          public void itemStateChanged(ItemEvent e)
-          {
-            zbuffer_actionPerformed();
-          }
-        });
+        zbuffer.addItemListener(this);
         charge.setLabel("Charge & Cysteine");
-        charge.addActionListener(new ActionListener()
-        {
-          public void actionPerformed(ActionEvent e)
-          {
-            charge_actionPerformed();
-          }
-        });
+        charge.addActionListener(this);
         hydro.setLabel("Hydrophobicity");
-        hydro.addActionListener(new ActionListener()
-        {
-          public void actionPerformed(ActionEvent e)
-          {
-            pdbcanvas.setColours(new HydrophobicColourScheme());
-          }
-        });
+        hydro.addActionListener(this);
         chain.setLabel("By Chain");
-        chain.addActionListener(new ActionListener()
-        {
-          public void actionPerformed(ActionEvent e)
-          {
-            chain_actionPerformed();
-          }
-        });
+        chain.addActionListener(this);
         seqButton.setLabel("By Sequence");
-        seqButton.addActionListener(new ActionListener()
-        {
-          public void actionPerformed(ActionEvent e){
-            seqButton_actionPerformed();
-          }
-        });
+        seqButton.addActionListener(this);
     allchains.setLabel("All Chains Visible");
-    allchains.addItemListener(new ItemListener()
-    {
-      public void itemStateChanged(ItemEvent itemEvent)
-      {
-        allchains_itemStateChanged(itemEvent);
-      }
-    });
+    allchains.addItemListener(this);
     viewMenu.setLabel("View");
     zappo.setLabel("Zappo");
-    zappo.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent actionEvent)
-      {
-        pdbcanvas.setColours(new ZappoColourScheme());
-      }
-    });
+    zappo.addActionListener(this);
     taylor.setLabel("Taylor");
-    taylor.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent actionEvent)
-      {
-        pdbcanvas.setColours(new TaylorColourScheme());
-      }
-    });
+    taylor.addActionListener(this);
     helix.setLabel("Helix Propensity");
-    helix.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent actionEvent)
-      {
-       pdbcanvas.setColours(new HelixColourScheme());
-      }
-    });
+    helix.addActionListener(this);
     strand.setLabel("Strand Propensity");
-    strand.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent actionEvent)
-      {
-        pdbcanvas.setColours(new StrandColourScheme());
-      }
-    });
+    strand.addActionListener(this);
     turn.setLabel("Turn Propensity");
-    turn.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent actionEvent)
-      {
-        pdbcanvas.setColours(new TurnColourScheme());
-      }
-    });
+    turn.addActionListener(this);
     buried.setLabel("Buried Index");
-    buried.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent actionEvent)
-      {
-        pdbcanvas.setColours(new BuriedColourScheme());
-      }
-    });
+    buried.addActionListener(this);
     user.setLabel("User Defined...");
-    user.addActionListener(new ActionListener()
-    {
-      public void actionPerformed(ActionEvent actionEvent)
-      {
-        pdbcanvas.bysequence = false;
-        new jalview.appletgui.UserDefinedColours(pdbcanvas);
-      }
-    });
+    user.addActionListener(this);
     jMenuBar1.add(fileMenu);
         jMenuBar1.add(coloursMenu);
     jMenuBar1.add(viewMenu);
@@ -308,7 +258,7 @@ public class AppletPDBViewer extends Frame
         cap.setText(pdbcanvas.mappingDetails.toString());
       }
 
-      public void allchains_itemStateChanged(ItemEvent itemEvent)
+      public void allchains_itemStateChanged()
       {
         pdbcanvas.setAllchainsVisible(allchains.getState());
       }