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

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

@@ -198 +198 @@
     DBInfo collection_info = this.coll_db.getInfo("collection");
     
-    Set keys = collection_info.getKeys();
-
-    Vector valid_keys = new Vector();
+    Set<String> keys = collection_info.getKeys();
+
+    Vector<String> valid_keys = new Vector<String>();
 
     // Iterate over keys and add valid ones to the valid_keys vector
     String current_key = null;
-    Iterator iter = keys.iterator();
+    Iterator<String> iter = keys.iterator();
 
     while (iter.hasNext()) {
-        current_key = (String) iter.next();
+        current_key = iter.next();
         if(current_key.matches("^metadatalist-([a-zA-Z][^-])*$"))
         {
@@ -232 +232 @@
 
     while (iter.hasNext()) {
-        current_key = (String) iter.next();
+        current_key = iter.next();
 
         // Create metadataSet using the current key and add to metadataSetList
@@ -244 +244 @@
 
         // Create a metadata element for each value and add to metadataSet
-        Vector sub_info = collection_info.getMultiInfo(current_key);
-        Iterator iter2 = sub_info.iterator();
+        Vector<String> sub_info = collection_info.getMultiInfo(current_key);
+        Iterator<String> iter2 = sub_info.iterator();
         while (iter2.hasNext()) {
-            value = (String) iter2.next();     
+            value = iter2.next();     
             metadata = this.doc.createElement("metadata");
             metadata.setAttribute(GSXML.NAME_ATT, value);