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

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

@@ -340 +340 @@
     boolean want_info = false;
 
-    ArrayList info_types=new ArrayList();
+    ArrayList<String> info_types=new ArrayList<String>();
     // The document structure information desired
     boolean want_ancestors = false;
@@ -416 +416 @@
         
         for (int j=0; j<info_types.size(); j++) {
-            String info_type = (String)info_types.get(j);
+            String info_type = info_types.get(j);
             String info_value = getStructureInfo(node_id, info_type);
             if (info_value != null) {
@@ -511 +511 @@
 
     // The metadata information required
-    ArrayList metadata_names_list = new ArrayList();
+    ArrayList<String> metadata_names_list = new ArrayList<String>();
     boolean all_metadata = false;
     // Process the request parameters
@@ -619 +619 @@
                   boolean recursive)
     {
-    ArrayList child_ids = getChildrenIds(node_id);
+    ArrayList<String> child_ids = getChildrenIds(node_id);
     if (child_ids==null) return;
     for (int i=0; i< child_ids.size(); i++) {
-        String child_id = (String)child_ids.get(i);
+        String child_id = child_ids.get(i);
         Element child_elem;
         if (isDocumentId(child_id)) {
@@ -675 +675 @@
 
     /** returns the list of sibling ids, including the specified node_id */
-    protected ArrayList getSiblingIds(String node_id) {
+    protected ArrayList<String> getSiblingIds(String node_id) {
     String parent_id = getParentId(node_id);
     if (parent_id == null) {
@@ -698 +698 @@
     abstract protected String getRootId(String node_id);
     /** returns a list of the child ids in order, null if no children */
-    abstract protected ArrayList getChildrenIds(String node_id);
+    abstract protected ArrayList<String> getChildrenIds(String node_id);
     /** returns the node id of the parent node, null if no parent */
     abstract protected String getParentId(String node_id);
@@ -715 +715 @@
     abstract protected Element getMetadataList(String node_id,
                            boolean all_metadata,
-                           ArrayList metadata_names);
+                           ArrayList<String> metadata_names);
 
     /** get the particular metadata (identified by the metadata name) for the classifier node node_id