Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

Timestamp:

2012-05-22T13:01:04+12:00 (12 years ago)

Author:

sjm84

Message:

Fixing Greenstone 3's use (or lack thereof) of generics, this was done automatically so we may want to change it over time. This change will also auto-format any files that have not already been formatted.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (8 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -28 +28 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.Transformer;
+
+import java.io.Serializable;
 import java.io.StringWriter;
 import javax.xml.transform.stream.StreamResult;
@@ -299 +301 @@
     }
 
-    public static HashMap extractParams(Element xml, boolean deep)
+    public static HashMap<String, Serializable> extractParams(Element xml, boolean deep)
     {
         return extractParams(xml, deep, null);
@@ -308 +310 @@
      * deep=true, extracts embedded params, otherwise just top level params
      */
-    public static HashMap extractParams(Element xml, boolean deep, String toFind)
+    public static HashMap<String, Serializable> extractParams(Element xml, boolean deep, String toFind)
     {
 
@@ -326 +328 @@
             params = xml.getChildNodes();
         }
-        HashMap param_map = new HashMap();
+        HashMap<String, Serializable> param_map = new HashMap<String, Serializable>();
         for (int i = 0; i < params.getLength(); i++)
         {
@@ -354 +356 @@
                     String namespace = name.substring(0, pos);
                     name = name.substring(pos + 1);
-                    HashMap map = (HashMap) param_map.get(namespace);
+                    HashMap<String, String> map = (HashMap<String, String>) param_map.get(namespace);
                     if (map == null)
                     {
-                        map = new HashMap();
+                        map = new HashMap<String, String>();
                         param_map.put(namespace, map);
                     }
@@ -669 +671 @@
     }
 
-    public static HashMap getChildrenMap(Node n)
-    {
-
-        HashMap map = new HashMap();
+    public static HashMap<String, Node> getChildrenMap(Node n)
+    {
+
+        HashMap<String, Node> map = new HashMap<String, Node>();
         Node child = n.getFirstChild();
         while (child != null)
@@ -856 +858 @@
     }
 
-    public static Element createParameterDescription2(Document owner, String id, String display_name, String type, String default_value, ArrayList option_ids, ArrayList option_names)
+    public static Element createParameterDescription2(Document owner, String id, String display_name, String type, String default_value, ArrayList<String> option_ids, ArrayList<String> option_names)
     {
 
@@ -872 +874 @@
             {
                 Element e = owner.createElement(PARAM_OPTION_ELEM);
-                e.setAttribute(NAME_ATT, (String) option_ids.get(i));
-                e.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, (String) option_names.get(i)));
+                e.setAttribute(NAME_ATT, option_ids.get(i));
+                e.appendChild(createDisplayTextElement(owner, GSXML.DISPLAY_TEXT_NAME, option_names.get(i)));
                 p.appendChild(e);
             }