X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FExtJmol.java;h=5a6d0d09d71cf0e4e5f0a635ae7e26bb2b947ce4;hb=f887a21118fae5bc1f2cadcd4f36ffed4554edc8;hp=b369318785f197a60349f9cf666c5eb086ddbf20;hpb=2888e7307e1f7c8239234941498cb86e8c65ab36;p=jalview.git diff --git a/src/jalview/appletgui/ExtJmol.java b/src/jalview/appletgui/ExtJmol.java index b369318..5a6d0d0 100644 --- a/src/jalview/appletgui/ExtJmol.java +++ b/src/jalview/appletgui/ExtJmol.java @@ -35,7 +35,7 @@ import java.util.Map; import java.util.Vector; import org.jmol.api.JmolAppConsoleInterface; -import org.jmol.java.BS; +import javajs.util.BS; import org.jmol.viewer.Viewer; /** @@ -49,9 +49,8 @@ public class ExtJmol extends JalviewJmolBinding private AlignmentPanel ap; - protected ExtJmol(AlignFrame alframe, - PDBEntry[] pdbentry, SequenceI[][] seq, - DataSourceType protocol) + protected ExtJmol(AlignFrame alframe, PDBEntry[] pdbentry, + SequenceI[][] seq, DataSourceType protocol) { super(alframe.alignPanel.getStructureSelectionManager(), pdbentry, seq, protocol); @@ -68,9 +67,6 @@ public class ExtJmol extends JalviewJmolBinding @Override public void updateColours(Object source) { - - // TODO Auto-generated method stub - } @Override @@ -93,6 +89,7 @@ public class ExtJmol extends JalviewJmolBinding } } + @Override public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment) { @@ -138,8 +135,8 @@ public class ExtJmol extends JalviewJmolBinding @Override public void refreshPdbEntries() { - List pdbe = new ArrayList(); - List fileids = new ArrayList(); + List pdbe = new ArrayList<>(); + List fileids = new ArrayList<>(); SequenceI[] sq = ap.av.getAlignment().getSequencesArray(); for (int s = 0; s < sq.length; s++) { @@ -173,8 +170,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); } @@ -182,7 +179,6 @@ public class ExtJmol extends JalviewJmolBinding protected JmolAppConsoleInterface createJmolConsole( Container consolePanel, String buttonsToShow) { - // TODO Auto-generated method stub return null; } @@ -197,14 +193,11 @@ public class ExtJmol extends JalviewJmolBinding @Override public void releaseReferences(Object svl) { - // TODO Auto-generated method stub - } @Override public Map getJSpecViewProperty(String arg0) { - // TODO Auto-generated method stub return null; }