X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=23aa3114c1aa75fc02afb110befacce20cc565f4;hb=b9fbdac95abae11673f09be76494032ec0bbca74;hp=eca64064174600a52bc764a554f8be6bdefc2fa0;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git

diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index eca6406..23aa311 100644
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -17,18 +17,16 @@
  */
 package jalview.appletgui;
 
-import java.awt.Container;
-import java.util.BitSet;
-
 import jalview.api.AlignmentViewPanel;
-import jalview.datamodel.AlignmentI;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.structure.StructureSelectionManager;
 
+import java.awt.Container;
+import java.util.BitSet;
+
 import org.jmol.api.JmolAppConsoleInterface;
 import org.jmol.api.JmolViewer;
-import org.jmol.applet.AppletConsole;
 import org.jmol.popup.JmolPopup;
 
 class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
@@ -119,7 +117,8 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
           boolean asPopup)
   {
 
-    jmolpopup = JmolPopup.newJmolPopup(viewer, translateLocale, menuName,
+    jmolpopup = new JmolPopup();
+    jmolpopup.initialize(viewer, translateLocale, menuName,
             asPopup);
   }
 
@@ -150,7 +149,9 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   protected JmolAppConsoleInterface createJmolConsole(JmolViewer viewer2,
           Container consolePanel, String buttonsToShow)
   {
-    return new AppletConsole(viewer2, consolePanel);
+    //return new org.jmol.console.AppletConsole(viewer2, consolePanel);
+    JmolAppConsoleInterface appc = new org.jmol.console.AppletConsole().getAppConsole(viewer2);
+    return appc;
   }
 
   @Override
@@ -177,5 +178,10 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   public void releaseReferences(Object svl)
   {
   }
-
+  @Override
+  public void resizeInnerPanel(String data)
+  {
+    // TODO Auto-generated method stub
+    
+  }
 }