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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java

@@ -34 +34 @@
 import java.util.Vector;
 import java.io.File;
+import java.io.Serializable;
 
 import org.apache.log4j.*;
@@ -391 +392 @@
         if (name.equals(LEVEL_PARAM))
         {
-            ArrayList level_ids = new ArrayList();
-            ArrayList level_names = new ArrayList();
+            ArrayList<String> level_ids = new ArrayList<String>();
+            ArrayList<String> level_names = new ArrayList<String>();
             getLevelData(level_ids, level_names, lang);
             if (level_ids.size() > 1)
@@ -429 +430 @@
         else if (name.equals(FIELD_FIELD_PARAM))
         {
-            ArrayList fields = new ArrayList();
-            ArrayList field_names = new ArrayList();
+            ArrayList<String> fields = new ArrayList<String>();
+            ArrayList<String> field_names = new ArrayList<String>();
             getIndexData(fields, field_names, lang);
             // the field list -  read from config file
@@ -438 +439 @@
             // Changed from:
             // param = GSXML.createParameterDescription2(this.doc, name, getTextString("param."+name, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)fields.get(0), fields, field_names );
-            String default_value = (fields.size() > 0) ? (String) fields.get(0) : null;
+            String default_value = (fields.size() > 0) ? fields.get(0) : null;
             // don't want to access element 0 if fields.size()==0, and
             // GSXML.createParameterDescription2 checks for default_value==null condition
@@ -465 +466 @@
 
     // should cache some of this
-    protected void getLevelData(ArrayList level_ids, ArrayList level_names, String lang)
+    protected void getLevelData(ArrayList<String> level_ids, ArrayList<String> level_names, String lang)
     {
         Element level_list = (Element) GSXML.getChildByTagName(this.config_info, LEVEL_ELEM + GSXML.LIST_MODIFIER);
@@ -565 +566 @@
 
         // Process the request parameters
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
         // Make sure a query has been specified
@@ -658 +659 @@
     /** methods to handle actually doing the query */
     /** do any initialisation of the query object */
-    abstract protected boolean setUpQueryer(HashMap params);
+    abstract protected boolean setUpQueryer(HashMap<String, Serializable> params);
 
     /** do the query */
@@ -673 +674 @@
 
     /** add in term info if available */
-    abstract protected boolean addTermInfo(Element term_list, HashMap params, Object query_result);
+    abstract protected boolean addTermInfo(Element term_list, HashMap<String, Serializable> params, Object query_result);
 
     /**
@@ -680 +681 @@
      */
     /** We assume the combination (AND/OR) is done by the match param */
-    protected String parseFieldQueryParams(HashMap params)
+    protected String parseFieldQueryParams(HashMap<String, Serializable> params)
     {
 
@@ -707 +708 @@
      * query
      */
-    protected String parseAdvancedFieldQueryParams(HashMap params)
+    protected String parseAdvancedFieldQueryParams(HashMap<String, Serializable> params)
     {