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

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

@@ -15 +15 @@
 import java.io.File;
 import java.io.BufferedReader;
+import java.io.Serializable;
 import java.net.Authenticator;
 
@@ -37 +38 @@
 
     protected String ivia_server_url = null;
-    protected ArrayList index_ids = null;
+    protected ArrayList<String> index_ids = null;
     public IViaSearch()
     {
@@ -62 +63 @@
     does_multi_index_search = true;
     this.default_index = ",kw,au,su,ti,de,fu,"; // all of them
-    index_ids = new ArrayList();
+    index_ids = new ArrayList<String>();
     index_ids.add("kw");
     index_ids.add("au");    
@@ -88 +89 @@
 
     // 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
@@ -195 +196 @@
        An IVia server has a fixed list of fields to search (I think) so we can hard code them here rather than reading them in from a config file
     */
-    protected void getIndexData(ArrayList index_ids, ArrayList index_names,String lang){
+    protected void getIndexData(ArrayList<String> index_ids, ArrayList<String> index_names,String lang){
     index_ids.addAll(this.index_ids);
     index_names.add(getTextString("param."+INDEX_PARAM+".kw", lang));