Added generics (part 3).

This patch brings down the warnings from 3992 to 3500.

Ticket #2

7 files changed, 33 insertions, 30 deletions

diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
index bdaa0df29..c34cd2227 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/DisplayCRL.java
@@ -183,7 +183,7 @@ public class DisplayCRL extends CMSServlet {
         boolean isCRLCacheEnabled = false;
         String masterHost = null;
         String masterPort = null;
-        Vector ipNames = null;
+        Vector<String> ipNames = null;
         String ipId = crlIssuingPointId;
         ICRLRepository crlRepository = mCA.getCRLRepository();
 
@@ -203,7 +203,7 @@ public class DisplayCRL extends CMSServlet {
                 if (ipNames != null && ipNames.size() > 0) {
                     int i;
                     for (i = 0; i < ipNames.size(); i++) {
-                        String ipName = (String) ipNames.elementAt(i);
+                        String ipName = ipNames.elementAt(i);
                         if (crlIssuingPointId.equals(ipName)) {
                             break;
                         }
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
index ce3b7ee69..9db5cb892 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/GetInfo.java
@@ -213,9 +213,9 @@ public class GetInfo extends CMSServlet {
 
                 ICRLRepository crlRepository = mCA.getCRLRepository();
 
-                Vector ipNames = crlRepository.getIssuingPointsNames();
+                Vector<String> ipNames = crlRepository.getIssuingPointsNames();
                 for (int i = 0; i < ipNames.size(); i++) {
-                    String ipName = (String) ipNames.elementAt(i);
+                    String ipName = ipNames.elementAt(i);
                     ICRLIssuingPointRecord crlRecord = null;
                     try {
                         crlRecord = crlRepository.readCRLIssuingPointRecord(ipName);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
index 878820597..b8e56b3e7 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/ReasonToRevoke.java
@@ -249,7 +249,6 @@ public class ReasonToRevoke extends CMSServlet {
                     totalRecordCount, mTimeLimits);
 
             int count = 0;
-            String errorMsg = null;
 
             while (e != null && e.hasMoreElements()) {
                 ICertRecord rec = (ICertRecord) e.nextElement();
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
index 5a0a12662..55d8bb04c 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RemoteAuthConfig.java
@@ -75,7 +75,7 @@ public class RemoteAuthConfig extends CMSServlet {
     private IAuthSubsystem mAuthSubsystem = null;
     private IConfigStore mAuthConfig = null;
     private IConfigStore mFileConfig = null;
-    private Vector mRemotelySetInstances = new Vector();
+    private Vector<String> mRemotelySetInstances = new Vector<String>();
     private boolean mEnableRemoteConfiguration = false;
 
     /**
@@ -302,10 +302,11 @@ public class RemoteAuthConfig extends CMSServlet {
                 LDAPAttribute attr = entry.getAttribute(MEMBER_OF);
 
                 if (attr != null) {
-                    Enumeration eVals = attr.getStringValues();
+                    @SuppressWarnings("unchecked")
+                    Enumeration<String> eVals = attr.getStringValues();
 
                     while (eVals.hasMoreElements()) {
-                        String nextValue = (String) eVals.nextElement();
+                        String nextValue = eVals.nextElement();
 
                         if (nextValue.indexOf("Administrator") > -1) {
                             LDAPEntry groupEntry = c.read(nextValue);
@@ -314,10 +315,11 @@ public class RemoteAuthConfig extends CMSServlet {
                                 LDAPAttribute gAttr = groupEntry.getAttribute(UNIQUE_MEMBER);
 
                                 if (gAttr != null) {
-                                    Enumeration eValues = gAttr.getStringValues();
+                                    @SuppressWarnings("unchecked")
+                                    Enumeration<String> eValues = gAttr.getStringValues();
 
                                     while (eValues.hasMoreElements()) {
-                                        String value = (String) eValues.nextElement();
+                                        String value = eValues.nextElement();
 
                                         if (value.equals(entry.getDN())) {
                                             c.disconnect();
@@ -409,10 +411,11 @@ public class RemoteAuthConfig extends CMSServlet {
 
                     if (attr != null) {
                         memberOf = true;
-                        Enumeration eVals = attr.getStringValues();
+                        @SuppressWarnings("unchecked")
+                        Enumeration<String> eVals = attr.getStringValues();
 
                         while (eVals.hasMoreElements()) {
-                            String nextValue = (String) eVals.nextElement();
+                            String nextValue = eVals.nextElement();
 
                             if (nextValue.indexOf("Administrator") > -1) {
                                 LDAPEntry groupEntry = c.read(nextValue);
@@ -421,10 +424,11 @@ public class RemoteAuthConfig extends CMSServlet {
                                     LDAPAttribute gAttr = groupEntry.getAttribute(UNIQUE_MEMBER);
 
                                     if (gAttr != null) {
-                                        Enumeration eValues = gAttr.getStringValues();
+                                        @SuppressWarnings("unchecked")
+                                        Enumeration<String> eValues = gAttr.getStringValues();
 
                                         while (eValues.hasMoreElements()) {
-                                            String value = (String) eValues.nextElement();
+                                            String value = eValues.nextElement();
 
                                             if (value.equals(entry.getDN())) {
                                                 c.disconnect();
@@ -516,7 +520,7 @@ public class RemoteAuthConfig extends CMSServlet {
         for (int i = 0; i < mRemotelySetInstances.size(); i++) {
             if (i > 0)
                 list.append(",");
-            list.append((String) mRemotelySetInstances.elementAt(i));
+            list.append(mRemotelySetInstances.elementAt(i));
         }
 
         mAuthConfig.putString(REMOTELY_SET_INSTANCES, list.toString());
@@ -543,7 +547,7 @@ public class RemoteAuthConfig extends CMSServlet {
             for (int i = 0; i < mRemotelySetInstances.size(); i++) {
                 if (i > 0)
                     list.append(",");
-                list.append((String) mRemotelySetInstances.elementAt(i));
+                list.append(mRemotelySetInstances.elementAt(i));
             }
 
             mAuthConfig.putString(REMOTELY_SET_INSTANCES, list.toString());
@@ -563,10 +567,10 @@ public class RemoteAuthConfig extends CMSServlet {
         boolean isListed = false;
 
         if (pluginName != null && pluginName.length() > 0) {
-            Enumeration e = mAuthSubsystem.getAuthManagerPlugins();
+            Enumeration<AuthMgrPlugin> e = mAuthSubsystem.getAuthManagerPlugins();
 
             while (e.hasMoreElements()) {
-                AuthMgrPlugin plugin = (AuthMgrPlugin) e.nextElement();
+                AuthMgrPlugin plugin = e.nextElement();
 
                 if (pluginName.equals(plugin.getId())) {
                     isListed = true;
@@ -582,10 +586,10 @@ public class RemoteAuthConfig extends CMSServlet {
         boolean isListed = false;
 
         if (instanceName != null && instanceName.length() > 0) {
-            Enumeration e = mAuthSubsystem.getAuthManagers();
+            Enumeration<IAuthManager> e = mAuthSubsystem.getAuthManagers();
 
             while (e.hasMoreElements()) {
-                IAuthManager authManager = (IAuthManager) e.nextElement();
+                IAuthManager authManager = e.nextElement();
 
                 if (instanceName.equals(authManager.getName())) {
                     isListed = true;
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
index 2bc1d3051..fd2454210 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RenewalServlet.java
@@ -278,10 +278,10 @@ public class RenewalServlet extends CMSServlet {
             cmsReq.setIRequestStatus();
             // audit log the status
             if (status == RequestStatus.REJECTED) {
-                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();
                     StringBuffer wholeMsg = new StringBuffer();
 
                     while (msgs.hasMoreElements()) {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
index 875f2ab67..a4d434bd4 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/RevocationServlet.java
@@ -239,10 +239,10 @@ public class RevocationServlet extends CMSServlet {
 
             if (status == RequestStatus.COMPLETE) {
                 header.addStringValue("request", req.getRequestId().toString());
-                Enumeration enum1 = req.getExtDataKeys();
+                Enumeration<String> enum1 = req.getExtDataKeys();
 
                 while (enum1.hasMoreElements()) {
-                    String name = (String) enum1.nextElement();
+                    String name = enum1.nextElement();
 
                     if (name.equals(IRequest.OLD_CERTS)) {
                         X509CertImpl[] certs = req.getExtDataInCertArray(IRequest.OLD_CERTS);
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
index dc084bd94..0491ccef5 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/cert/UpdateDir.java
@@ -342,10 +342,10 @@ public class UpdateDir extends CMSServlet {
                 updateValue[UPDATE_CRL].equalsIgnoreCase("yes"))) {
             // check if received issuing point ID is known to the server
             if (crlIssuingPointId != null) {
-                Enumeration ips = mCA.getCRLIssuingPoints();
+                Enumeration<ICRLIssuingPoint> ips = mCA.getCRLIssuingPoints();
 
                 while (ips.hasMoreElements()) {
-                    ICRLIssuingPoint ip = (ICRLIssuingPoint) ips.nextElement();
+                    ICRLIssuingPoint ip = ips.nextElement();
 
                     if (crlIssuingPointId.equals(ip.getId())) {
                         break;
@@ -357,19 +357,19 @@ public class UpdateDir extends CMSServlet {
             if (crlIssuingPointId == null) {
                 // publish all issuing points
                 if (mClonedCA && mCRLRepository != null) {
-                    Vector ipNames = mCRLRepository.getIssuingPointsNames();
+                    Vector<String> ipNames = mCRLRepository.getIssuingPointsNames();
                     if (ipNames != null && ipNames.size() > 0) {
                         for (int i = 0; i < ipNames.size(); i++) {
-                            String ipName = (String) ipNames.elementAt(i);
+                            String ipName = ipNames.elementAt(i);
 
                             updateCRLIssuingPoint(header, ipName, null, locale);
                         }
                     }
                 } else {
-                    Enumeration oips = mCA.getCRLIssuingPoints();
+                    Enumeration<ICRLIssuingPoint> oips = mCA.getCRLIssuingPoints();
 
                     while (oips.hasMoreElements()) {
-                        ICRLIssuingPoint oip = (ICRLIssuingPoint) oips.nextElement();
+                        ICRLIssuingPoint oip = oips.nextElement();
 
                         updateCRLIssuingPoint(header, oip.getId(), oip, locale);
                     }