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 'releases/Release_2_11_3_Branch'
[jalview.git]
/
src
/
jalview
/
javascript
/
JSFunctionExec.java
diff --git
a/src/jalview/javascript/JSFunctionExec.java
b/src/jalview/javascript/JSFunctionExec.java
index
6202cba
..
32f1972
100644
(file)
--- a/
src/jalview/javascript/JSFunctionExec.java
+++ b/
src/jalview/javascript/JSFunctionExec.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-39,17
+39,6
@@
public class JSFunctionExec implements Runnable
jvlite.setExecutor(this);
}
jvlite.setExecutor(this);
}
- public void finalize()
- {
- jvlite = null;
- executor = null;
- if (jsExecQueue != null)
- {
- jsExecQueue.clear();
- }
- jsExecQueue = null;
- }
-
private Vector jsExecQueue;
private Thread executor = null;
private Vector jsExecQueue;
private Thread executor = null;
@@
-82,6
+71,7
@@
public class JSFunctionExec implements Runnable
executor = null;
}
executor = null;
}
+ @Override
public void run()
{
while (jsExecQueue != null)
public void run()
{
while (jsExecQueue != null)
@@
-164,6
+154,7
@@
public class JSFunctionExec implements Runnable
final Exception[] jsex = new Exception[1];
Runnable exec = new Runnable()
{
final Exception[] jsex = new Exception[1];
Runnable exec = new Runnable()
{
+ @Override
public void run()
{
try
public void run()
{
try
@@
-180,7
+171,7
@@
public class JSFunctionExec implements Runnable
{
if (jvlite.debug && dbgMsg != null)
{
{
if (jvlite.debug && dbgMsg != null)
{
- System.err.println(dbgMsg);
+ jalview.bin.Console.errPrintln(dbgMsg);
}
scriptObject.call(_listener, objects);
}
}
scriptObject.call(_listener, objects);
}
@@
-191,18
+182,19
@@
public class JSFunctionExec implements Runnable
{
if (jvlite.debug)
{
{
if (jvlite.debug)
{
- System.err.println(jex);
+ jalview.bin.Console.errPrintln(jex);
}
if (jex instanceof netscape.javascript.JSException
&& jvlite.jsfallbackEnabled)
{
}
if (jex instanceof netscape.javascript.JSException
&& jvlite.jsfallbackEnabled)
{
- jsex[0] = (netscape.javascript.JSException) jex;
+ jsex[0] = jex;
if (jvlite.debug)
{
if (jvlite.debug)
{
- System.err.println("Falling back to javascript: url call");
+ jalview.bin.Console
+ .errPrintln("Falling back to javascript: url call");
}
}
- StringBuffer sb = new StringBuffer("javascript:" + _listener
- + "(");
+ StringBuffer sb = new StringBuffer(
+ "javascript:" + _listener + "(");
for (int i = 0; objects != null && i < objects.length; i++)
{
if (i > 0)
for (int i = 0; objects != null && i < objects.length; i++)
{
if (i > 0)
@@
-212,9
+204,8
@@
public class JSFunctionExec implements Runnable
sb.append("\"");
// strip out nulls and complex objects that we can't pass this
// way.
sb.append("\"");
// strip out nulls and complex objects that we can't pass this
// way.
- if (objects[i] != null
- && !(objects[i].getClass().getName()
- .indexOf("jalview") == 0))
+ if (objects[i] != null && !(objects[i].getClass().getName()
+ .indexOf("jalview") == 0))
{
sb.append(objects[i].toString());
}
{
sb.append(objects[i].toString());
}
@@
-223,7
+214,7
@@
public class JSFunctionExec implements Runnable
sb.append(")");
if (jvlite.debug)
{
sb.append(")");
if (jvlite.debug)
{
- System.err.println(sb.toString());
+ jalview.bin.Console.errPrintln(sb.toString());
}
// alternate
URL url = null;
}
// alternate
URL url = null;