commit 345a70897b4874baa7f0ac142a7a094ac37f8de3
author jlabanca@google.com <jlabanca@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Nov 17 02:48:07 2009 +0000
committer jlabanca@google.com <jlabanca@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Tue Nov 17 02:48:07 2009 +0000
tree 9bab9eef145157fd0f9bccaf6e76068dd146a2b9
parent ad4045a65cafbed690ab464c6e477f2cfb061c37

Reverting r6935 because it breaks firefox tests in web mode.

Patch by: jlabanca



git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@6942 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/json/client/JSONObject.java

diff --git a/user/src/com/google/gwt/json/client/JSONObject.java b/user/src/com/google/gwt/json/client/JSONObject.java
index efb1da4..77080a3 100644
--- a/user/src/com/google/gwt/json/client/JSONObject.java
+++ b/user/src/com/google/gwt/json/client/JSONObject.java
@@ -195,9 +195,7 @@
   private native void addAllKeys(Collection<String> s) /*-{
     var jsObject = this.@com.google.gwt.json.client.JSONObject::jsObject;
     for (var key in jsObject) {
-      if (jsObject.hasOwnProperty(key)) {
-        s.@java.util.Collection::add(Ljava/lang/Object;)(key);
-      }
+      s.@java.util.Collection::add(Ljava/lang/Object;)(key);
     }
   }-*/;
 
@@ -215,9 +213,7 @@
     var jsObject = this.@com.google.gwt.json.client.JSONObject::jsObject;
     var i = 0;
     for (var key in jsObject) {
-      if (jsObject.hasOwnProperty(key)) {
-        result[i++] = key;
-      }
+      result[i++] = key;
     }
     return result;
   }-*/;
@@ -226,19 +222,13 @@
     var jsObject = this.@com.google.gwt.json.client.JSONObject::jsObject;
     var size = 0;
     for (var key in jsObject) {
-      if (jsObject.hasOwnProperty(key)) {
-        ++size;
-      }
+      ++size;
     }
     return size;
   }-*/;
 
   private native JSONValue get0(String key) /*-{
-    var jsObject = this.@com.google.gwt.json.client.JSONObject::jsObject;
-    var v;
-    if (jsObject.hasOwnProperty(key)) {
-      v = jsObject[key];
-    }
+    var v = this.@com.google.gwt.json.client.JSONObject::jsObject[key];
     var func = @com.google.gwt.json.client.JSONParser::typeMap[typeof v];
     return func ? func(v) : @com.google.gwt.json.client.JSONParser::throwUnknownTypeException(Ljava/lang/String;)(typeof v);
   }-*/;