X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewJS2.java;h=b0a9ba0dc98443175adbb97dd7f6637eed9c2d27;hb=80b889f0cca49103e1b20ed806755a0719789906;hp=ebcd2cb3e3cc0a5afa220ce0888d97ae8a2438e6;hpb=063669372384b2acf6aa2f4ae7f09f92962e2dbf;p=jalview.git diff --git a/src/jalview/bin/JalviewJS2.java b/src/jalview/bin/JalviewJS2.java index ebcd2cb..b0a9ba0 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 . + * 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,49 @@ import javax.swing.Timer; public class JalviewJS2 { - static { + 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 { 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(); + } + } }