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

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

@@ -30 +30 @@
 import java.util.HashMap;
 import java.io.File;
+import java.io.Serializable;
 import java.util.Iterator;
 import java.util.Set;
@@ -62 +63 @@
 
     /** do any initialisation of the query object */
-    protected boolean setUpQueryer(HashMap params) {
+    protected boolean setUpQueryer(HashMap<String, Serializable> params) {
     String indexdir = GSFile.collectionBaseDir(this.site_home, this.cluster_name) + File.separatorChar + "index"+File.separatorChar;
     
@@ -173 +174 @@
 
     /** add in term info if available */
-    protected boolean addTermInfo(Element term_list, HashMap params,
+    protected boolean addTermInfo(Element term_list, HashMap<String, Serializable> params,
                   Object query_result) {
     String query_level = (String)params.get(LEVEL_PARAM); // the current query level