git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/r2_11_2/JAL-3829_3dbeacons
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewJS2.java
diff --git
a/src/jalview/bin/JalviewJS2.java
b/src/jalview/bin/JalviewJS2.java
index
eff5334
..
26110f8
100644
(file)
--- a/
src/jalview/bin/JalviewJS2.java
+++ b/
src/jalview/bin/JalviewJS2.java
@@
-1,5
+1,7
@@
package jalview.bin;
package jalview.bin;
+import jalview.util.Platform;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@
-18,51
+20,46
@@
public class JalviewJS2
static {
/**
static {
/**
- * --j2sNative
+ * @j2sNative
*
*
- * thisApplet.__Info.args =
+ * J2S.thisApplet.__Info.args =
* ["open","examples/uniref50.fa","features",
* "examples/exampleFeatures.txt"];
*/
* ["open","examples/uniref50.fa","features",
* "examples/exampleFeatures.txt"];
*/
-
-
- /**
- * @j2sNative
- *
- * thisApplet.__Info.args =
- * ["open","examples/jaxbtest.jvx"];
- */
-
}
public static void main(String[] args) throws Exception
{
Jalview.main(args);
}
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()
+ {
+
+ 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();
+ }
}
}