JAL-3032 DND enabled; additional io changes for File vs. String

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

diff --git a/src/jalview/ext/jmol/JmolParser.java b/src/jalview/ext/jmol/JmolParser.java
index 2a510a2..fd483ad 100644 (file)
--- a/src/jalview/ext/jmol/JmolParser.java
+++ b/src/jalview/ext/jmol/JmolParser.java
@@ -59,13 +59,14 @@ public class JmolParser extends StructureFile implements JmolStatusListener
 {
   Viewer viewer = null;
 
-  public JmolParser(boolean immediate, String inFile,
+  public JmolParser(boolean immediate, Object inFile,
           DataSourceType sourceType) throws IOException
   {
+    // BH 2018 File or String for filename
     super(immediate, inFile, sourceType);
   }
 
-  public JmolParser(String inFile, DataSourceType sourceType)
+  public JmolParser(Object inFile, DataSourceType sourceType)
           throws IOException
   {
     super(inFile, sourceType);
@@ -133,6 +134,7 @@ public class JmolParser extends StructureFile implements JmolStatusListener
          * params -o (output to sysout) -n (nodisplay) -x (exit when finished)
          * see http://wiki.jmol.org/index.php/Jmol_Application
          */
+        
         viewer = (Viewer) JmolViewer.allocateViewer(null, null, null, null,
                 null, "-x -o -n", this);
         // ensure the 'new' (DSSP) not 'old' (Ramachandran) SS method is used