1 files changed, 30 insertions, 52 deletions

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;