X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fbin%2FJalviewJS2.java;h=26110f85c6f2d8c41d9dd1dfd1ed0717f7bac318;hb=63a38dbc5a227715ad41f9abcfa486bbbe8fc077;hp=0a02a8d497fbbb16f46559a0cbba4cc846fa9832;hpb=67dd34ce6c0b2e9954ac8277910f35674bcd3497;p=jalview.git diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java index 0a02a8d..26110f8 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,24 +20,12 @@ public class JalviewJS2 static { /** - * --j2sNative + * @j2sNative * - * thisApplet.__Info.args = + * J2S.thisApplet.__Info.args = * ["open","examples/uniref50.fa","features", * "examples/exampleFeatures.txt"]; */ - - /** - * @j2sNative - * - * hr = decodeURI(document.location.href); - * pos = hr.indexOf("?"); - * // set space-delimited query parameters as arguments to Jalview main - * if (pos > 0) - * { - * thisApplet.__Info.args = hr.substring(pos+1).split(" "); - * } - */ } public static void main(String[] args) throws Exception @@ -46,26 +36,30 @@ public class JalviewJS2 protected static int focusTime = 0; -private static void showFocusTimer() { - - Timer t = new Timer(100, new ActionListener() { + private static void showFocusTimer() + { + + if (Platform.isJS()) + { + Timer t = new Timer(100, new ActionListener() + { - @Override - public void actionPerformed(ActionEvent e) { - String s = /** @j2sNative document.activeElement.id || */ - null; + @Override + public void actionPerformed(ActionEvent e) + { + String s = /** @j2sNative document.activeElement.id || */ + null; - s += " " + (++focusTime); + s += " " + (++focusTime); - /** @j2sNative document.title = s; */ - } + /** @j2sNative document.title = s; */ + } - }); + }); - t.setRepeats(true); - if (/** @j2sNative true || */ - false) - t.start(); + t.setRepeats(true); + t.start(); + } }