X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=c7ce9945777ec67adcb2a65626a35ac414687515;hb=c38d37887ae51d63942ac4321f6769308188ed6b;hp=92dff7bb5921cba30e541b17cdff544cb7ce12c4;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java index 92dff7b..c7ce994 100644 --- a/src/jalview/appletgui/AppletJmolBinding.java +++ b/src/jalview/appletgui/AppletJmolBinding.java @@ -30,11 +30,9 @@ import jalview.structure.StructureSelectionManager; import java.awt.Container; import java.util.Map; -import javajs.awt.Dimension; - import org.jmol.api.JmolAppConsoleInterface; import org.jmol.console.AppletConsole; -import org.jmol.java.BS; +import javajs.util.BS; class AppletJmolBinding extends JalviewJmolBinding { @@ -46,34 +44,13 @@ class AppletJmolBinding extends JalviewJmolBinding public AppletJmolBinding(AppletJmol appletJmol, StructureSelectionManager sSm, PDBEntry[] pdbentry, - SequenceI[][] seq, String[][] chains, DataSourceType protocol) + SequenceI[][] seq, DataSourceType protocol) { - super(sSm, pdbentry, seq, chains, protocol); + super(sSm, pdbentry, seq, protocol); appletJmolBinding = appletJmol; } @Override - 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) { @@ -126,8 +103,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) { } @@ -170,7 +147,7 @@ class AppletJmolBinding extends JalviewJmolBinding Container consolePanel, String buttonsToShow) { JmolAppConsoleInterface appc = new AppletConsole(); - appc.start(viewer); + appc.start(jmolViewer); return appc; } @@ -187,16 +164,14 @@ class AppletJmolBinding extends JalviewJmolBinding } @Override - public Dimension resizeInnerPanel(String data) + public int[] resizeInnerPanel(String data) { - // TODO Auto-generated method stub return null; } @Override public Map getJSpecViewProperty(String arg0) { - // TODO Auto-generated method stub return null; } }