X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJalviewChimeraBindingModel.java;h=689106af84e9e6ffeb5bd7fb8cf04659b5b27905;hb=aad3cb1e3d4250bebbf709624e3e15530a377df0;hp=d22c46c649a2be78892bbb5b523f3e91028e9993;hpb=497958b4e5217efaa3ddeece38f38c3a6e98cb96;p=jalview.git

diff --git a/src/jalview/gui/JalviewChimeraBindingModel.java b/src/jalview/gui/JalviewChimeraBindingModel.java
index d22c46c..689106a 100644
--- a/src/jalview/gui/JalviewChimeraBindingModel.java
+++ b/src/jalview/gui/JalviewChimeraBindingModel.java
@@ -1,44 +1,44 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
+ *  
+ * 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+
 import jalview.api.AlignmentViewPanel;
+import jalview.api.structures.JalviewStructureDisplayI;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.ext.rbvi.chimera.JalviewChimeraBinding;
+import jalview.io.DataSourceType;
 import jalview.structure.StructureSelectionManager;
 
 public class JalviewChimeraBindingModel extends JalviewChimeraBinding
 {
-  private ChimeraViewFrame cvf;
-
   public JalviewChimeraBindingModel(ChimeraViewFrame chimeraViewFrame,
           StructureSelectionManager ssm, PDBEntry[] pdbentry,
-          SequenceI[][] sequenceIs, String[][] chains, String protocol)
-  {
-    super(ssm, pdbentry, sequenceIs, chains, protocol);
-    cvf = chimeraViewFrame;
-  }
-
-  FeatureRenderer fr = null;
-
-  @Override
-  public jalview.api.FeatureRenderer getFeatureRenderer(
-          AlignmentViewPanel alignment)
+          SequenceI[][] sequenceIs, DataSourceType protocol)
   {
-    AlignmentPanel ap = (alignment == null) ? cvf.ap
-            : (AlignmentPanel) alignment;
-    if (ap.av.isShowSequenceFeatures())
-    {
-      if (fr == null)
-      {
-        fr = (jalview.gui.FeatureRenderer) ap.cloneFeatureRenderer();
-      }
-      else
-      {
-        ap.updateFeatureRenderer(fr);
-      }
-    }
-
-    return fr;
+    super(ssm, pdbentry, sequenceIs, protocol);
+    setViewer(chimeraViewFrame);
   }
 
   @Override
@@ -47,58 +47,19 @@ public class JalviewChimeraBindingModel extends JalviewChimeraBinding
   {
     return new SequenceRenderer(((AlignmentPanel) alignment).av);
   }
+
   @Override
   public void refreshGUI()
   {
-    // appJmolWindow.repaint();
-    javax.swing.SwingUtilities.invokeLater(new Runnable()
+    SwingUtilities.invokeLater(new Runnable()
     {
+      @Override
       public void run()
       {
-        cvf.updateTitleAndMenus();
-        cvf.revalidate();
+        JalviewStructureDisplayI theViewer = getViewer();
+        theViewer.updateTitleAndMenus();
+        ((JComponent) theViewer).revalidate();
       }
     });
   }
-
-  public void updateColours(Object source)
-  {
-    AlignmentPanel ap = (AlignmentPanel) source, topap;
-    // ignore events from panels not used to colour this view
-    if (!cvf.isUsedforcolourby(ap))
-    {
-      return;
-    }
-    if (!isLoadingFromArchive())
-    {
-      colourBySequence(ap.av.isShowSequenceFeatures(), ap);
-    }
-  }
-  @Override
-  public void releaseReferences(Object svl)
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-  @Override
-  protected void releaseUIResources()
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-  @Override
-  public void refreshPdbEntries()
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-  @Override
-  public void showUrl(String url, String target)
-  {
-    // TODO Auto-generated method stub
-
-  }
 }