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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -31 +31 @@
 
     /** the 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;
@@ -42 +42 @@
 
     /** the list of actions */
-    protected HashMap action_map = null;
+    protected HashMap<String, Action> action_map = null;
 
     /** the list of params */
@@ -49 +49 @@
 
     /** the list of interfaces this is based on */
-    protected ArrayList base_interfaces = null;
+    protected ArrayList<String> base_interfaces = null;
 
     public Receptionist()
@@ -55 +55 @@
         this.converter = new XMLConverter();
         this.doc = this.converter.newDOM();
-        this.action_map = new HashMap();
+        this.action_map = new HashMap<String, Action>();
     }
 
@@ -67 +67 @@
     }
 
-    public void setConfigParams(HashMap params)
+    public void setConfigParams(HashMap<String, Comparable> params)
     {
         this.config_params = params;
     }
 
-    public HashMap getConfigParams()
+    public HashMap<String, Comparable> getConfigParams()
     {
         return this.config_params;
@@ -211 +211 @@
 
         // find the  appropriate action 
-        Action a = (Action) this.action_map.get(action);
+        Action a = this.action_map.get(action);
 
         String action_name = null;
@@ -313 +313 @@
             if (base_interfaces == null)
             {
-                base_interfaces = new ArrayList();
+                base_interfaces = new ArrayList<String>();
             }
             base_interfaces.add(base_interface);