Revision: 6942
Author: [email protected]
Date: Mon Nov 16 18:48:07 2009
Log: Reverting r6935 because it breaks firefox tests in web mode.

Patch by: jlabanca


http://code.google.com/p/google-web-toolkit/source/detail?r=6942

Modified:
  /trunk/user/src/com/google/gwt/json/client/JSONObject.java

=======================================
--- /trunk/user/src/com/google/gwt/json/client/JSONObject.java  Mon Nov 16  
15:54:41 2009
+++ /trunk/user/src/com/google/gwt/json/client/JSONObject.java  Mon Nov 16  
18:48:07 2009
@@ -195,9 +195,7 @@
    private native void addAllKeys(Collection<String> s) /*-{
      var jsObject = [email protected]::jsObject;
      for (var key in jsObject) {
-      if (jsObject.hasOwnProperty(key)) {
-        [email protected]::add(Ljava/lang/Object;)(key);
-      }
+      [email protected]::add(Ljava/lang/Object;)(key);
      }
    }-*/;

@@ -215,9 +213,7 @@
      var jsObject = [email protected]::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 = [email protected]::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 = [email protected]::jsObject;
-    var v;
-    if (jsObject.hasOwnProperty(key)) {
-      v = jsObject[key];
-    }
+    var v = [email protected]::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);
    }-*/;

-- 
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to