JSONObject and JSONArray initialization:

JSONObject(Map<String, ?> map) allows to initialize the JSONObject with
a Map<String, String>

JSONArray(Collection<?> collection) allows to initialize a JSONArray
with a Collection<JSONObject>

Author: Lukas Treyer

JSONArray.java

@@ -151,10 +151,10 @@ public JSONArray(String source) throws JSONException {
      * @param collection
      *            A Collection.
      */
-    public JSONArray(Collection<Object> collection) {
+    public JSONArray(Collection<?> collection) {
         this.myArrayList = new ArrayList<Object>();
         if (collection != null) {
-            Iterator<Object> iter = collection.iterator();
+            Iterator<?> iter = collection.iterator();
             while (iter.hasNext()) {
                 this.myArrayList.add(JSONObject.wrap(iter.next()));
             }

JSONObject.java

@@ -243,12 +243,14 @@ public JSONObject(JSONTokener x) throws JSONException {
      *            the JSONObject.
      * @throws JSONException
      */
-    public JSONObject(Map<String, Object> map) {
+    public JSONObject(Map<String, ?> map) {
         this.map = new HashMap<String, Object>();
         if (map != null) {
-            Iterator<Entry<String, Object>> i = map.entrySet().iterator();
+        	Set<?> eSet = map.entrySet();
+            @SuppressWarnings("unchecked")
+			Iterator<Entry<String, ?>> i = (Iterator<Entry<String, ?>>) eSet.iterator();
             while (i.hasNext()) {
-                Entry<String, Object> entry = i.next();
+                Entry<String, ?> entry = i.next();
                 Object value = entry.getValue();
                 if (value != null) {
                     this.map.put(entry.getKey(), wrap(value));