X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAppletJmolBinding.java;h=edf2d45fd395b89ab8e25bcfaafcb57e36f8a897;hb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;hp=3fccad754bd9d2ea3e9cc89e0a4759957c6cc016;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git

diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index 3fccad7..edf2d45 100644
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -1,34 +1,33 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 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
@@ -39,16 +38,18 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
    */
   private AppletJmol appletJmolBinding;
 
-  public AppletJmolBinding(AppletJmol appletJmol, StructureSelectionManager sSm, PDBEntry[] pdbentry,
+  public AppletJmolBinding(AppletJmol appletJmol,
+          StructureSelectionManager sSm, PDBEntry[] pdbentry,
           SequenceI[][] seq, String[][] chains, String protocol)
   {
     super(sSm, pdbentry, seq, chains, protocol);
     appletJmolBinding = appletJmol;
   }
 
-  public jalview.api.FeatureRenderer getFeatureRenderer(AlignmentViewPanel alignment)
+  public jalview.api.FeatureRenderer getFeatureRenderer(
+          AlignmentViewPanel alignment)
   {
-    AlignmentPanel ap = (AlignmentPanel)alignment;
+    AlignmentPanel ap = (AlignmentPanel) alignment;
     if (appletJmolBinding.ap.av.showSequenceFeatures)
     {
       if (appletJmolBinding.fr == null)
@@ -65,9 +66,10 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
     return appletJmolBinding.fr;
   }
 
-  public jalview.api.SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
+  public jalview.api.SequenceRenderer getSequenceRenderer(
+          AlignmentViewPanel alignment)
   {
-    return new SequenceRenderer(((AlignmentPanel)alignment).av);
+    return new SequenceRenderer(((AlignmentPanel) alignment).av);
   }
 
   public void sendConsoleEcho(String strEcho)
@@ -119,8 +121,8 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
           boolean asPopup)
   {
 
-    jmolpopup = JmolPopup.newJmolPopup(viewer, translateLocale, menuName,
-            asPopup);
+    jmolpopup = new JmolPopup();
+    jmolpopup.initialize(viewer, translateLocale, menuName, asPopup);
   }
 
   public void notifyScriptTermination(String strStatus, int msWalltime)
@@ -150,7 +152,10 @@ 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
@@ -178,4 +183,10 @@ class AppletJmolBinding extends jalview.ext.jmol.JalviewJmolBinding
   {
   }
 
+  @Override
+  public void resizeInnerPanel(String data)
+  {
+    // TODO Auto-generated method stub
+
+  }
 }