Added generics (part 2).

This patch brings down the warnings from 4648 to 3992.

Ticket #2

6 files changed, 19 insertions, 19 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java b/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
index 58c4276e3..a55406068 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/AuthCredentials.java
@@ -35,14 +35,14 @@ public class AuthCredentials implements IAuthCredentials {
      *
      */
     private static final long serialVersionUID = -5995164231849154265L;
-    private Hashtable authCreds = null;
+    private Hashtable<String, Object> authCreds = null;
     // Inserted by bskim 
     private IArgBlock argblk = null;
 
     // Insert end
 
     public AuthCredentials() {
-        authCreds = new Hashtable();
+        authCreds = new Hashtable<String, Object>();
     }
 
     /**
@@ -68,7 +68,7 @@ public class AuthCredentials implements IAuthCredentials {
      * @return the named authentication credential
      */
     public Object get(String name) {
-        return ((Object) authCreds.get(name));
+        return authCreds.get(name);
     }
 
     /**
@@ -90,8 +90,8 @@ public class AuthCredentials implements IAuthCredentials {
      * @return an enumeration of the values in this credential set
      * @see java.util.Enumeration
      */
-    public Enumeration getElements() {
-        return (authCreds.elements());
+    public Enumeration<Object> getElements() {
+        return authCreds.elements();
     }
 
     // Inserted by bskim
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
index 9a91cb729..808bdda78 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSFileLoader.java
@@ -44,7 +44,7 @@ public class CMSFileLoader {
     public final String PROP_CACHE_TEMPLATES_ONLY = "cacheTemplatesOnly";
 
     // hash of files to their content. 
-    private Hashtable mLoadedFiles = new Hashtable();
+    private Hashtable<String, CMSFile> mLoadedFiles = new Hashtable<String, CMSFile>();
 
     // max number of files 
     private int mMaxSize = MAX_SIZE;
@@ -141,14 +141,14 @@ public class CMSFileLoader {
 
         // remove the LRU files.
         // XXX could be optimized more.
-        Enumeration elements = mLoadedFiles.elements();
+        Enumeration<CMSFile> elements = mLoadedFiles.elements();
 
         for (int i = mClearSize; i > 0; i--) {
             long lru = java.lang.Long.MAX_VALUE;
             CMSFile lruFile = null;
 
             while (elements.hasMoreElements()) {
-                CMSFile cmsFile = (CMSFile) elements.nextElement();
+                CMSFile cmsFile = elements.nextElement();
 
                 if (cmsFile.getLastAccess() < lru) {
                     lruFile = cmsFile;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
index 74d46badf..d04e2fb22 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSGateway.java
@@ -79,10 +79,10 @@ public class CMSGateway {
 
     public static Hashtable toHashtable(HttpServletRequest req) {
         Hashtable httpReqHash = new Hashtable();
-        Enumeration names = req.getParameterNames();
+        Enumeration<String> names = req.getParameterNames();
 
         while (names.hasMoreElements()) {
-            String name = (String) names.nextElement();
+            String name = names.nextElement();
 
             httpReqHash.put(name, req.getParameter(name));
         }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
index 822d8a0d8..b1be4f7a5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSRequest.java
@@ -78,7 +78,7 @@ public class CMSRequest {
     private String mError = null;
 
     // any error description.
-    private Vector mErrorDescr = null;
+    private Vector<String> mErrorDescr = null;
 
     // any request resulting data;
     Object mResult = null;
@@ -170,7 +170,7 @@ public class CMSRequest {
 
     public void setErrorDescription(String descr) {
         if (mErrorDescr == null)
-            mErrorDescr = new Vector();
+            mErrorDescr = new Vector<String>();
         mErrorDescr.addElement(descr);
     }
 
@@ -215,7 +215,7 @@ public class CMSRequest {
         return mError;
     }
 
-    public Vector getErrorDescr() {
+    public Vector<String> getErrorDescr() {
         return mErrorDescr;
     }
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
index 1c7d61c9a..40edb3bda 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenErrorTemplateFiller.java
@@ -77,13 +77,13 @@ public class GenErrorTemplateFiller implements ICMSTemplateFiller {
         // Change end
 
         // error description if any.
-        Vector descr = cmsReq.getErrorDescr();
+        Vector<String> descr = cmsReq.getErrorDescr();
 
         if (descr != null) {
-            Enumeration num = descr.elements();
+            Enumeration<String> num = descr.elements();
 
             while (num.hasMoreElements()) {
-                String elem = (String) num.nextElement();
+                String elem = num.nextElement();
                 //System.out.println("Setting description "+elem.toString());
                 IArgBlock argBlock = CMS.createArgBlock();
 
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java b/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
index 3dde11475..9e75cc799 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/GenRejectedTemplateFiller.java
@@ -67,13 +67,13 @@ public class GenRejectedTemplateFiller implements ICMSTemplateFiller {
             fixed.set(ICMSTemplateFiller.REQUEST_ID, req.getRequestId());
 
             // policy errors (rejection reasons)
-            Vector messages = req.getExtDataInStringVector(IRequest.ERRORS);
+            Vector<String> messages = req.getExtDataInStringVector(IRequest.ERRORS);
 
             if (messages != null) {
-                Enumeration msgs = messages.elements();
+                Enumeration<String> msgs = messages.elements();
 
                 while (msgs.hasMoreElements()) {
-                    String ex = (String) msgs.nextElement();
+                    String ex = msgs.nextElement();
                     IArgBlock messageArgBlock = CMS.createArgBlock();
 
                     messageArgBlock.set(POLICY_MESSAGE, ex);