X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FExtJmol.java;h=aaab8bda6af2a4b3225686ef7c21eca5c16f3037;hb=8e058bb9c973cf194bd0746da5ec44caed224293;hp=5714ce9f5dc1dcb1478beffb7bf57d64614f3039;hpb=2da92b61300307562cb8bec70a72f0b0527aa3b3;p=jalview.git diff --git a/src/jalview/appletgui/ExtJmol.java b/src/jalview/appletgui/ExtJmol.java index 5714ce9..aaab8bd 100644 --- a/src/jalview/appletgui/ExtJmol.java +++ b/src/jalview/appletgui/ExtJmol.java @@ -1,13 +1,13 @@ /* - * 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) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle * * 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 @@ -28,7 +28,6 @@ import org.jmol.api.JmolViewer; import jalview.api.AlignmentViewPanel; import jalview.api.FeatureRenderer; import jalview.api.SequenceRenderer; -import jalview.datamodel.AlignmentI; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.ext.jmol.JalviewJmolBinding; @@ -48,13 +47,14 @@ public class ExtJmol extends JalviewJmolBinding PDBEntry[] pdbentry, SequenceI[][] seq, String[][] chains, String protocol) { - super(pdbentry, seq, chains, protocol); + super(alframe.alignPanel.getStructureSelectionManager(), pdbentry, seq, + chains, protocol); } public ExtJmol(JmolViewer viewer, AlignmentPanel alignPanel, SequenceI[][] seqs) { - super(viewer); + super(alignPanel.getStructureSelectionManager(), viewer); ap = alignPanel; this.sequence = seqs; notifyFileLoaded(null, null, null, null, 0); @@ -74,7 +74,7 @@ public class ExtJmol extends JalviewJmolBinding public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment) { - AlignmentPanel ap = (AlignmentPanel)alignment; + AlignmentPanel ap = (AlignmentPanel) alignment; if (ap.av.showSequenceFeatures) { return ap.getFeatureRenderer(); @@ -87,7 +87,7 @@ public class ExtJmol extends JalviewJmolBinding public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment) { - return ((AlignmentPanel)alignment).getSequenceRenderer(); + return ((AlignmentPanel) alignment).getSequenceRenderer(); } public void notifyScriptTermination(String strStatus, int msWalltime) @@ -189,7 +189,7 @@ public class ExtJmol extends JalviewJmolBinding public void releaseReferences(Object svl) { // TODO Auto-generated method stub - + } }