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 55d9a1f..0bfc930 100644 (file)
--- a/src/jalview/bin/JalviewJS2.java
+++ b/src/jalview/bin/JalviewJS2.java
@@ -1,5 +1,12 @@
 package jalview.bin;
 
+import jalview.util.Platform;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.Timer;
+
 /**
  * Entry point for JalviewJS development. 
  * 
@@ -13,28 +20,67 @@ public class JalviewJS2
 
   static {
     /**
-     * @j2sNative
+     * @ could do it this way:
      * 
-     *            thisApplet.__Info.args =
-     *            ["open","http://www.jalview.org/builds/release/examples/uniref50.fa","features",
-     *            "http://www.jalview.org/builds/release/examples/exampleFeatures.txt"];
+     * j2sNative
+     * 
+     * J2S.thisApplet.__Info.args = [ "open","examples/uniref50.fa",
+     * "features","examples/exampleFeatures.txt", "noannotation" ];
      */
-    
   }
 
   public static void main(String[] args) throws Exception
   {
-    String[] defaultArgs = new String[] { "noquestionnaire" };
-    String[] anew = new String[args.length + defaultArgs.length];
-    for (int i = 0; i < args.length; i++)
+    if (args.length == 0)
     {
-      anew[i] = args[i];
+      args = new String[] {
+        //  "headless",
+          "open", "examples/uniref50.fa",
+          "features",
+          "examples/exampleFeatures.txt"
+          // , "noannotation"
+          // , "showoverview"
+        //  , "png", "test-bh.png"
+      };
     }
-    for (int i = 0; i < defaultArgs.length; i++)
+
+    // 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()
+  {
+
+    if (Platform.isJS())
     {
-      anew[i + args.length] = defaultArgs[i];
+      Timer t = new Timer(100, new ActionListener()
+      {
+
+        @Override
+        public void actionPerformed(ActionEvent e)
+        {
+          String s = /** @j2sNative document.activeElement.id || */
+                  null;
+
+          s += " " + (++focusTime);
+
+          /** @j2sNative document.title = s; */
+        }
+
+      });
+
+      t.setRepeats(true);
+      t.start();
     }
-    Jalview.main(args);
   }