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

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

@@ -36 +36 @@
 
 import java.io.File;
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -118 +119 @@
             return result;
         }
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
         String oid = (String) params.get(GSXML.NODE_ID_ATT);
@@ -148 +149 @@
             return result;
         }
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
         String srcFile = (String) params.get("sourcefile"); //TODO: Replace with a constant
@@ -182 +183 @@
             return result;
         }
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
         String oid = (String) params.get(GSXML.NODE_ID_ATT);
@@ -317 +318 @@
             return result;
         }
-        HashMap params = GSXML.extractParams(param_list, false);
+        HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
 
         String oid = (String) params.get(GSXML.NODE_ID_ATT);
@@ -333 +334 @@
         for (int i = 1; i < assocFiles.size(); i++)
         {
-            metadataList.appendChild(GSXML.createMetadataElement(this.doc, "assocfile", (String) assocFiles.get(i)));
+            metadataList.appendChild(GSXML.createMetadataElement(this.doc, "assocfile", assocFiles.get(i)));
         }