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

[jalview.git] / src / jalview / bin / JalviewJS.java

diff --git a/src/jalview/bin/JalviewJS.java b/src/jalview/bin/JalviewJS.java
index 18be43b..84a17a4 100644 (file)
--- a/src/jalview/bin/JalviewJS.java
+++ b/src/jalview/bin/JalviewJS.java
@@ -4,7 +4,6 @@ import jalview.analysis.AlignmentUtils;
 import jalview.datamodel.AlignmentI;
 import jalview.gui.AlignFrame;
 import jalview.gui.SplitFrame;
-import jalview.io.AppletFormatAdapter;
 import jalview.io.DataSourceType;
 import jalview.io.FileFormatException;
 import jalview.io.FileFormatI;
@@ -34,6 +33,20 @@ import javax.swing.JInternalFrame;
 // TODO or format as file=/examples/uniref50.fa (etc)?
 public class JalviewJS
 {
+
+  static
+  {
+    /**
+     * @j2sNative
+     * 
+     *            thisApplet.__Info.args =
+     *            ["file","examples/uniref50.fa","features",
+     *            "examples/exampleFeatures.txt",
+     *            "props","/Users/gmcarstairs/.jalview_properties"];
+     */
+
+  }
+
   private static final String PARAM_FILE = "file";
 
   private static final String PARAM_FILE2 = "file2";
@@ -54,15 +67,9 @@ public class JalviewJS
 
   private List<String> pdbFileParams;
 
-  public static void main(String[] args)
+  public static void main(String[] args) throws Exception
   {
-    try
-    {
-      new JalviewJS().doMain(args);
-    } catch (Throwable e)
-    {
-      e.printStackTrace();
-    }
+    new JalviewJS().doMain(args);
   }
 
   /**
@@ -280,7 +287,7 @@ public class JalviewJS
       // todo extract helper for protocol resolution from JalviewLite
       DataSourceType sourceType = featureFile.startsWith("http")
               ? DataSourceType.URL
-              : DataSourceType.FILE;
+              : DataSourceType.RELATIVE_URL;
       alignFrame.parseFeaturesFile(featureFile, sourceType);
     }
   }
@@ -300,7 +307,9 @@ public class JalviewJS
     String file = getParameter(fileParam);
     if (file != null)
     {
-      DataSourceType protocol = AppletFormatAdapter.checkProtocol(file);
+      DataSourceType protocol = file.startsWith("http") ? DataSourceType.URL
+              : DataSourceType.RELATIVE_URL;
+      // DataSourceType protocol = AppletFormatAdapter.checkProtocol(file);
       FileFormatI format = new IdentifyFile().identify(file, protocol);
       FileLoader fileLoader = new FileLoader(false);
       af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format);