refactor to allow distinct StructureSelectionManager instances for

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

diff --git a/src/jalview/appletgui/AppletJmol.java b/src/jalview/appletgui/AppletJmol.java
index 9efe17e..0ff2467 100644 (file)
--- a/src/jalview/appletgui/AppletJmol.java
+++ b/src/jalview/appletgui/AppletJmol.java
@@ -132,7 +132,7 @@ public class AppletJmol extends EmbmenuFrame implements
           AlignmentPanel ap, String protocol)
   {
     this.ap = ap;
-    jmb = new AppletJmolBinding(this, new PDBEntry[]
+    jmb = new AppletJmolBinding(this, ap.getStructureSelectionManager(), new PDBEntry[]
     { pdbentry }, new SequenceI[][]
     { seq }, new String[][]
     { chains }, protocol);
@@ -157,12 +157,12 @@ public class AppletJmol extends EmbmenuFrame implements
     }
 
     String alreadyMapped = StructureSelectionManager
-            .getStructureSelectionManager().alreadyMappedToFile(
+            .getStructureSelectionManager(ap.av.applet).alreadyMappedToFile(
                     pdbentry.getId());
     MCview.PDBfile reader = null;
     if (alreadyMapped != null)
     {
-      reader = StructureSelectionManager.getStructureSelectionManager()
+      reader = StructureSelectionManager.getStructureSelectionManager(ap.av.applet)
               .setMapping(seq, chains, pdbentry.getFile(), protocol);
       // PROMPT USER HERE TO ADD TO NEW OR EXISTING VIEW?
       // FOR NOW, LETS JUST OPEN A NEW WINDOW
@@ -180,6 +180,7 @@ public class AppletJmol extends EmbmenuFrame implements
     hydro.addActionListener(this);
     chain.addActionListener(this);
     seqColour.addItemListener(this);
+    jmolColour.addItemListener(this);
     zappo.addActionListener(this);
     taylor.addActionListener(this);
     helix.addActionListener(this);
@@ -187,7 +188,6 @@ public class AppletJmol extends EmbmenuFrame implements
     turn.addActionListener(this);
     buried.addActionListener(this);
     user.addActionListener(this);
-    jmolColour.addActionListener(this);
     
     jmolHelp.addActionListener(this);
 
@@ -383,8 +383,7 @@ public class AppletJmol extends EmbmenuFrame implements
       {
         for (int s = 0; s < jmb.pdbentry.length; s++)
         {
-          sb.append(StructureSelectionManager
-                  .getStructureSelectionManager().printMapping(
+          sb.append(jmb.printMapping(
                           jmb.pdbentry[s].getFile()));
           sb.append("\n");
         }