changed Map<String, ?> method parameters to Map<?,?>

changed Iterator to foreach loop in JSONArray ctor
JSONArray(Collection<?> collection) and JSONObject ctor
JSONObject(Map<?,?> map)

Author: Lukas Treyer

JSONArray.java

@@ -154,10 +154,9 @@ public JSONArray(String source) throws JSONException {
     public JSONArray(Collection<?> collection) {
         this.myArrayList = new ArrayList<Object>();
         if (collection != null) {
-            Iterator<?> iter = collection.iterator();
-            while (iter.hasNext()) {
-                this.myArrayList.add(JSONObject.wrap(iter.next()));
-            }
+        	for (Object o: collection){
+        		this.myArrayList.add(JSONObject.wrap(o));
+        	}
         }
     }
 
@@ -799,7 +798,7 @@ public JSONArray put(long value) {
      *            A Map value.
      * @return this.
      */
-    public JSONArray put(Map<String, ?> value) {
+    public JSONArray put(Map<?, ?> value) {
         this.put(new JSONObject(value));
         return this;
     }
@@ -920,7 +919,7 @@ public JSONArray put(int index, long value) throws JSONException {
      *             If the index is negative or if the the value is an invalid
      *             number.
      */
-    public JSONArray put(int index, Map<String, ?> value) throws JSONException {
+    public JSONArray put(int index, Map<?, ?> value) throws JSONException {
         this.put(index, new JSONObject(value));
         return this;
     }

JSONObject.java

@@ -243,17 +243,13 @@ public JSONObject(JSONTokener x) throws JSONException {
      *            the JSONObject.
      * @throws JSONException
      */
-    public JSONObject(Map<String, ?> map) {
+    public JSONObject(Map<?, ?> map) {
         this.map = new HashMap<String, Object>();
         if (map != null) {
-        	Set<?> eSet = map.entrySet();
-            @SuppressWarnings("unchecked")
-			Iterator<Entry<String, ?>> i = (Iterator<Entry<String, ?>>) eSet.iterator();
-            while (i.hasNext()) {
-                Entry<String, ?> entry = i.next();
-                Object value = entry.getValue();
+        	for (final Entry<?, ?> e : map.entrySet()) {
+                final Object value = e.getValue();
                 if (value != null) {
-                    this.map.put(entry.getKey(), wrap(value));
+                    this.map.put(String.valueOf(e.getKey()), wrap(value));
                 }
             }
         }
@@ -1270,7 +1266,7 @@ public JSONObject put(String key, long value) throws JSONException {
      * @return this.
      * @throws JSONException
      */
-    public JSONObject put(String key, Map<String, ?> value) throws JSONException {
+    public JSONObject put(String key, Map<?, ?> value) throws JSONException {
         this.put(key, new JSONObject(value));
         return this;
     }
@@ -1666,7 +1662,7 @@ public static String valueToString(Object value) throws JSONException {
         }
         if (value instanceof Map) {
             @SuppressWarnings("unchecked")
-            Map<String, ?> map = (Map<String, ?>) value;
+            Map<?, ?> map = (Map<?, ?>) value;
             return new JSONObject(map).toString();
         }
         if (value instanceof Collection) {
@@ -1718,7 +1714,7 @@ public static Object wrap(Object object) {
             }
             if (object instanceof Map) {
                 @SuppressWarnings("unchecked")
-                Map<String, ?> map = (Map<String, ?>) object;
+                Map<?, ?> map = (Map<?, ?>) object;
                 return new JSONObject(map);
             }
             Package objectPackage = object.getClass().getPackage();
@@ -1758,7 +1754,7 @@ static final Writer writeValue(Writer writer, Object value,
             ((JSONArray) value).write(writer, indentFactor, indent);
         } else if (value instanceof Map) {
             @SuppressWarnings("unchecked")
-            Map<String, ?> map = (Map<String, ?>) value;
+            Map<?, ?> map = (Map<?, ?>) value;
             new JSONObject(map).write(writer, indentFactor, indent);
         } else if (value instanceof Collection) {
             @SuppressWarnings("unchecked")