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

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

@@ -12 +12 @@
 import java.util.HashMap;
 import java.io.File;
+import java.io.Serializable;
 
 import org.apache.log4j.*;
@@ -130 +131 @@
         // extract the params from the cgi-request, 
         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 coll_name = (String) params.get(GSParams.COLLECTION);
@@ -214 +215 @@
         // extract the params from the cgi-request, 
         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 coll_name = (String) params.get(GSParams.COLLECTION);