fixes for Jalview command-line URI code

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

diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java
index 55d9a1f..26110f8 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. 
  * 
@@ -15,26 +22,44 @@ public class JalviewJS2
     /**
      * @j2sNative
      * 
-     *            thisApplet.__Info.args =
-     *            ["open","http://www.jalview.org/builds/release/examples/uniref50.fa","features",
-     *            "http://www.jalview.org/builds/release/examples/exampleFeatures.txt"];
+     *            J2S.thisApplet.__Info.args =
+     *            ["open","examples/uniref50.fa","features",
+     *            "examples/exampleFeatures.txt"];
      */
-    
   }
 
   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++)
-    {
-      anew[i] = args[i];
-    }
-    for (int i = 0; i < defaultArgs.length; i++)
+    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);
   }