X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=2104399e22bc8f20ab05af78c46123f94d9c1729;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=c8d9ae32e7a3577bba8d983cf12533f1b7f9d57a;hpb=75dcf03278eac69e3dafbbf7c0d839e9087734f8;p=jalview.git

diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java
index c8d9ae3..2104399 100644
--- a/src/jalview/gui/AppJmolBinding.java
+++ b/src/jalview/gui/AppJmolBinding.java
@@ -1,36 +1,33 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
 import java.awt.Container;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.ContainerEvent;
-import java.awt.event.ContainerListener;
 import java.util.BitSet;
 
-import javax.swing.JPanel;
-
 import jalview.api.AlignmentViewPanel;
 import jalview.bin.Cache;
-import jalview.datamodel.AlignmentI;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
+import jalview.structure.StructureSelectionManager;
 
 import org.jmol.api.JmolAppConsoleInterface;
 import org.jmol.api.JmolViewer;
@@ -45,37 +42,42 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
    */
   private AppJmol appJmolWindow;
 
-  public AppJmolBinding(AppJmol appJmol, PDBEntry[] pdbentry,
-          SequenceI[][] sequenceIs, String[][] chains, String protocol)
+  public AppJmolBinding(AppJmol appJmol, StructureSelectionManager sSm,
+          PDBEntry[] pdbentry, SequenceI[][] sequenceIs, String[][] chains,
+          String protocol)
   {
-    super(pdbentry, sequenceIs, chains, protocol);
+    super(sSm, pdbentry, sequenceIs, chains, protocol);
     appJmolWindow = appJmol;
   }
 
   FeatureRenderer fr = null;
 
   @Override
-  public jalview.api.FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
+  public jalview.api.FeatureRenderer getFeatureRenderer(
+          AlignmentViewPanel alignment)
   {
-    AlignmentPanel ap = (alignment==null) ? appJmolWindow.ap : (AlignmentPanel) alignment;
+    AlignmentPanel ap = (alignment == null) ? appJmolWindow.ap
+            : (AlignmentPanel) alignment;
     if (ap.av.showSequenceFeatures)
     {
       if (fr == null)
       {
-        fr = new FeatureRenderer((AlignmentPanel)alignment);
+        fr = ap.cloneFeatureRenderer();
+      }
+      else
+      {
+        ap.updateFeatureRenderer(fr);
       }
-
-      fr.transferSettings(((AlignmentPanel)alignment).
-              seqPanel.seqCanvas.getFeatureRenderer());
     }
 
     return fr;
   }
 
   @Override
-  public jalview.api.SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
+  public jalview.api.SequenceRenderer getSequenceRenderer(
+          AlignmentViewPanel alignment)
   {
-    return new SequenceRenderer(((AlignmentPanel)alignment).av);
+    return new SequenceRenderer(((AlignmentPanel) alignment).av);
   }
 
   public void sendConsoleEcho(String strEcho)
@@ -125,11 +127,12 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
 
   public void updateColours(Object source)
   {
-    AlignmentPanel ap = (AlignmentPanel) source,topap;
-    // ignore events from unrelated or non-user interactive frames
-    if ((topap=appJmolWindow.getAlignmentPanelFor(ap.av.getAlignment()))==null || topap.alignFrame.getCurrentView() != ap.av || appJmolWindow.isUsedforcolourby(ap))
+    AlignmentPanel ap = (AlignmentPanel) source, topap;
+    // ignore events from panels not used to colour this view
+    if (!appJmolWindow.isUsedforcolourby(ap))
       return;
-    if (!isLoadingFromArchive()) {
+    if (!isLoadingFromArchive())
+    {
       colourBySequence(ap.av.getShowSequenceFeatures(), ap);
     }
   }
@@ -151,8 +154,8 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
           boolean asPopup)
   {
 
-    jmolpopup = JmolPopup.newJmolPopup(viewer, translateLocale, menuName,
-            asPopup);
+    jmolpopup = new JmolPopup();
+    jmolpopup.initialize(viewer, translateLocale, menuName, asPopup);
   }
 
   public void selectionChanged(BitSet arg0)
@@ -221,9 +224,11 @@ public class AppJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   @Override
   public void releaseReferences(Object svl)
   {
-    if (svl instanceof SeqPanel) {
+    if (svl instanceof SeqPanel)
+    {
       appJmolWindow.removeAlignmentPanel(((SeqPanel) svl).ap);
-      
-    };
+
+    }
+    ;
   }
 }