Minor update to Generics

zb939r · zb939r · commit 6878b3f02218 · 2011-11-14T10:51:42.000-05:00
diff --git a/JSONArray.java b/JSONArray.java
@@ -179,7 +179,7 @@ public JSONArray(Object array) throws JSONException {
     }
     
     @Override
-    public Iterator iterator() {
+    public Iterator<Object> iterator() {
         return myArrayList.iterator();
     }
     
diff --git a/JSONException.java b/JSONException.java
@@ -7,7 +7,9 @@
  */
 public class JSONException extends Exception {
 
-    /**
+	private static final long serialVersionUID = 1L;
+
+	/**
      * Constructs a JSONException with an explanatory message.
      * @param message Detail about the reason for the exception.
      */
diff --git a/JSONObject.java b/JSONObject.java
@@ -238,7 +238,7 @@ public JSONObject(JSONTokener x) throws JSONException {
      *  the JSONObject.
      * @throws JSONException 
      */
-    public JSONObject(Map map) {
+    public JSONObject(Map<String, Object> map) {
         this.map = new HashMap<String, Object>();
         if (map != null) {
             for( Map.Entry<String, Object> e : this.map.entrySet() ) {
diff --git a/XMLTokener.java b/XMLTokener.java
@@ -39,7 +39,7 @@ public class XMLTokener extends JSONTokener {
    /** The table of entity values. It initially contains Character values for
     * amp, apos, gt, lt, quot.
     */
-   public static final Map entity;
+   public static final Map<String, Object> entity;
 
    static {
        entity = new TreeMap<String, Object>();

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public JSONArray(Object array) throws JSONException {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`@Override`
`182`		`- public Iterator iterator() {`
	`182`	`+ public Iterator<Object> iterator() {`
`183`	`183`	`return myArrayList.iterator();`
`184`	`184`	`}`
`185`	`185`