Jalview.isJS() --> Platform.isJS(), DBRefEntry[] --> List<DBRefEntry>

[jalview.git] / src / jalview / gui / AppJmolBinding.java

diff --git a/src/jalview/gui/AppJmolBinding.java b/src/jalview/gui/AppJmolBinding.java
index f822358..eeb4888 100644 (file)
--- a/src/jalview/gui/AppJmolBinding.java
+++ b/src/jalview/gui/AppJmolBinding.java
@@ -33,7 +33,7 @@ import java.awt.Container;
 import java.util.Map;
 
 import org.jmol.api.JmolAppConsoleInterface;
-import org.jmol.java.BS;
+import javajs.util.BS;
 import org.openscience.jmol.app.jmolpanel.console.AppConsole;
 
 public class AppJmolBinding extends JalviewJmolBinding
@@ -41,13 +41,20 @@ public class AppJmolBinding extends JalviewJmolBinding
   private 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);
@@ -162,7 +169,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 +205,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;