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

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

@@ -157 +157 @@
 
     /** returns a list of the child ids in order, null if no children */
-    protected ArrayList getChildrenIds(String node_id)
+    protected ArrayList<String> getChildrenIds(String node_id)
     {
         DBInfo info = this.coll_db.getInfo(node_id);
@@ -170 +170 @@
             return null;
         }
-        ArrayList children = new ArrayList();
+        ArrayList<String> children = new ArrayList<String>();
         StringTokenizer st = new StringTokenizer(contains, ";");
         while (st.hasMoreTokens())
@@ -198 +198 @@
      */
     // assumes only one value per metadata
-    protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList metadata_names) throws GSException
+    protected Element getMetadataList(String node_id, boolean all_metadata, ArrayList<String> metadata_names) throws GSException
     {
         Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM + GSXML.LIST_MODIFIER);
@@ -210 +210 @@
         {
             // return everything out of the database
-            Set keys = info.getKeys();
-            Iterator it = keys.iterator();
+            Set<String> keys = info.getKeys();
+            Iterator<String> it = keys.iterator();
             while (it.hasNext())
             {
-                String key = (String) it.next();
+                String key = it.next();
                 //String value = info.getInfo(key);
-                Vector values = info.getMultiInfo(key);
+                Vector<String> values = info.getMultiInfo(key);
                 for (int i = 0; i < values.size(); i++)
                 {
-                    GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve((String) values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
+                    GSXML.addMetadata(this.doc, metadata_list, key, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
                 }
             }
@@ -228 +228 @@
             for (int i = 0; i < metadata_names.size(); i++)
             {
-                String meta_name = (String) metadata_names.get(i);
+                String meta_name = metadata_names.get(i);
                 String value = getMetadata(node_id, info, meta_name, lang);
                 GSXML.addMetadata(this.doc, metadata_list, meta_name, value);
@@ -375 +375 @@
         if (pos == -1)
         {
-            Vector values = info.getMultiInfo(metadata);
+            Vector<String> values = info.getMultiInfo(metadata);
             if (values != null)
             {
@@ -391 +391 @@
                         result.append(separator);
                     }
-                    result.append(this.macro_resolver.resolve((String) values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
+                    result.append(this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, node_id));
                 }
                 return result.toString();
@@ -482 +482 @@
         {
             // we have multiple meta
-            Vector values = relation_info.getMultiInfo(metadata);
+            Vector<String> values = relation_info.getMultiInfo(metadata);
             if (values != null)
             {
@@ -496 +496 @@
                         result.append(separator);
                     }
-                    result.append(this.macro_resolver.resolve((String) values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id));
+                    result.append(this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id));
                 }
             }
@@ -522 +522 @@
             else
             {
-                Vector values = relation_info.getMultiInfo(metadata);
+                Vector<String> values = relation_info.getMultiInfo(metadata);
                 if (values != null)
                 {
@@ -528 +528 @@
                     {
                         result.insert(0, separator);
-                        result.insert(0, this.macro_resolver.resolve((String) values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id));
+                        result.insert(0, this.macro_resolver.resolve(values.elementAt(i), lang, MacroResolver.SCOPE_META, relation_id));
                     }
                 }