JAL-4059 update Jmol and JSmol to 15.2.69 - revised Jalview classes interating with...

[jalview.git] / src / jalview / ext / jmol / JalviewJmolBinding.java

diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java
index f133f20..46e17ec 100644 (file)
--- a/src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/src/jalview/ext/jmol/JalviewJmolBinding.java
@@ -45,7 +45,7 @@ import jalview.api.AlignmentViewPanel;
 import jalview.api.FeatureRenderer;
 import jalview.api.FeatureSettingsModelI;
 import jalview.api.SequenceRenderer;
-import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AppJmol;
@@ -122,9 +122,9 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
 
   private String jmolScript(String script)
   {
-    Cache.debug(">>Jmol>> " + script);
+    Console.debug(">>Jmol>> " + script);
     String s = jmolViewer.evalStringQuiet(script); // scriptWait(script); BH
-    Cache.debug("<<Jmol<< " + s);
+    Console.debug("<<Jmol<< " + s);
 
     return s;
   }
@@ -173,13 +173,13 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
   // //////////////////////////
 
   @Override
-  public float[][] functionXY(String functionName, int x, int y)
+  public double[][] functionXY(String functionName, int x, int y)
   {
     return null;
   }
 
   @Override
-  public float[][][] functionXYZ(String functionName, int nx, int ny,
+  public double[][][] functionXYZ(String functionName, int nx, int ny,
           int nz)
   {
     // TODO Auto-generated method stub