X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppJmolBinding.java;h=75b98bcd1cf9461e7b6c1523a38e6bd14fc47f28;hb=51ca42a8c4525c6871e3c8ea529b6cb8a59bb10f;hp=f822358ebd1990c0e53a0a413374389349604fcc;hpb=2888e7307e1f7c8239234941498cb86e8c65ab36;p=jalview.git

diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java
index f822358..75b98bc 100644
--- a/src/jalview/gui/AppJmolBinding.java
+++ b/src/jalview/gui/AppJmolBinding.java
@@ -28,26 +28,36 @@ import jalview.datamodel.SequenceI;
 import jalview.ext.jmol.JalviewJmolBinding;
 import jalview.io.DataSourceType;
 import jalview.structure.StructureSelectionManager;
+import jalview.util.Platform;
 
 import java.awt.Container;
+import java.io.File;
+import java.util.List;
 import java.util.Map;
 
 import org.jmol.api.JmolAppConsoleInterface;
-import org.jmol.java.BS;
-import org.openscience.jmol.app.jmolpanel.console.AppConsole;
+
+import javajs.util.BS;
 
 public class AppJmolBinding extends JalviewJmolBinding
 {
-  private AppJmol appJmolWindow;
+  protected AppJmol appJmolWindow;
 
   public AppJmolBinding(AppJmol appJmol, StructureSelectionManager sSm,
-          PDBEntry[] pdbentry, SequenceI[][] sequenceIs, DataSourceType protocol)
+          PDBEntry[] pdbentry, SequenceI[][] sequenceIs,
+          DataSourceType protocol)
   {
     super(sSm, pdbentry, sequenceIs, protocol);
     appJmolWindow = appJmol;
   }
 
   @Override
+  protected IProgressIndicator getIProgressIndicator()
+  {
+    return appJmolWindow.progressBar;
+  }
+
+  @Override
   public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
   {
     return new SequenceRenderer(((AlignmentPanel) alignment).av);
@@ -96,6 +106,8 @@ public class AppJmolBinding extends JalviewJmolBinding
       public void run()
       {
         appJmolWindow.updateTitleAndMenus();
+        // initiates a colourbySequence
+        // via seqColour_ActionPerformed.
         appJmolWindow.revalidate();
       }
     });
@@ -162,7 +174,7 @@ public class AppJmolBinding extends JalviewJmolBinding
           Container consolePanel, String buttonsToShow)
   {
     viewer.setJmolCallbackListener(this);
-    return new AppConsole(viewer, consolePanel, buttonsToShow);
+    return null;//BH can't do this yet. new AppConsole(viewer, consolePanel, buttonsToShow);
   }
 
   @Override
@@ -198,8 +210,9 @@ public class AppJmolBinding extends JalviewJmolBinding
   public jalview.api.FeatureRenderer getFeatureRenderer(
           AlignmentViewPanel alignment)
   {
-    AlignmentPanel ap = (alignment == null) ? appJmolWindow
-            .getAlignmentPanel() : (AlignmentPanel) alignment;
+    AlignmentPanel ap = (alignment == null)
+            ? appJmolWindow.getAlignmentPanel()
+            : (AlignmentPanel) alignment;
     if (ap.av.isShowSequenceFeatures())
     {
       return ap.av.getAlignPanel().getSeqPanel().seqCanvas.fr;
@@ -207,4 +220,17 @@ public class AppJmolBinding extends JalviewJmolBinding
 
     return null;
   }
+
+  @SuppressWarnings("unused")
+  public void cacheFiles(List<File> files)
+  {
+    if (files == null)
+    {
+      return;
+    }
+    for (File f : files)
+    {
+      Platform.cacheFileData(f);
+    }
+  }
 }