X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewJS2.java;h=7ce59b7b346e54c491958f46f456234ed84b3fd6;hb=cc248239489d51080e79783f196e752acf4ee64e;hp=6767912e71a8ab93f5138998da3021520375ae3a;hpb=0653ce64ada2e6b0ba0223661b942bf0ad9e4a22;p=jalview.git

diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java
index 6767912..7ce59b7 100644
--- a/src/jalview/bin/JalviewJS2.java
+++ b/src/jalview/bin/JalviewJS2.java
@@ -1,12 +1,34 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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. 
+ * Entry point for JalviewJS development.
  * 
  * 
  * 
@@ -16,57 +38,70 @@ import javax.swing.Timer;
 public class JalviewJS2
 {
 
-  static {
-    /**
-     * @j2sNative
-     * 
-     *            thisApplet.__Info.args =
-     *            ["open","examples/uniref50.fa","features",
-     *            "examples/exampleFeatures.txt"];
-     */
-
+  static
+  {
     /**
-     * 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();
-}
+    // showFocusTimer();
+  }
 
-protected static int focusTime = 0;
+  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();
+    }
+  }
 
 }