Fixed type safety warnings for json plugin

mapeditor · Dec 21, 2008 · 19062fa · 19062fa
1 parent c4fe51b
commit 19062fa
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/plugins/json/src/org/json/CookieList.java b/plugins/json/src/org/json/CookieList.java
@@ -51,7 +51,7 @@ public static JSONObject toJSONObject(String string)
      */
     public static String toString(JSONObject o) {
         boolean      b = false;
-        Iterator     keys = o.keys();
+        Iterator<String>     keys = o.keys();
         String       s;
         StringBuffer sb = new StringBuffer();
         while (keys.hasNext()) {

diff --git a/plugins/json/src/org/json/HTTP.java b/plugins/json/src/org/json/HTTP.java
@@ -107,7 +107,7 @@ public static JSONObject toJSONObject(String string) throws ParseException {
      *  information. 
      */
     public static String toString(JSONObject o) throws NoSuchElementException {
-        Iterator     keys = o.keys();
+        Iterator<String>     keys = o.keys();
         String       s;
         StringBuffer sb = new StringBuffer();
         if (o.has("Status-Code") && o.has("Reason-Phrase")) {

diff --git a/plugins/json/src/org/json/JSONArray.java b/plugins/json/src/org/json/JSONArray.java
@@ -47,14 +47,14 @@ public class JSONArray {
     /**
      * The getArrayList where the JSONArray's properties are kept.
      */
-    private ArrayList myArrayList;
+    private ArrayList<Object> myArrayList;
 
 
     /**
      * Construct an empty JSONArray.
      */
     public JSONArray() {
-        myArrayList = new ArrayList();
+        myArrayList = new ArrayList<Object>();
     }
 
 
@@ -113,8 +113,8 @@ public JSONArray(String string) throws ParseException {
      * Construct a JSONArray from a Collection.
      * @param collection     A Collection.
      */
-    public JSONArray(Collection collection) {
-        myArrayList = new ArrayList(collection);
+    public JSONArray(Collection<Object> collection) {
+        myArrayList = new ArrayList<Object>(collection);
     }
 
 
@@ -139,7 +139,7 @@ public Object get(int index) throws NoSuchElementException {
      * Get the ArrayList which is holding the elements of the JSONArray.
      * @return      The ArrayList.
      */
-    ArrayList getArrayList() {
+    ArrayList<Object> getArrayList() {
         return myArrayList;
     }
 

diff --git a/plugins/json/src/org/json/JSONObject.java b/plugins/json/src/org/json/JSONObject.java
@@ -92,7 +92,7 @@ public String toString() {
     /**
      * The hash map where the JSONObject's properties are kept.
      */
-    private HashMap myHashMap;
+    private HashMap<String, Object> myHashMap;
 
     /**
      * It is sometimes more convenient and less ambiguous to have a NULL
@@ -106,7 +106,7 @@ public String toString() {
      * Construct an empty JSONObject.
      */
     public JSONObject() {
-        myHashMap = new HashMap();
+        myHashMap = new HashMap<String, Object>();
     }
 
 
@@ -175,8 +175,8 @@ public JSONObject(String string) throws ParseException {
      * @param map A map object that can be used to initialize the contents of
      *  the JSONObject.
      */
-    public JSONObject(Map map) {
-        myHashMap = new HashMap(map);
+    public JSONObject(Map<String, Object> map) {
+        myHashMap = new HashMap<String, Object>(map);
     }
 
 
@@ -278,7 +278,7 @@ public double getDouble(String key)
      * Get the HashMap the holds that contents of the JSONObject.
      * @return The getHashMap.
      */
-     HashMap getHashMap() {
+     HashMap<String, Object> getHashMap() {
         return myHashMap;
      }
 
@@ -373,7 +373,7 @@ public boolean isNull(String key) {
      *
      * @return An iterator of the keys.
      */
-    public Iterator keys() {
+    public Iterator<String> keys() {
         return myHashMap.keySet().iterator();
     }
 
@@ -396,7 +396,7 @@ public int length() {
      */
     public JSONArray names() {
         JSONArray ja = new JSONArray();
-        Iterator  keys = keys();
+        Iterator<String>  keys = keys();
         while (keys.hasNext()) {
             ja.put(keys.next());
         }
@@ -805,7 +805,7 @@ public JSONArray toJSONArray(JSONArray names) {
      *  with <code>}</code>&nbsp;<small>(right brace)</small>.
      */
     public String toString() {
-        Iterator     keys = keys();
+        Iterator<String>     keys = keys();
         Object       o = null;
         String       s;
         StringBuffer sb = new StringBuffer();
@@ -864,7 +864,7 @@ public String toString(int indentFactor) {
      */
     String toString(int indentFactor, int indent) {
         int          i;
-        Iterator     keys = keys();
+        Iterator<String>     keys = keys();
         String       pad = "";
         StringBuffer sb = new StringBuffer();
         indent += indentFactor;

diff --git a/plugins/json/src/org/json/XML.java b/plugins/json/src/org/json/XML.java
@@ -266,7 +266,7 @@ public static String toString(Object o, String tagName) {
         JSONArray    ja;
         JSONObject   jo;
         String       k;
-        Iterator     keys;
+        Iterator<String>     keys;
         int          len;
         String       s;
         Object       v;

diff --git a/plugins/json/src/org/json/XMLTokener.java b/plugins/json/src/org/json/XMLTokener.java
@@ -16,10 +16,10 @@ public class XMLTokener extends JSONTokener
    /** The table of entity values. It initially contains Character values for
     * amp, apos, gt, lt, quot.
     */
-   private static final HashMap entity;
+   private static final HashMap<String, Character> entity;
 
    static {
-       entity = new HashMap(8);
+       entity = new HashMap<String, Character>(8);
        entity.put("amp",  XML.AMP);
        entity.put("apos", XML.APOS);
        entity.put("gt",   XML.GT);