X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=f3b034e546f70c440295186750bb05471ef728fd;hb=7047b076a62df177047ceb16c3611efe020bdd76;hp=8ddff520b037019ff22b207bb3e95b415efe654f;hpb=2888e7307e1f7c8239234941498cb86e8c65ab36;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java index 8ddff52..f3b034e 100644 --- a/src/jalview/appletgui/AppletJmolBinding.java +++ b/src/jalview/appletgui/AppletJmolBinding.java @@ -24,6 +24,7 @@ import jalview.api.AlignmentViewPanel; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.ext.jmol.JalviewJmolBinding; +import jalview.gui.IProgressIndicator; import jalview.io.DataSourceType; import jalview.structure.StructureSelectionManager; @@ -32,7 +33,7 @@ import java.util.Map; import org.jmol.api.JmolAppConsoleInterface; import org.jmol.console.AppletConsole; -import org.jmol.java.BS; +import javajs.util.BS; class AppletJmolBinding extends JalviewJmolBinding { @@ -54,15 +55,7 @@ class AppletJmolBinding extends JalviewJmolBinding public jalview.api.FeatureRenderer getFeatureRenderer( AlignmentViewPanel alignment) { - AlignmentPanel alignPanel = (AlignmentPanel) alignment; - if (alignPanel.av.isShowSequenceFeatures()) - { - return alignPanel.getFeatureRenderer(); - } - else - { - return null; - } + return appletJmolBinding.ap.getFeatureRenderer(); } @Override @@ -118,8 +111,8 @@ class AppletJmolBinding extends JalviewJmolBinding { try { - appletJmolBinding.ap.av.applet.getAppletContext().showDocument( - new java.net.URL(url), "jmol"); + appletJmolBinding.ap.av.applet.getAppletContext() + .showDocument(new java.net.URL(url), "jmol"); } catch (java.net.MalformedURLException ex) { } @@ -191,4 +184,11 @@ class AppletJmolBinding extends JalviewJmolBinding // TODO Auto-generated method stub return null; } + + @Override + protected IProgressIndicator getIProgressIndicator() + { + // no progress indicators on the applet + return null; + } }