X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewJS2.java;h=12dc147531ab05e08b098499c66ff0ab11f87bd5;hb=26ee59562604fa9164e895e3ca07e11398a6c8a0;hp=6767912e71a8ab93f5138998da3021520375ae3a;hpb=0653ce64ada2e6b0ba0223661b942bf0ad9e4a22;p=jalview.git diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java index 6767912..12dc147 100644 --- 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,52 @@ 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[] { "open", "examples/uniref50.fa", "features", + "examples/exampleFeatures.txt", "noannotation" }; + } 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(); + } }