diff options
Diffstat (limited to 'plugin/icedteanp/java/netscape')
7 files changed, 83 insertions, 98 deletions
diff --git a/plugin/icedteanp/java/netscape/javascript/JSException.java b/plugin/icedteanp/java/netscape/javascript/JSException.java index 5fbb750..35d72a7 100644 --- a/plugin/icedteanp/java/netscape/javascript/JSException.java +++ b/plugin/icedteanp/java/netscape/javascript/JSException.java @@ -44,8 +44,7 @@ package netscape.javascript; * returns an error. */ -public -class JSException extends RuntimeException { +public class JSException extends RuntimeException { public static final int EXCEPTION_TYPE_EMPTY = -1; public static final int EXCEPTION_TYPE_VOID = 0; public static final int EXCEPTION_TYPE_OBJECT = 1; @@ -140,4 +139,3 @@ class JSException extends RuntimeException { } } - diff --git a/plugin/icedteanp/java/netscape/javascript/JSObject.java b/plugin/icedteanp/java/netscape/javascript/JSObject.java index 31cd973..293f2be 100644 --- a/plugin/icedteanp/java/netscape/javascript/JSObject.java +++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java @@ -55,8 +55,6 @@ import java.security.BasicPermission; import sun.applet.PluginAppletViewer; import sun.applet.PluginDebug; - - /** * JSObject allows Java to manipulate objects that are * defined in JavaScript. @@ -90,17 +88,17 @@ import sun.applet.PluginDebug; */ public final class JSObject { /* the internal object data */ - private long internal; + private long internal; /** * initialize */ private static void initClass() { - PluginDebug.debug ("JSObject.initClass"); + PluginDebug.debug("JSObject.initClass"); } static { - PluginDebug.debug ("JSObject INITIALIZER"); + PluginDebug.debug("JSObject INITIALIZER"); } /** @@ -131,20 +129,21 @@ public final class JSObject { // Although this check is inefficient, it should happen only once // during applet init, so we look the other way - StackTraceElement[] stack = Thread.currentThread().getStackTrace(); + StackTraceElement[] stack = Thread.currentThread().getStackTrace(); boolean mayProceed = false; - for (int i=0; i < stack.length; i++) { + for (int i = 0; i < stack.length; i++) { if (stack[i].getClassName().equals("netscape.javascript.JSObject") && - stack[i].getMethodName().equals("getWindow")) { + stack[i].getMethodName().equals("getWindow")) { mayProceed = true; } } - if (!mayProceed) throw ace; + if (!mayProceed) + throw ace; } - PluginDebug.debug ("JSObject long CONSTRUCTOR"); + PluginDebug.debug("JSObject long CONSTRUCTOR"); internal = jsobj_addr; } @@ -152,36 +151,31 @@ public final class JSObject { * Retrieves a named member of a JavaScript object. * Equivalent to "this.<i>name</i>" in JavaScript. */ - public Object getMember(String name) - { - PluginDebug.debug ("JSObject.getMember " + name); + public Object getMember(String name) { + PluginDebug.debug("JSObject.getMember " + name); Object o = PluginAppletViewer.getMember(internal, name); - PluginDebug.debug ("JSObject.getMember GOT " + o); + PluginDebug.debug("JSObject.getMember GOT " + o); return o; } - /** * Retrieves an indexed member of a JavaScript object. * Equivalent to "this[<i>index</i>]" in JavaScript. */ // public Object getMember(int index) { return getSlot(index); } - public Object getSlot(int index) - { - PluginDebug.debug ("JSObject.getSlot " + index); + public Object getSlot(int index) { + PluginDebug.debug("JSObject.getSlot " + index); return PluginAppletViewer.getSlot(internal, index); } - /** * Sets a named member of a JavaScript object. * Equivalent to "this.<i>name</i> = <i>value</i>" in JavaScript. */ - public void setMember(String name, Object value) - { - PluginDebug.debug ("JSObject.setMember " + name + " " + value); + public void setMember(String name, Object value) { + PluginDebug.debug("JSObject.setMember " + name + " " + value); PluginAppletViewer.setMember(internal, name, value); } @@ -193,103 +187,87 @@ public final class JSObject { // public void setMember(int index, Object value) { // setSlot(index, value); // } - public void setSlot(int index, Object value) - { - PluginDebug.debug ("JSObject.setSlot " + index + " " + value); + public void setSlot(int index, Object value) { + PluginDebug.debug("JSObject.setSlot " + index + " " + value); PluginAppletViewer.setSlot(internal, index, value); } - // TODO: toString, finalize. /** * Removes a named member of a JavaScript object. */ - public void removeMember(String name) - { - PluginDebug.debug ("JSObject.removeMember " + name); + public void removeMember(String name) { + PluginDebug.debug("JSObject.removeMember " + name); PluginAppletViewer.removeMember(internal, name); } - /** * Calls a JavaScript method. * Equivalent to "this.<i>methodName</i>(<i>args</i>[0], <i>args</i>[1], ...)" in JavaScript. */ - public Object call(String methodName, Object args[]) - { + public Object call(String methodName, Object args[]) { if (args == null) - args = new Object[0]; + args = new Object[0]; - PluginDebug.debug ("JSObject.call " + methodName); + PluginDebug.debug("JSObject.call " + methodName); for (int i = 0; i < args.length; i++) - PluginDebug.debug (" " + args[i]); + PluginDebug.debug(" " + args[i]); PluginDebug.debug(""); return PluginAppletViewer.call(internal, methodName, args); } - /** * Evaluates a JavaScript expression. The expression is a string * of JavaScript source code which will be evaluated in the context * given by "this". */ - public Object eval(String s) - { + public Object eval(String s) { PluginDebug.debug("JSObject.eval " + s); return PluginAppletViewer.eval(internal, s); } - /** * Converts a JSObject to a String. */ - public String toString() - { + public String toString() { PluginDebug.debug("JSObject.toString"); return PluginAppletViewer.javascriptToString(internal); } - // should use some sort of identifier rather than String // is "property" the right word? // native String[] listProperties(); - /** * get a JSObject for the window containing the given applet */ - public static JSObject getWindow(Applet applet) - { + public static JSObject getWindow(Applet applet) { PluginDebug.debug("JSObject.getWindow"); // FIXME: handle long case as well. long internal = 0; internal = ((PluginAppletViewer) applet.getAppletContext()).getWindow(); - PluginDebug.debug ("GOT IT: " + internal); + PluginDebug.debug("GOT IT: " + internal); return new JSObject(internal); } - /** * Finalization decrements the reference count on the corresponding * JavaScript object. */ - protected void finalize() - { + protected void finalize() { PluginDebug.debug("JSObject.finalize "); PluginAppletViewer.JavaScriptFinalize(internal); } - /** * Override java.lang.Object.equals() because identity is not preserved * with instances of JSObject. */ - public boolean equals(Object obj) - { + public boolean equals(Object obj) { PluginDebug.debug("JSObject.equals " + obj); return false; diff --git a/plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java b/plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java index f8e510f..b955b6c 100644 --- a/plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java +++ b/plugin/icedteanp/java/netscape/javascript/JSObjectCreatePermission.java @@ -34,12 +34,11 @@ or based on this library. If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - + package netscape.javascript; import java.security.BasicPermission; - public class JSObjectCreatePermission extends BasicPermission { public JSObjectCreatePermission() { super("JSObjectCreate"); diff --git a/plugin/icedteanp/java/netscape/javascript/JSProxy.java b/plugin/icedteanp/java/netscape/javascript/JSProxy.java index e4f1f6e..c9ac50e 100644 --- a/plugin/icedteanp/java/netscape/javascript/JSProxy.java +++ b/plugin/icedteanp/java/netscape/javascript/JSProxy.java @@ -43,16 +43,25 @@ */ package netscape.javascript; + import java.applet.Applet; public interface JSProxy { - Object getMember(JSObject jso, String name); - Object getSlot(JSObject jso, int index); - void setMember(JSObject jso, String name, Object value); - void setSlot(JSObject jso, int index, Object value); - void removeMember(JSObject jso, String name); - Object call(JSObject jso, String methodName, Object args[]); - Object eval(JSObject jso, String s); - String toString(JSObject jso); - JSObject getWindow(Applet applet); + Object getMember(JSObject jso, String name); + + Object getSlot(JSObject jso, int index); + + void setMember(JSObject jso, String name, Object value); + + void setSlot(JSObject jso, int index, Object value); + + void removeMember(JSObject jso, String name); + + Object call(JSObject jso, String methodName, Object args[]); + + Object eval(JSObject jso, String s); + + String toString(JSObject jso); + + JSObject getWindow(Applet applet); } diff --git a/plugin/icedteanp/java/netscape/javascript/JSRunnable.java b/plugin/icedteanp/java/netscape/javascript/JSRunnable.java index 8f1cf72..df245a7 100644 --- a/plugin/icedteanp/java/netscape/javascript/JSRunnable.java +++ b/plugin/icedteanp/java/netscape/javascript/JSRunnable.java @@ -45,28 +45,28 @@ import sun.applet.PluginDebug; * Runs a JavaScript object with a run() method in a separate thread. */ public class JSRunnable implements Runnable { - private JSObject runnable; + private JSObject runnable; - public JSRunnable(JSObject runnable) { - this.runnable = runnable; - synchronized(this) { - new Thread(this).start(); - try { - this.wait(); - } catch (InterruptedException ie) { - } - } - } - - public void run() { - try { - runnable.call("run", null); - synchronized(this) { - notifyAll(); - } - } catch (Throwable t) { - PluginDebug.debug(t.toString()); - t.printStackTrace(System.err); - } - } + public JSRunnable(JSObject runnable) { + this.runnable = runnable; + synchronized (this) { + new Thread(this).start(); + try { + this.wait(); + } catch (InterruptedException ie) { + } + } + } + + public void run() { + try { + runnable.call("run", null); + synchronized (this) { + notifyAll(); + } + } catch (Throwable t) { + PluginDebug.debug(t.toString()); + t.printStackTrace(System.err); + } + } } diff --git a/plugin/icedteanp/java/netscape/javascript/JSUtil.java b/plugin/icedteanp/java/netscape/javascript/JSUtil.java index 47bc6e6..14dfda0 100644 --- a/plugin/icedteanp/java/netscape/javascript/JSUtil.java +++ b/plugin/icedteanp/java/netscape/javascript/JSUtil.java @@ -39,21 +39,22 @@ /* ** */ package netscape.javascript; + import java.io.*; public class JSUtil { /* Return the stack trace of an exception or error as a String */ public static String getStackTrace(Throwable t) { - ByteArrayOutputStream captureStream; - PrintWriter p; - - captureStream = new ByteArrayOutputStream(); - p = new PrintWriter(captureStream); + ByteArrayOutputStream captureStream; + PrintWriter p; + + captureStream = new ByteArrayOutputStream(); + p = new PrintWriter(captureStream); - t.printStackTrace(p); - p.flush(); + t.printStackTrace(p); + p.flush(); - return captureStream.toString(); + return captureStream.toString(); } } diff --git a/plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java b/plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java index c7ce827..abaeb55 100644 --- a/plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java +++ b/plugin/icedteanp/java/netscape/security/ForbiddenTargetException.java @@ -37,7 +37,7 @@ exception statement from your version. */ package netscape.security; -public class ForbiddenTargetException extends RuntimeException{ +public class ForbiddenTargetException extends RuntimeException { private static final long serialVersionUID = 1271219852541058396L; |