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

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DBInfo.java

@@ -30 +30 @@
 public class DBInfo
 {
-    protected HashMap info_map_;
+    protected HashMap<String, Vector<String>> info_map_;
 
     public DBInfo()
     {
-        info_map_ = new HashMap();
+        info_map_ = new HashMap<String, Vector<String>>();
     }
 
@@ -42 +42 @@
     public void setInfo(String key, String value)
     {
-        Vector v = new Vector();
+        Vector<String> v = new Vector<String>();
         v.add(value);
         info_map_.put(key, v);
@@ -53 +53 @@
     public String getInfo(String key)
     {
-        Vector items = (Vector) info_map_.get(key);
+        Vector items = info_map_.get(key);
         if (items == null)
         {
@@ -66 +66 @@
     public void addInfo(String key, String value)
     {
-        Vector v = (Vector) info_map_.get(key);
+        Vector<String> v = info_map_.get(key);
         if (v == null)
         {
-            v = new Vector();
+            v = new Vector<String>();
         }
         v.add(value);
@@ -80 +80 @@
      * @return Vector of Strings
      */
-    public Vector getMultiInfo(String key)
+    public Vector<String> getMultiInfo(String key)
     {
-        return (Vector) info_map_.get(key);
+        return info_map_.get(key);
     }
 
     /** returns a list of all the keys in the info */
-    public Set getKeys()
+    public Set<String> getKeys()
     {
         return info_map_.keySet();