Merge branch 'feature/JAL-3551Pymol' into develop

[jalview.git] / src / jalview / appletgui / AppletJmolBinding.java

diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index 8ddff52..c7ce994 100644 (file)
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -32,7 +32,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
 {
@@ -51,21 +51,6 @@ class AppletJmolBinding extends JalviewJmolBinding
   }
 
   @Override
-  public jalview.api.FeatureRenderer getFeatureRenderer(
-          AlignmentViewPanel alignment)
-  {
-    AlignmentPanel alignPanel = (AlignmentPanel) alignment;
-    if (alignPanel.av.isShowSequenceFeatures())
-    {
-      return alignPanel.getFeatureRenderer();
-    }
-    else
-    {
-      return null;
-    }
-  }
-
-  @Override
   public jalview.api.SequenceRenderer getSequenceRenderer(
           AlignmentViewPanel alignment)
   {
@@ -118,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)
     {
     }
@@ -162,7 +147,7 @@ class AppletJmolBinding extends JalviewJmolBinding
           Container consolePanel, String buttonsToShow)
   {
     JmolAppConsoleInterface appc = new AppletConsole();
-    appc.start(viewer);
+    appc.start(jmolViewer);
     return appc;
   }
 
@@ -181,14 +166,12 @@ class AppletJmolBinding extends JalviewJmolBinding
   @Override
   public int[] resizeInnerPanel(String data)
   {
-    // TODO Auto-generated method stub
     return null;
   }
 
   @Override
   public Map<String, Object> getJSpecViewProperty(String arg0)
   {
-    // TODO Auto-generated method stub
     return null;
   }
 }