X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjavascript%2FJSFunctionExec.java;h=6daf275169a1e4a3a2a7669e1d4724ae18117be4;hb=03beb4f2f8719088cc8c92a7ebc1ad9f2c257426;hp=788b28f65fbb84cf87a5d3e0c6039becbcdc8e62;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/javascript/JSFunctionExec.java b/src/jalview/javascript/JSFunctionExec.java index 788b28f..6daf275 100644 --- 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.8.2) - * Copyright (C) 2014 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. * @@ -20,11 +20,12 @@ */ 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 { @@ -38,7 +39,8 @@ public class JSFunctionExec implements Runnable jvlite.setExecutor(this); } - public void finalize() + @Override + protected void finalize() throws Throwable { jvlite = null; executor = null; @@ -47,6 +49,7 @@ public class JSFunctionExec implements Runnable jsExecQueue.clear(); } jsExecQueue = null; + super.finalize(); } private Vector jsExecQueue; @@ -81,6 +84,7 @@ public class JSFunctionExec implements Runnable executor = null; } + @Override public void run() { while (jsExecQueue != null) @@ -163,6 +167,7 @@ public class JSFunctionExec implements Runnable final Exception[] jsex = new Exception[1]; Runnable exec = new Runnable() { + @Override public void run() { try @@ -195,7 +200,7 @@ 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");