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

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

@@ -105 +105 @@
         Element index_sub_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_SUBCOLLECTION_ELEM+GSXML.LIST_MODIFIER);
         if (index_sub_list == null) return true; // processed, just not a very interesting result
-        ArrayList index_sub_ids = new ArrayList();
-        ArrayList index_sub_names = new ArrayList();
+        ArrayList<String> index_sub_ids = new ArrayList<String>();
+        ArrayList<String> index_sub_names = new ArrayList<String>();
         getIndexSubcollectionData(index_sub_ids, index_sub_names, lang);
         String param_type = GSXML.PARAM_TYPE_ENUM_SINGLE;
@@ -122 +122 @@
         Element index_lang_list = (Element)GSXML.getChildByTagName(this.config_info, INDEX_LANGUAGE_ELEM+GSXML.LIST_MODIFIER);
             if (index_lang_list == null) return true; // processed, just not a very interesting result
-        ArrayList index_lang_ids = new ArrayList();
-        ArrayList index_lang_names = new ArrayList();
+        ArrayList<String> index_lang_ids = new ArrayList<String>();
+        ArrayList<String> index_lang_names = new ArrayList<String>();
         getIndexLanguageData(index_lang_ids, index_lang_names, lang);
         String param_type = GSXML.PARAM_TYPE_ENUM_SINGLE;
@@ -150 +150 @@
      * might be implemented by subclass
      */
-    protected void getIndexSubcollectionData(ArrayList index_ids, ArrayList index_names, String lang){}
+    protected void getIndexSubcollectionData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang){}
     
     /** get the details about the indexes available
      * might be implemented by subclass
      */
-    protected void getIndexLanguageData(ArrayList index_ids, ArrayList index_names, String lang){}
+    protected void getIndexLanguageData(ArrayList<String> index_ids, ArrayList<String> index_names, String lang){}