JAL-3253 temporary branch SwingJS upgrade with testNG fixes Java 8

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

diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java
index ebcd2cb..0bfc930 100644 (file)
--- a/src/jalview/bin/JalviewJS2.java
+++ b/src/jalview/bin/JalviewJS2.java
@@ -1,5 +1,7 @@
 package jalview.bin;
 
+import jalview.util.Platform;
+
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -18,54 +20,67 @@ public class JalviewJS2
 
   static {
     /**
-     * --j2sNative
-     * 
-     *            thisApplet.__Info.args =
-     *            ["open","examples/uniref50.fa","features",
-     *            "examples/exampleFeatures.txt"];
-     */
-
-    /**
-     * set space-delimited query parameters as arguments to Jalview main
+     * @ could do it this way:
      * 
-     * @j2sNative
+     * j2sNative
      * 
-     *            var hr = decodeURI(document.location.href); var pos =
-     *            hr.indexOf("?"); if (pos > 0) { thisApplet.__Info.args =
-     *            hr.substring(pos+1).split(" "); }
+     * J2S.thisApplet.__Info.args = [ "open","examples/uniref50.fa",
+     * "features","examples/exampleFeatures.txt", "noannotation" ];
      */
   }
 
   public static void main(String[] args) throws Exception
   {
+    if (args.length == 0)
+    {
+      args = new String[] {
+        //  "headless",
+          "open", "examples/uniref50.fa",
+          "features",
+          "examples/exampleFeatures.txt"
+          // , "noannotation"
+          // , "showoverview"
+        //  , "png", "test-bh.png"
+      };
+    }
+
+    // String cmds = "nodisplay -open examples/uniref50.fa -sortbytree -props
+    // test/jalview/io/testProps.jvprops -colour zappo "
+    // + "-jabaws http://www.compbio.dundee.ac.uk/jabaws -nosortbytree "
+    // + "-features examples/testdata/plantfdx.features -annotations
+    // examples/testdata/plantfdx.annotations -tree
+    // examples/testdata/uniref50_test_tree";
+    // args = cmds.split(" ");
     Jalview.main(args);
        //showFocusTimer();
 }
 
 protected static int focusTime = 0;
 
-private static void showFocusTimer() {
-       
-       Timer t = new Timer(100, new ActionListener() {
+  private static void showFocusTimer()
+  {
 
-               @Override
-               public void actionPerformed(ActionEvent e) {
-                       String s = /** @j2sNative document.activeElement.id || */
-                                       null;
+    if (Platform.isJS())
+    {
+      Timer t = new Timer(100, new ActionListener()
+      {
 
-                       s += " " + (++focusTime);
+        @Override
+        public void actionPerformed(ActionEvent e)
+        {
+          String s = /** @j2sNative document.activeElement.id || */
+                  null;
 
-                       /** @j2sNative document.title = s; */
-               }
+          s += " " + (++focusTime);
 
-       });
+          /** @j2sNative document.title = s; */
+        }
 
-       t.setRepeats(true);
-       if (/** @j2sNative true || */
-       false)
-  {
-    t.start();
-  }
+      });
+
+      t.setRepeats(true);
+      t.start();
+    }
   }