JAL-1759 updates for Jmol 14.2.14_25.06.11

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

diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index 80fafe3..7844f57 100644 (file)
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -23,16 +23,20 @@ package jalview.appletgui;
 import jalview.api.AlignmentViewPanel;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
+import jalview.ext.jmol.JalviewJmolBinding;
 import jalview.structure.StructureSelectionManager;
 
 import java.awt.Container;
-import java.util.BitSet;
+import java.util.Map;
+
+import javajs.awt.Dimension;
 
 import org.jmol.api.JmolAppConsoleInterface;
-import org.jmol.api.JmolViewer;
-import org.jmol.popup.JmolPopup;
+import org.jmol.console.AppletConsole;
+import org.jmol.java.BS;
+import org.jmol.popup.JmolAwtPopup;
 
-class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
+class AppletJmolBinding extends JalviewJmolBinding
 {
 
   /**
@@ -48,6 +52,7 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
     appletJmolBinding = appletJmol;
   }
 
+  @Override
   public jalview.api.FeatureRenderer getFeatureRenderer(
           AlignmentViewPanel alignment)
   {
@@ -68,12 +73,14 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
     return appletJmolBinding.fr;
   }
 
+  @Override
   public jalview.api.SequenceRenderer getSequenceRenderer(
           AlignmentViewPanel alignment)
   {
     return new SequenceRenderer(((AlignmentPanel) alignment).av);
   }
 
+  @Override
   public void sendConsoleEcho(String strEcho)
   {
     if (appletJmolBinding.scriptWindow == null)
@@ -84,6 +91,7 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
     appletJmolBinding.history.append("\n" + strEcho);
   }
 
+  @Override
   public void sendConsoleMessage(String strStatus)
   {
     if (appletJmolBinding.history != null && strStatus != null
@@ -93,12 +101,14 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
     }
   }
 
+  @Override
   public void showUrl(String url, String target)
   {
     appletJmolBinding.ap.alignFrame.showURL(url, target);
 
   }
 
+  @Override
   public void refreshGUI()
   {
     appletJmolBinding.updateTitleAndMenus();
@@ -124,17 +134,18 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   public void newJmolPopup(boolean translateLocale, String menuName,
           boolean asPopup)
   {
+    jmolpopup = new JmolAwtPopup(); // is this used?
+    jmolpopup.jpiInitialize((viewer), menuName);
 
-    jmolpopup = new JmolPopup();
-    jmolpopup.initialize(viewer, translateLocale, menuName, asPopup);
   }
 
+  @Override
   public void notifyScriptTermination(String strStatus, int msWalltime)
   {
     // do nothing.
   }
 
-  public void selectionChanged(BitSet arg0)
+  public void selectionChanged(BS arg0)
   {
     // TODO Auto-generated method stub
 
@@ -153,12 +164,11 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   }
 
   @Override
-  protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2,
+  protected JmolAppConsoleInterface createJmolConsole(
           Container consolePanel, String buttonsToShow)
   {
-    // return new org.jmol.console.AppletConsole(viewer2, consolePanel);
-    JmolAppConsoleInterface appc = new org.jmol.console.AppletConsole()
-            .getAppConsole(viewer2);
+    JmolAppConsoleInterface appc = new AppletConsole();
+    appc.start(viewer);
     return appc;
   }
 
@@ -175,9 +185,16 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   }
 
   @Override
-  public void resizeInnerPanel(String data)
+  public Dimension 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;
   }
 }