X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewJS2.java;h=6f69f8a8e60d25c1978e9d73b1a44873cb45894b;hb=4dd96dd41cb37178a6dc0298ce08c8bfcdfab715;hp=55d9a1fd9cad0a1420c8f2c790fb2bf57c259bdb;hpb=e6fd516209d8b5162cd155c9d500ca27a6dd8e1e;p=jalview.git diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java index 55d9a1f..6f69f8a 100644 --- 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); }