JAL-3210 merge conflict tidying

[jalview.git] / src / jalview / appletgui / AppletJmolBinding.java

diff --git a/src/jalview/appletgui/AppletJmolBinding.java b/src/jalview/appletgui/AppletJmolBinding.java
index d5d53fb..f1c494e 100644 (file)
--- a/src/jalview/appletgui/AppletJmolBinding.java
+++ b/src/jalview/appletgui/AppletJmolBinding.java
@@ -32,7 +32,7 @@ import java.util.Map;
 
 import org.jmol.api.JmolAppConsoleInterface;
 import org.jmol.console.AppletConsole;
-import org.jmol.java.BS;
+import javajs.util.BS;
 
 class AppletJmolBinding extends JalviewJmolBinding
 {
@@ -173,14 +173,12 @@ class AppletJmolBinding extends JalviewJmolBinding
   @Override
   public int[] resizeInnerPanel(String data)
   {
-    // TODO Auto-generated method stub
     return null;
   }
 
   @Override
   public Map<String, Object> getJSpecViewProperty(String arg0)
   {
-    // TODO Auto-generated method stub
     return null;
   }
 }