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

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

@@ -16 +16 @@
 import java.util.Iterator;
 import java.io.File;
+import java.io.Serializable;
 
 import org.apache.log4j.*;
@@ -56 +57 @@
         // extract the params from the cgi-request, and check that we have a coll specified
         Element cgi_param_list = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
-        HashMap params = GSXML.extractParams(cgi_param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(cgi_param_list, false);
 
         String request_type = (String) params.get(GSParams.REQUEST_TYPE);
@@ -189 +190 @@
 
         // get the metadata elements needed from the format statement if any
-        HashSet metadata_names = new HashSet();
+        HashSet<String> metadata_names = new HashSet<String>();
         metadata_names.add("Title");
         // add in the format info to the stylesheet if there is any
@@ -246 +247 @@
 
     /** this filters out some of the doc results for result paging */
-    protected Element filterDocList(HashMap params, HashMap service_params, Element orig_doc_list)
+    protected Element filterDocList(HashMap<String, Serializable> params, HashMap service_params, Element orig_doc_list)
     {