X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewJS2.java;h=26110f85c6f2d8c41d9dd1dfd1ed0717f7bac318;hb=e42524a147f92c836a0a336dde394394976216d2;hp=ebcd2cb3e3cc0a5afa220ce0888d97ae8a2438e6;hpb=063669372384b2acf6aa2f4ae7f09f92962e2dbf;p=jalview.git diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java index ebcd2cb..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,22 +20,12 @@ public class JalviewJS2 static { /** - * --j2sNative + * @j2sNative * - * thisApplet.__Info.args = + * J2S.thisApplet.__Info.args = * ["open","examples/uniref50.fa","features", * "examples/exampleFeatures.txt"]; */ - - /** - * set space-delimited query parameters as arguments to Jalview main - * - * @j2sNative - * - * var hr = decodeURI(document.location.href); var pos = - * hr.indexOf("?"); if (pos > 0) { thisApplet.__Info.args = - * hr.substring(pos+1).split(" "); } - */ } public static void main(String[] args) throws Exception @@ -44,28 +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(); + } }