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

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

@@ -29 +29 @@
 import org.greenstone.LuceneWrapper3.GS2Analyzer;
 import java.io.File;
+import java.io.Serializable;
 
 import org.apache.log4j.*;
@@ -43 +44 @@
     protected static final String INDEX_ELEM = "index";
 
-    protected ArrayList index_ids;
+    protected ArrayList<String> index_ids;
 
     public LuceneSearch()
     {
-    index_ids = new ArrayList();
+    index_ids = new ArrayList<String>();
     }
     
@@ -77 +78 @@
     }
     
-    protected void getIndexData(ArrayList index_ids, ArrayList index_names, String lang) 
+    protected void getIndexData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang) 
     {
     // copying exercise for index_ids, 
@@ -133 +134 @@
 
     // Process the request parameters to make sure a query has been specified
-    HashMap params = GSXML.extractParams(param_list, false);
+    HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
     String query_string = (String) params.get(QUERY_PARAM);
 
@@ -164 +165 @@
     }
 
-    HashMap params = GSXML.extractParams(param_list, false);
+    HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
     String query_string = (String) params.get(QUERY_PARAM);