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

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

@@ -32 +32 @@
 
 import java.io.File;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Vector;
@@ -115 +116 @@
             return result;  
         }
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
         
         String oid = (String) params.get("oid");
@@ -152 +153 @@
             return result;  
         }
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
         
         String srcFile = (String) params.get("srcfile");
@@ -223 +224 @@
             return result;  
         }
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
         
         String oid = (String) params.get("oid");
@@ -269 +270 @@
         
         String srcFile = info.getInfo("src-file");
-        Vector data = info.getMultiInfo("assoc-file");
+        Vector<String> data = info.getMultiInfo("assoc-file");
         
         Element metadataList = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
@@ -276 +277 @@
         for (int i = 0; i < data.size(); i++)
         {
-            metadataList.appendChild(createMetadataElement("assocfile", (String)data.get(i)));
+            metadataList.appendChild(createMetadataElement("assocfile", data.get(i)));
         }