Added generics (part 2).

This patch brings down the warnings from 4648 to 3992.

Ticket #2

3 files changed, 13 insertions, 13 deletions

diff --git a/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java b/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
index 100cbb5af..badec5930 100644
--- a/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
+++ b/pki/base/util/src/com/netscape/cmsutil/http/HttpMessage.java
@@ -30,14 +30,14 @@ import java.util.Hashtable;
  */
 public class HttpMessage {
     protected String mLine = null; // request or response line.
-    protected Hashtable mHeaders = null;
+    protected Hashtable<String, String> mHeaders = null;
     protected String mContent = null; // arbitrary content chars assumed.
 
     /**
      * Instantiate a HttpResponse for write to http client.
      */
     public HttpMessage() {
-        mHeaders = new Hashtable();
+        mHeaders = new Hashtable<String, String>();
     }
 
     /**
@@ -48,7 +48,7 @@ public class HttpMessage {
      */
     public void setHeader(String name, String value) {
         if (mHeaders == null)
-            mHeaders = new Hashtable();
+            mHeaders = new Hashtable<String, String>();
         mHeaders.put(name.toLowerCase(), value);
     }
 
@@ -66,12 +66,12 @@ public class HttpMessage {
     public void writeHeaders(OutputStreamWriter writer)
             throws IOException {
         if (mHeaders != null) {
-            Enumeration keys = mHeaders.keys();
+            Enumeration<String> keys = mHeaders.keys();
             String header, value;
 
             while (keys.hasMoreElements()) {
-                header = (String) keys.nextElement();
-                value = (String) mHeaders.get(header);
+                header = keys.nextElement();
+                value = mHeaders.get(header);
                 writer.write(header + ":" + value + Http.CRLF);
             }
         }
@@ -84,7 +84,7 @@ public class HttpMessage {
      */
     public void readHeaders(BufferedReader reader)
             throws IOException {
-        mHeaders = new Hashtable();
+        mHeaders = new Hashtable<String, String>();
 
         int colon;
         String line, key, value;
@@ -129,7 +129,7 @@ public class HttpMessage {
         readHeaders(reader);
 
         // won't work if content length is not set.
-        String lenstr = (String) mHeaders.get("content-length");
+        String lenstr = mHeaders.get("content-length");
 
         if (lenstr != null) {
             int len = Integer.parseInt(lenstr);
diff --git a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java b/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
index 46860de19..d6974d371 100644
--- a/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
+++ b/pki/base/util/src/com/netscape/cmsutil/radius/AttributeSet.java
@@ -21,7 +21,7 @@ import java.util.Enumeration;
 import java.util.Vector;
 
 public class AttributeSet {
-    private Vector _attrs = new Vector();
+    private Vector<Attribute> _attrs = new Vector<Attribute>();
 
     public AttributeSet() {
     }
@@ -34,7 +34,7 @@ public class AttributeSet {
         return _attrs.size();
     }
 
-    public Enumeration getAttributes() {
+    public Enumeration<Attribute> getAttributes() {
         return _attrs.elements();
     }
 
@@ -51,6 +51,6 @@ public class AttributeSet {
     }
 
     public Attribute getAttributeAt(int pos) {
-        return (Attribute) _attrs.elementAt(pos);
+        return _attrs.elementAt(pos);
     }
 }
diff --git a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java b/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
index 8890d79fe..8317ad785 100644
--- a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
+++ b/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
@@ -137,8 +137,8 @@ public class XMLObject {
         return v;
     }
 
-    public Vector getValuesFromContainer(Node container, String tagname) {
-        Vector v = new Vector();
+    public Vector<String> getValuesFromContainer(Node container, String tagname) {
+        Vector<String> v = new Vector<String>();
         NodeList c = container.getChildNodes();
         int len = c.getLength();
         for (int i = 0; i < len; i++) {