changeset 195:43d21942eb2d

Fix JSObject.equals.
author Denis Lila <dlila@redhat.com>
date Thu, 31 Mar 2011 17:20:17 -0400
parents fc3bcf836c77
children 1d604ccd9b6b
files ChangeLog plugin/icedteanp/java/netscape/javascript/JSObject.java
diffstat 2 files changed, 8 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Mar 31 17:07:10 2011 -0400
+++ b/ChangeLog	Thu Mar 31 17:20:17 2011 -0400
@@ -1,3 +1,10 @@
+2011-03-31  Denis Lila  <dlila@redhat.com>
+
+	* plugin/icedteanp/java/netscape/javascript/JSObject.java:
+	Fix comments, remove unused imports.
+	(equals): Remove. It was breaking the reflexivity in the
+	equals contract.
+
 2011-03-31  Denis Lila  <dlila@redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginObjectStore.java:
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java	Thu Mar 31 17:07:10 2011 -0400
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java	Thu Mar 31 17:20:17 2011 -0400
@@ -37,7 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-/* more doc todo:
+/* more doc TODO:
  *  threads
  *  gc
  *
@@ -47,10 +47,8 @@
 package netscape.javascript;
 
 import java.applet.Applet;
-import java.security.AccessControlContext;
 import java.security.AccessControlException;
 import java.security.AccessController;
-import java.security.BasicPermission;
 
 import sun.applet.PluginAppletViewer;
 import sun.applet.PluginDebug;
@@ -193,8 +191,6 @@
         PluginAppletViewer.setSlot(internal, index, value);
     }
 
-    // TODO: toString, finalize.
-
     /**
      * Removes a named member of a JavaScript object.
      */
@@ -267,14 +263,4 @@
         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) {
-        PluginDebug.debug("JSObject.equals " + obj);
-
-        return false;
-    }
 }