X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FExtJmol.java;h=3966536cc63f35171dfd44f5c6d5552f0a0e525b;hb=9e2b4ccd9c95ffa75130bf808b0037ea6a1054ca;hp=5ffbaa4c4381c25a53a3898a5003b75e9973593b;hpb=c3b8fbc19c04c2daec702a2bffdfab5d10555143;p=jalview.git diff --git a/src/jalview/appletgui/ExtJmol.java b/src/jalview/appletgui/ExtJmol.java index 5ffbaa4..3966536 100644 --- a/src/jalview/appletgui/ExtJmol.java +++ b/src/jalview/appletgui/ExtJmol.java @@ -26,6 +26,7 @@ import jalview.api.SequenceRenderer; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.ext.jmol.JalviewJmolBinding; +import jalview.io.DataSourceType; import java.awt.Container; import java.util.ArrayList; @@ -48,9 +49,8 @@ public class ExtJmol extends JalviewJmolBinding private AlignmentPanel ap; - protected ExtJmol(jalview.appletgui.AlignFrame alframe, - PDBEntry[] pdbentry, SequenceI[][] seq, - String protocol) + protected ExtJmol(AlignFrame alframe, PDBEntry[] pdbentry, + SequenceI[][] seq, DataSourceType protocol) { super(alframe.alignPanel.getStructureSelectionManager(), pdbentry, seq, protocol); @@ -81,10 +81,10 @@ public class ExtJmol extends JalviewJmolBinding @Override public FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment) { - AlignmentPanel ap = (AlignmentPanel) alignment; - if (ap.av.isShowSequenceFeatures()) + AlignmentPanel alignPanel = (AlignmentPanel) alignment; + if (alignPanel.av.isShowSequenceFeatures()) { - return ap.getFeatureRenderer(); + return alignPanel.getFeatureRenderer(); } else { @@ -172,8 +172,8 @@ public class ExtJmol extends JalviewJmolBinding { // This never gets called because we haven't overriden the associated Jmol's // console - System.err - .println("WARNING: unexpected call to ExtJmol's showConsole method. (showConsole=" + System.err.println( + "WARNING: unexpected call to ExtJmol's showConsole method. (showConsole=" + show); }