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

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

@@ -292 +292 @@
         logger.debug("metadata response = " + this.converter.getPrettyString(metadata_response));
         NodeList coll_responses = metadata_response.getElementsByTagName(GSXML.RESPONSE_ELEM);
-        ArrayList valid_colls = new ArrayList();
-        ArrayList valid_coll_names = new ArrayList();
+        ArrayList<String> valid_colls = new ArrayList<String>();
+        ArrayList<String> valid_coll_names = new ArrayList<String>();
         for (int i = 0; i < coll_responses.getLength(); i++)
         {
@@ -317 +317 @@
         // ids no all has the list without 'all' option.
         this.coll_ids_list_no_all = new String[1];
-        this.coll_ids_list_no_all = (String[]) valid_colls.toArray(coll_ids_list_no_all);
+        this.coll_ids_list_no_all = valid_colls.toArray(coll_ids_list_no_all);
 
         valid_colls.add(0, "all");
@@ -323 +323 @@
         this.coll_ids_list = new String[1];
         this.coll_names_list = new String[1];
-        this.coll_ids_list = (String[]) valid_colls.toArray(coll_ids_list);
-        this.coll_names_list = (String[]) valid_coll_names.toArray(coll_names_list);
+        this.coll_ids_list = valid_colls.toArray(coll_ids_list);
+        this.coll_names_list = valid_coll_names.toArray(coll_names_list);
         return true;
     }
@@ -361 +361 @@
 
         // organise the nodes into collection lists
-        HashMap coll_map = new HashMap();
+        HashMap<String, Node> coll_map = new HashMap<String, Node>();
 
         for (int i = 0; i < query_doc_list.getLength(); i++)