X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=696a272ed7995927a5b24024b9547c3fb9404d48;hb=a5e22141bc3185284588761a69f023d527e7f18e;hp=f938cadca81c536d2165235a82da42e994b44527;hpb=7d67fb613ec026dc9a265e351e7fab542e3f1d61;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java index f938cad..696a272 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; @@ -54,28 +55,7 @@ class AppletJmolBinding extends JalviewJmolBinding public jalview.api.FeatureRenderer getFeatureRenderer( AlignmentViewPanel alignment) { - AlignmentPanel ap = (AlignmentPanel) alignment; - if (appletJmolBinding.ap.av.isShowSequenceFeatures()) - { - if (appletJmolBinding.fr == null) - { - appletJmolBinding.fr = new jalview.appletgui.FeatureRenderer( - appletJmolBinding.ap.av); - } - - appletJmolBinding.fr - .transferSettings(appletJmolBinding.ap.seqPanel.seqCanvas - .getFeatureRenderer()); - } - - return appletJmolBinding.fr; - } - - @Override - public jalview.api.SequenceRenderer getSequenceRenderer( - AlignmentViewPanel alignment) - { - return new SequenceRenderer(((AlignmentPanel) alignment).av); + return appletJmolBinding.ap.getFeatureRenderer(); } @Override @@ -116,7 +96,7 @@ class AppletJmolBinding extends JalviewJmolBinding public void updateColours(Object source) { AlignmentPanel ap = (AlignmentPanel) source; - colourBySequence(ap); + colourBySequence(ap, ap.av.isShowSequenceFeatures()); } @Override @@ -124,8 +104,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) { } @@ -197,4 +177,11 @@ class AppletJmolBinding extends JalviewJmolBinding // TODO Auto-generated method stub return null; } + + @Override + protected IProgressIndicator getIProgressIndicator() + { + // no progress indicators on the applet + return null; + } }