Updating to work with java 1.6

sk02241994 · sk02241994 · commit ebc13d668533 · 2025-10-13T12:39:13.000+11:00
diff --git a/src/main/java/org/json/JSONBuilder.java b/src/main/java/org/json/JSONBuilder.java
@@ -40,14 +40,14 @@ public class JSONBuilder {
    *   <li>{@code String.class} -> Identity function</li>
    * </ul>
    */
-  private static final Map<Class<?>,  TypeConverter<?>> classMapping = new HashMap<>();
+  private static final Map<Class<?>,  TypeConverter<?>> classMapping = new HashMap<Class<?>,  TypeConverter<?>>();
 
   /**
    * A mapping from collection interface types to suppliers that produce
    * instances of concrete collection implementations.
    *
    */
-  private static final Map<Class<?>, InstanceCreator<?>> collectionMapping = new HashMap<>();
+  private static final Map<Class<?>, InstanceCreator<?>> collectionMapping = new HashMap<Class<?>, InstanceCreator<?>>();
   
    // Static initializer block to populate default mappings
    static {
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -3283,7 +3283,13 @@ public <T> T fromJson(Class<T> clazz) {
           }
         }
         return obj;
-      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      } catch (NoSuchMethodException e) {
+        throw new JSONException(e);
+      } catch (InstantiationException e) {
+        throw new JSONException(e);
+      } catch (IllegalAccessException e) {
+        throw new JSONException(e);
+      } catch (InvocationTargetException e) {
         throw new JSONException(e);
       }
     }
@@ -3331,7 +3337,13 @@ private <T> Collection<T> fromJsonArray(JSONArray jsonArray, Class<?> collection
           }
         }
         return collection;
-      } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException e) {
+      } catch (NoSuchMethodException e) {
+        throw new JSONException(e);
+      } catch (InstantiationException e) {
+        throw new JSONException(e);
+      } catch (IllegalAccessException e) {
+        throw new JSONException(e);
+      } catch (InvocationTargetException e) {
         throw new JSONException(e);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -3283,7 +3283,13 @@ public <T> T fromJson(Class<T> clazz) {`
`3283`	`3283`	`}`
`3284`	`3284`	`}`
`3285`	`3285`	`return obj;`
`3286`		`- } catch (NoSuchMethodException \| InstantiationException \| IllegalAccessException \| InvocationTargetException e) {`
	`3286`	`+ } catch (NoSuchMethodException e) {`
	`3287`	`+ throw new JSONException(e);`
	`3288`	`+ } catch (InstantiationException e) {`
	`3289`	`+ throw new JSONException(e);`
	`3290`	`+ } catch (IllegalAccessException e) {`
	`3291`	`+ throw new JSONException(e);`
	`3292`	`+ } catch (InvocationTargetException e) {`
`3287`	`3293`	`throw new JSONException(e);`
`3288`	`3294`	`}`
`3289`	`3295`	`}`
`@@ -3331,7 +3337,13 @@ private <T> Collection<T> fromJsonArray(JSONArray jsonArray, Class<?> collection`
`3331`	`3337`	`}`
`3332`	`3338`	`}`
`3333`	`3339`	`return collection;`
`3334`		`- } catch (NoSuchMethodException \| InstantiationException \| IllegalAccessException \| InvocationTargetException e) {`
	`3340`	`+ } catch (NoSuchMethodException e) {`
	`3341`	`+ throw new JSONException(e);`
	`3342`	`+ } catch (InstantiationException e) {`
	`3343`	`+ throw new JSONException(e);`
	`3344`	`+ } catch (IllegalAccessException e) {`
	`3345`	`+ throw new JSONException(e);`
	`3346`	`+ } catch (InvocationTargetException e) {`
`3335`	`3347`	`throw new JSONException(e);`
`3336`	`3348`	`}`
`3337`	`3349`	`}`