X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=e5767b68c8b06b8e1b10d9bc87248d6f553caaa3;hb=4a0a4a012676c3ebee341d667eab07ea60c5770e;hp=92dff7bb5921cba30e541b17cdff544cb7ce12c4;hpb=ee198b3ca3687f18a2ee186f4e7c7330f4ea30f0;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java index 92dff7b..e5767b6 100644 --- a/src/jalview/appletgui/AppletJmolBinding.java +++ b/src/jalview/appletgui/AppletJmolBinding.java @@ -30,8 +30,6 @@ 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; @@ -46,9 +44,9 @@ 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; } @@ -56,21 +54,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; + return appletJmolBinding.ap.getFeatureRenderer(); } @Override @@ -126,8 +110,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) { } @@ -187,16 +171,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; } }