aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--plugin/icedteanp/java/netscape/javascript/JSObject.java16
2 files changed, 8 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a421ca..6e0d7b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-03-31 Denis Lila <[email protected]>
+ * 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 <[email protected]>
+
* plugin/icedteanp/java/sun/applet/PluginObjectStore.java:
Add citation of Effective Java, 2nd edition.
diff --git a/plugin/icedteanp/java/netscape/javascript/JSObject.java b/plugin/icedteanp/java/netscape/javascript/JSObject.java
index a5bf41f..d93fa9c 100644
--- a/plugin/icedteanp/java/netscape/javascript/JSObject.java
+++ b/plugin/icedteanp/java/netscape/javascript/JSObject.java
@@ -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 @@ public final class JSObject {
PluginAppletViewer.setSlot(internal, index, value);
}
- // TODO: toString, finalize.
-
/**
* Removes a named member of a JavaScript object.
*/
@@ -267,14 +263,4 @@ public final class JSObject {
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;
- }
}