X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=9b8a235b27d2d752a5739d77519e455e13f54b90;hb=136c0793b90b72b928c4d77dc109dd5c644e00d3;hp=3a36ed5076bf9c751912eece1d21d8a866e2f161;hpb=c3b8fbc19c04c2daec702a2bffdfab5d10555143;p=jalview.git diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java index 3a36ed5..9b8a235 100644 --- a/src/jalview/appletgui/AppletJmolBinding.java +++ b/src/jalview/appletgui/AppletJmolBinding.java @@ -24,13 +24,12 @@ import jalview.api.AlignmentViewPanel; import jalview.datamodel.PDBEntry; import jalview.datamodel.SequenceI; import jalview.ext.jmol.JalviewJmolBinding; +import jalview.io.DataSourceType; 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; @@ -45,7 +44,7 @@ class AppletJmolBinding extends JalviewJmolBinding public AppletJmolBinding(AppletJmol appletJmol, StructureSelectionManager sSm, PDBEntry[] pdbentry, - SequenceI[][] seq, String protocol) + SequenceI[][] seq, DataSourceType protocol) { super(sSm, pdbentry, seq, protocol); appletJmolBinding = appletJmol; @@ -55,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 @@ -186,7 +171,7 @@ class AppletJmolBinding extends JalviewJmolBinding } @Override - public Dimension resizeInnerPanel(String data) + public int[] resizeInnerPanel(String data) { // TODO Auto-generated method stub return null;