X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FExtJmol.java;h=89228d51cdf51e6a024792ec4c373ba5462df984;hb=75db7abd6c89a9465861dc7604faca4893c52101;hp=b369318785f197a60349f9cf666c5eb086ddbf20;hpb=2888e7307e1f7c8239234941498cb86e8c65ab36;p=jalview.git diff --git a/src/jalview/appletgui/ExtJmol.java b/src/jalview/appletgui/ExtJmol.java index b369318..89228d5 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.gui.IProgressIndicator; import jalview.io.DataSourceType; import java.awt.Container; @@ -49,9 +50,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); @@ -66,6 +66,13 @@ public class ExtJmol extends JalviewJmolBinding } @Override + protected IProgressIndicator getIProgressIndicator() + { + // no progress indicators on applet (could access javascript for this) + return null; + } + + @Override public void updateColours(Object source) { @@ -93,6 +100,7 @@ public class ExtJmol extends JalviewJmolBinding } } + @Override public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment) { @@ -138,8 +146,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 +181,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); }