Added generics (part 2).

This patch brings down the warnings from 4648 to 3992.

Ticket #2

5 files changed, 42 insertions, 42 deletions

diff --git a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
index 3098e0016..cf57098b6 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/CMCAuth.java
@@ -946,8 +946,8 @@ public class CMCAuth implements IAuthManager, IExtendedPluginInfo,
     /**
      * Retrieves a list of names of the value parameter.
      */
-    public Enumeration getValueNames() {
-        Vector v = new Vector();
+    public Enumeration<String> getValueNames() {
+        Vector<String> v = new Vector<String>();
         v.addElement("cert_request");
         return v.elements();
     }
diff --git a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java b/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
index 37e076d4a..f60110b0b 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/FlatFileAuth.java
@@ -121,7 +121,7 @@ public class FlatFileAuth
      * Hashtable of entries from Auth File. Hash index is the
      * concatenation of the attributes from matchAttributes property
      */
-    protected Hashtable entries = null;
+    protected Hashtable<String, Hashtable<String, String>> entries = null;
 
     /**
      * Get the named property
@@ -241,7 +241,7 @@ public class FlatFileAuth
      */
 
     public String[] unionOfStrings(String[][] stringArrays) {
-        Hashtable ht = new Hashtable();
+        Hashtable<String, String> ht = new Hashtable<String, String>();
 
         for (int i = 0; i < stringArrays.length; i++) {
             String[] sa = stringArrays[i];
@@ -253,10 +253,10 @@ public class FlatFileAuth
         }
 
         String[] s = new String[ht.size()];
-        Enumeration e = ht.keys();
+        Enumeration<String> e = ht.keys();
 
         for (int i = 0; e.hasMoreElements(); i++) {
-            s[i] = (String) e.nextElement();
+            s[i] = e.nextElement();
         }
         return s;
 
@@ -412,7 +412,7 @@ public class FlatFileAuth
      *            key
      * @return a hashtable of hashtables.
      */
-    protected Hashtable readFile(File f, String[] keys)
+    protected Hashtable<String, Hashtable<String, String>> readFile(File f, String[] keys)
             throws IOException {
         log(ILogger.LL_INFO, "Reading file: " + f.getName());
         BufferedReader file = new BufferedReader(
@@ -420,8 +420,8 @@ public class FlatFileAuth
                 );
 
         String line;
-        Hashtable allusers = new Hashtable();
-        Hashtable entry = null;
+        Hashtable<String, Hashtable<String, String>> allusers = new Hashtable<String, Hashtable<String, String>>();
+        Hashtable<String, String> entry = null;
         int linenum = 0;
 
         while ((line = file.readLine()) != null) {
@@ -433,7 +433,7 @@ public class FlatFileAuth
             int colon = line.indexOf(':');
 
             if (entry == null) {
-                entry = new Hashtable();
+                entry = new Hashtable<String, String>();
             }
 
             if (colon == -1) { // no colon -> empty line signifies end of record
@@ -464,8 +464,8 @@ public class FlatFileAuth
         return allusers;
     }
 
-    private void putEntry(Hashtable allUsers,
-            Hashtable entry,
+    private void putEntry(Hashtable<String, Hashtable<String, String>> allUsers,
+            Hashtable<String, String> entry,
             String[] keys) {
         if (entry == null) {
             return;
@@ -474,7 +474,7 @@ public class FlatFileAuth
 
         print("keys.length = " + keys.length);
         for (int i = 0; i < keys.length; i++) {
-            String s = (String) entry.get(keys[i]);
+            String s = entry.get(keys[i]);
 
             print(" concatenating: " + s);
             if (s != null) {
@@ -486,17 +486,17 @@ public class FlatFileAuth
     }
 
     void printAllEntries() {
-        Enumeration e = entries.keys();
+        Enumeration<String> e = entries.keys();
 
         while (e.hasMoreElements()) {
-            String key = (String) e.nextElement();
+            String key = e.nextElement();
 
             print("* " + key + " *");
-            Hashtable ht = (Hashtable) entries.get(key);
-            Enumeration f = ht.keys();
+            Hashtable<String, String> ht = entries.get(key);
+            Enumeration<String> f = ht.keys();
 
             while (f.hasMoreElements()) {
-                String fkey = (String) f.nextElement();
+                String fkey = f.nextElement();
 
                 print("   " + fkey + " -> " + ht.get(fkey));
             }
@@ -509,7 +509,7 @@ public class FlatFileAuth
      * 
      */
 
-    private IAuthToken doAuthentication(Hashtable user, IAuthCredentials authCred)
+    private IAuthToken doAuthentication(Hashtable<String, String> user, IAuthCredentials authCred)
             throws EMissingCredential, EInvalidCredentials, EBaseException {
         AuthToken authToken = new AuthToken(this);
 
@@ -567,7 +567,7 @@ public class FlatFileAuth
         }
         print("authenticating user: finding user from key: " + keyForUser);
 
-        Hashtable user = (Hashtable) entries.get(keyForUser);
+        Hashtable<String, String> user = entries.get(keyForUser);
 
         try {
             if (user != null) {
@@ -660,7 +660,7 @@ public class FlatFileAuth
     /**
      * Retrieves a list of names of the value parameter.
      */
-    public Enumeration getValueNames() {
+    public Enumeration<String> getValueNames() {
         return null;
     }
 
diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java
index a2d3bc728..3a447d282 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthData.java
@@ -29,7 +29,7 @@ import java.util.Vector;
  * 
  * @version $Revision$, $Date$
  */
-public class HashAuthData extends Hashtable {
+public class HashAuthData extends Hashtable<String, Vector<Object>> {
 
     /**
      *
@@ -42,7 +42,7 @@ public class HashAuthData extends Hashtable {
     }
 
     public String getAgentName(String hostname) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val != null)
             return (String) val.elementAt(0);
@@ -50,17 +50,17 @@ public class HashAuthData extends Hashtable {
     }
 
     public void setAgentName(String hostname, String agentName) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val == null) {
-            val = new Vector();
+            val = new Vector<Object>();
             put(hostname, val);
         }
         val.setElementAt(agentName, 0);
     }
 
     public long getTimeout(String hostname) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val != null) {
             return ((Long) val.elementAt(1)).longValue();
@@ -69,17 +69,17 @@ public class HashAuthData extends Hashtable {
     }
 
     public void setTimeout(String hostname, long timeout) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val == null) {
-            val = new Vector();
+            val = new Vector<Object>();
             put(hostname, val);
         }
         val.setElementAt(Long.valueOf(timeout), 1);
     }
 
     public String getSecret(String hostname) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val != null) {
             return (String) val.elementAt(2);
@@ -88,17 +88,17 @@ public class HashAuthData extends Hashtable {
     }
 
     public void setSecret(String hostname, String secret) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val == null) {
-            val = new Vector();
+            val = new Vector<Object>();
             put(hostname, val);
         }
         val.setElementAt(secret, 2);
     }
 
     public long getLastLogin(String hostname) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val != null) {
             return ((Long) val.elementAt(3)).longValue();
@@ -107,10 +107,10 @@ public class HashAuthData extends Hashtable {
     }
 
     public void setLastLogin(String hostname, long lastLogin) {
-        Vector val = (Vector) get(hostname);
+        Vector<Object> val = get(hostname);
 
         if (val == null) {
-            val = new Vector();
+            val = new Vector<Object>();
             put(hostname, val);
         }
         val.setElementAt(Long.valueOf(lastLogin), 3);
diff --git a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
index a0199a9be..4aae1f159 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/HashAuthentication.java
@@ -123,7 +123,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo {
 
     public void createEntry(String host, String dn, long timeout,
             String secret, long lastLogin) {
-        Vector v = new Vector();
+        Vector<Object> v = new Vector<Object>();
 
         v.addElement(dn);
         v.addElement(Long.valueOf(timeout));
@@ -193,7 +193,7 @@ public class HashAuthentication implements IAuthManager, IExtendedPluginInfo {
         return false;
     }
 
-    public Enumeration getHosts() {
+    public Enumeration<String> getHosts() {
         return mHosts.keys();
     }
 
diff --git a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
index e2c3ec871..8049ffb11 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/PortalEnroll.java
@@ -355,14 +355,14 @@ public class PortalEnroll extends DirBasedAuthentication {
             attr.addValue((String) objectclass_values.elementAt(i));
         attrs.add(attr);
 
-        Enumeration objClasses = mRequiredAttrs.elements();
-        Enumeration attrnames = null;
+        Enumeration<Enumeration<String>> objClasses = mRequiredAttrs.elements();
+        Enumeration<String> attrnames = null;
 
         while (objClasses.hasMoreElements()) {
-            attrnames = (Enumeration) objClasses.nextElement();
+            attrnames = objClasses.nextElement();
             CMS.debug("PortalEnroll: Required attrs:");
             while (attrnames.hasMoreElements()) {
-                String attrname = (String) attrnames.nextElement();
+                String attrname = attrnames.nextElement();
                 String attrval = null;
 
                 CMS.debug("PortalEnroll: attrname is: " + attrname);
@@ -385,10 +385,10 @@ public class PortalEnroll extends DirBasedAuthentication {
         attrnames = null;
 
         while (objClasses.hasMoreElements()) {
-            attrnames = (Enumeration) objClasses.nextElement();
+            attrnames = objClasses.nextElement();
             CMS.debug("PortalEnroll: Optional attrs:");
             while (attrnames.hasMoreElements()) {
-                String attrname = (String) attrnames.nextElement();
+                String attrname = attrnames.nextElement();
                 String attrval = null;
 
                 CMS.debug("PortalEnroll: attrname is: " + attrname);