Changeset 25635 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.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/action/Action.java (modified) (6 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -23 +23 @@
 
     /** the system set up variables */
-    protected HashMap config_params = null;
+    protected HashMap<String, Comparable> config_params = null;
     /** container Document to create XML Nodes */
     protected Document doc = null;
@@ -43 +43 @@
 
     /** the config variables must be set before configure is called */
-    public void setConfigParams(HashMap params)
+    public void setConfigParams(HashMap<String, Comparable> params)
     {
         this.config_params = params;
@@ -92 +92 @@
     }
 
-    protected void getRequiredMetadataNames(Element format, HashSet meta_names)
+    protected void getRequiredMetadataNames(Element format, HashSet<String> meta_names)
     {
         extractMetadataNames(format, meta_names);
@@ -98 +98 @@
     }
 
-    protected void extractMetadataNames(Element format, HashSet meta_names)
+    protected void extractMetadataNames(Element format, HashSet<String> meta_names)
     {
         //NodeList nodes = format.getElementsByTagNameNS("metadata", "http://www.greenstone.org/configformat");
@@ -133 +133 @@
     }
 
-    protected void addLinkMetadataNames(Element format, HashSet meta_names)
+    protected void addLinkMetadataNames(Element format, HashSet<String> meta_names)
     {
         // The XSL tranform for
@@ -187 +187 @@
     }
 
-    protected Element createMetadataParamList(HashSet metadata_names)
+    protected Element createMetadataParamList(HashSet<String> metadata_names)
     {
         Element param_list = this.doc.createElement(GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
 
         Element param = null;
-        Iterator i = metadata_names.iterator();
+        Iterator<String> i = metadata_names.iterator();
         while (i.hasNext())
         {
-            String name = (String) i.next();
+            String name = i.next();
             param = this.doc.createElement(GSXML.PARAM_ELEM);
             param_list.appendChild(param);