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

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

@@ -13 +13 @@
 import java.util.Vector;
 import java.io.File;
+import java.io.Serializable;
 
 import org.apache.log4j.*;
@@ -47 +48 @@
         // extract the params from the cgi-request, and check that we have a coll specified
         Element cgi_paramList = (Element) GSXML.getChildByTagName(request, GSXML.PARAM_ELEM + GSXML.LIST_MODIFIER);
-        HashMap params = GSXML.extractParams(cgi_paramList, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(cgi_paramList, false);
 
         String service_name = (String) params.get(GSParams.SERVICE);
@@ -107 +108 @@
         // the id of the classifier is the top id of the selected node
         String top_id = OID.getTop(classifier_node);
-        HashSet doc_meta_names = new HashSet();
-        HashSet class_meta_names = new HashSet();
+        HashSet<String> doc_meta_names = new HashSet<String>();
+        HashSet<String> class_meta_names = new HashSet<String>();
         // add in the defaults
         doc_meta_names.add("Title");
@@ -358 +359 @@
     }
 
-    protected void extractMetadataNames(Element new_format, HashSet doc_meta_names, HashSet class_meta_names)
+    protected void extractMetadataNames(Element new_format, HashSet<String> doc_meta_names, HashSet<String> class_meta_names)
     {