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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/Library2.java

@@ -47 +47 @@
     protected Document doc = null;
 
-    protected HashMap saved_args = null;
+    protected HashMap<String, String> saved_args = null;
     protected GSParams params = null;
     protected DefaultReceptionist recept = null;
@@ -55 +55 @@
         this.converter = new XMLConverter();
         this.doc = converter.newDOM();
-        this.saved_args = new HashMap();
+        this.saved_args = new HashMap<String, String>();
         this.params = new GSParams();
         this.recept = new DefaultReceptionist();
@@ -63 +63 @@
     {
 
-        HashMap config_params = new HashMap();
+        HashMap<String, Comparable> config_params = new HashMap<String, Comparable>();
         //config_params.put(GSConstants.GSDL3_HOME, gsdl_home);
         config_params.put(GSConstants.SITE_NAME, site_name);
@@ -140 +140 @@
         String action = "p";
         String subaction = "home";
-        String lang = (String) saved_args.get(GSParams.LANGUAGE);
+        String lang = saved_args.get(GSParams.LANGUAGE);
         if (lang == null)
         {
@@ -193 +193 @@
 
         // put in all the params from the session cache
-        Set params = saved_args.keySet();
-        Iterator i = params.iterator();
+        Set<String> params = saved_args.keySet();
+        Iterator<String> i = params.iterator();
         while (i.hasNext())
         {
-            String name = (String) i.next();
+            String name = i.next();
             if (name.equals(GSParams.LANGUAGE))
                 continue;
             Element param = this.doc.createElement(GSXML.PARAM_ELEM);
             param.setAttribute(GSXML.NAME_ATT, name);
-            param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe((String) saved_args.get(name)));
+            param.setAttribute(GSXML.VALUE_ATT, GSXML.xmlSafe(saved_args.get(name)));
             xml_param_list.appendChild(param);
         }