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

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

@@ -227 +227 @@
      */ 
     NodeList params = GSXML.getChildrenByTagName(req, OAIXML.PARAM);
-    HashMap param_map = OAIXML.getParamMap(params);    
-    
-    String prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);
+    HashMap<String, String> param_map = OAIXML.getParamMap(params);    
+    
+    String prefix = param_map.get(OAIXML.METADATA_PREFIX);
     if (prefix == null || prefix.equals("")) {
       //Just a double-check
@@ -242 +242 @@
     }
     
-    String oid = (String)param_map.get(OAIXML.OID);
+    String oid = param_map.get(OAIXML.OID);
 
     //get a DBInfo object of the identifier; if this identifier is not present in the database,
@@ -252 +252 @@
     }
 
-    ArrayList keys = new ArrayList(info.getKeys());
+    ArrayList<String> keys = new ArrayList<String>(info.getKeys());
     String oailastmodified = "";
     if(keys.contains(OAIXML.OAI_LASTMODIFIED)) {
@@ -285 +285 @@
     }
     
-    HashMap param_map = OAIXML.getParamMap(params);  
+    HashMap<String, String> param_map = OAIXML.getParamMap(params);  
     
     String prefix = "";
@@ -296 +296 @@
       return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, ""));
     }
-    prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);
+    prefix = param_map.get(OAIXML.METADATA_PREFIX);
     if (prefix == null || prefix.equals("")) {
       //Just a double-check
@@ -304 +304 @@
     
     if(param_map.containsKey(OAIXML.FROM)) {
-      String from = (String)param_map.get(OAIXML.FROM);
+      String from = param_map.get(OAIXML.FROM);
       from_date = OAIXML.getDate(from);
     }    
     if(param_map.containsKey(OAIXML.UNTIL)) {
-      String until = (String)param_map.get(OAIXML.UNTIL);
+      String until = param_map.get(OAIXML.UNTIL);
       until_date = OAIXML.getDate(until);
     }    
@@ -317 +317 @@
       return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, ""));
     }
-    ArrayList oid_list = getChildrenIds(OAIXML.BROWSELIST);
+    ArrayList<String> oid_list = getChildrenIds(OAIXML.BROWSELIST);
     if (oid_list == null) {
       logger.error("No matched records found in collection: browselist is empty");
@@ -325 +325 @@
     Element list_identifiers = OAIXML.createElement(OAIXML.LIST_IDENTIFIERS);
     for(int i=0; i<oid_list.size(); i++) {
-      String oid = (String)oid_list.get(i);
+      String oid = oid_list.get(i);
       DBInfo info = this.coll_db.getInfo(oid);
       if (info == null) {
@@ -331 +331 @@
         continue;
       }
-      ArrayList keys = new ArrayList(info.getKeys());
+      ArrayList<String> keys = new ArrayList<String>(info.getKeys());
       String oailastmodified = "";
       if(keys.contains(OAIXML.OAI_LASTMODIFIED)) {
@@ -370 +370 @@
     }
     
-    HashMap param_map = OAIXML.getParamMap(params);    
+    HashMap<String, String> param_map = OAIXML.getParamMap(params);    
 
     String prefix = "";
@@ -381 +381 @@
       return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.CANNOT_DISSEMINATE_FORMAT, ""));
     }
-    prefix = (String)param_map.get(OAIXML.METADATA_PREFIX);
+    prefix = param_map.get(OAIXML.METADATA_PREFIX);
     if (prefix == null || prefix.equals("")) {
       //Just a double-check
@@ -389 +389 @@
     
     if(param_map.containsKey(OAIXML.FROM)) {
-      String from = (String)param_map.get(OAIXML.FROM);
+      String from = param_map.get(OAIXML.FROM);
       from_date = OAIXML.getDate(from);
     }    
     if(param_map.containsKey(OAIXML.UNTIL)) {
-      String until = (String)param_map.get(OAIXML.UNTIL);
+      String until = param_map.get(OAIXML.UNTIL);
       until_date = OAIXML.getDate(until);
     }    
@@ -403 +403 @@
     
     //get a list of identifiers (it contains a list of strings)
-    ArrayList oid_list = getChildrenIds(OAIXML.BROWSELIST);
+    ArrayList<String> oid_list = getChildrenIds(OAIXML.BROWSELIST);
     if (oid_list == null) {
       logger.error("No matched records found in collection: browselist is empty");
@@ -411 +411 @@
     Element list_records = OAIXML.createElement(OAIXML.LIST_RECORDS);
     for(int i=0; i<oid_list.size(); i++) {
-      String oid = (String)oid_list.get(i);
+      String oid = oid_list.get(i);
       DBInfo info = this.coll_db.getInfo(oid);
       if (info == null) {
@@ -417 +417 @@
         continue;
       }
-      ArrayList keys = new ArrayList(info.getKeys());
+      ArrayList<String> keys = new ArrayList<String>(info.getKeys());
       String oailastmodified = "";
       if(keys.contains(OAIXML.OAI_LASTMODIFIED)) {
@@ -527 +527 @@
       return OAIXML.getResponse(OAIXML.createErrorElement(OAIXML.ID_DOES_NOT_EXIST, ""));
     }
-    ArrayList oid_list = getChildrenIds(OAIXML.BROWSELIST);
+    ArrayList<String> oid_list = getChildrenIds(OAIXML.BROWSELIST);
     if (oid_list == null || oid_list.contains(oid) == false) {
       logger.error("OID: " + oid + " is not present in the database.");
@@ -591 +591 @@
 
   /** 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);
     if (info == null) {
@@ -601 +601 @@
       return null;
     }
-    ArrayList children = new ArrayList();
+    ArrayList<String> children = new ArrayList<String>();
     StringTokenizer st = new StringTokenizer(contains, ";");
     while (st.hasMoreTokens()) {
@@ -663 +663 @@
   public String[] getMetadata(DBInfo info, String names) {
     String[] name_value = new String[2];
-    ArrayList keys = new ArrayList(info.getKeys());
+    ArrayList<String> keys = new ArrayList<String>(info.getKeys());
     for (int i=0; i<keys.size(); i++) {
-      String key = (String)keys.get(i);
+      String key = keys.get(i);
       String first_name = "";
       String second_name = "";
@@ -689 +689 @@
       return null;
     }
-    HashMap map = new HashMap();
+    HashMap<String, String> map = new HashMap<String, String>();
     boolean empty_map = true;