X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjavascript%2FJSFunctionExec.java;h=29f3fa939f7ff60c1ccebdd615c99ded63118d9c;hb=0d1e2a723c5c52a340ab67a7a573fa34ef23749d;hp=09036e65fe14d8be8ba1e66556fe30059d11c2b0;hpb=ad20cd92225f2ee8c251d39b00b90555d382a616;p=jalview.git
diff --git a/src/jalview/javascript/JSFunctionExec.java b/src/jalview/javascript/JSFunctionExec.java
index 09036e6..29f3fa9 100644
--- a/src/jalview/javascript/JSFunctionExec.java
+++ b/src/jalview/javascript/JSFunctionExec.java
@@ -1,27 +1,31 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * 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.
+ * 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 .
+ * 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.javascript;
+import jalview.bin.JalviewLite;
+
import java.net.URL;
import java.util.Vector;
import netscape.javascript.JSObject;
-import jalview.bin.JalviewLite;
public class JSFunctionExec implements Runnable
{
@@ -35,17 +39,6 @@ public class JSFunctionExec implements Runnable
jvlite.setExecutor(this);
}
- public void finalize()
- {
- jvlite = null;
- executor = null;
- if (jsExecQueue != null)
- {
- jsExecQueue.clear();
- }
- jsExecQueue = null;
- }
-
private Vector jsExecQueue;
private Thread executor = null;
@@ -78,6 +71,7 @@ public class JSFunctionExec implements Runnable
executor = null;
}
+ @Override
public void run()
{
while (jsExecQueue != null)
@@ -160,6 +154,7 @@ public class JSFunctionExec implements Runnable
final Exception[] jsex = new Exception[1];
Runnable exec = new Runnable()
{
+ @Override
public void run()
{
try
@@ -192,13 +187,13 @@ public class JSFunctionExec implements Runnable
if (jex instanceof netscape.javascript.JSException
&& jvlite.jsfallbackEnabled)
{
- jsex[0] = (netscape.javascript.JSException) jex;
+ jsex[0] = jex;
if (jvlite.debug)
{
System.err.println("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)
@@ -208,9 +203,8 @@ public class JSFunctionExec implements Runnable
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());
}