Merge branch 'develop' into patch/JAL-3921_jmol_session_save

[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 5b931e1..f51252c 100644 (file)
--- a/src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/src/jalview/ext/jmol/JalviewJmolBinding.java
@@ -156,7 +156,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
     jmolHistory(false);
     if (lastCommand == null || !lastCommand.equals(cmd))
     {
-      jmolScript(cmd + "\n");
+      jmolScript(cmd + "\n",command.isWaitNeeded());
     }
     jmolHistory(true);
     lastCommand = cmd;
@@ -192,7 +192,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
   //
   
   @Override
-  public List<String> getHetatmNames()
+  public Map<String,String> getHetatmNames()
   {
     HashMap<String,String> hetlist=new HashMap();
     for (int mc=0;mc<jmolViewer.ms.mc; mc++)
@@ -203,7 +203,7 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
         hetlist.putAll(hets);
       }
     }
-    return Arrays.asList(hetlist.keySet().toArray(new String[0]));
+    return hetlist;
   }
   //
   ////////////////////////////