typesafety ACL Impls Random type safety cleanups.

6 files changed, 26 insertions, 25 deletions

diff --git a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java b/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java
index 249bb4420..471371f9c 100644
--- a/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java
+++ b/pki/base/common/src/com/netscape/certsrv/template/ArgSet.java
@@ -32,14 +32,14 @@ import java.util.Hashtable;
  * @version $Revision$, $Date$
  */
 public class ArgSet implements IArgValue {
-    private Hashtable mArgs = new Hashtable();
+    private Hashtable<String, IArgValue> mArgs = new Hashtable<String, IArgValue>();
 
     /**
      * Returns a list of argument names.
      *
      * @return list of argument names
      */
-    public Enumeration getNames() {
+    public Enumeration<String> getNames() {
         return mArgs.keys();
     }
 
diff --git a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java b/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java
index e0a37eb4b..4cfe9a457 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/AVAPattern.java
@@ -444,7 +444,8 @@ class AVAPattern {
             if (ldapAttr == null) 
                 return null;
             String value = null;
-            Enumeration ldapValues = ldapAttr.getStringValues();
+            @SuppressWarnings("unchecked")
+			Enumeration<String> ldapValues = ldapAttr.getStringValues();
 
             for (int i = 0; ldapValues.hasMoreElements(); i++) {
                 String val = (String) ldapValues.nextElement();
@@ -522,7 +523,7 @@ class AVAPattern {
 
         if (plus == -1) 
             return new String[] { rdn };
-        Vector avas = new Vector();
+        Vector<String> avas = new Vector<String>();
         StringTokenizer token = new StringTokenizer(rdn, "+");
 
         while (token.hasMoreTokens()) 
diff --git a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java b/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
index 0b8bad8f3..270d1fa20 100644
--- a/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
+++ b/pki/base/common/src/com/netscape/cms/authentication/AgentCertAuthentication.java
@@ -309,7 +309,7 @@ public class AgentCertAuthentication implements IAuthManager,
     /**
      * 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/policy/constraints/AttributePresentConstraints.java b/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
index 6438dc4ae..90e81ed4b 100644
--- a/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
+++ b/pki/base/common/src/com/netscape/cms/policy/constraints/AttributePresentConstraints.java
@@ -66,7 +66,6 @@ public class AttributePresentConstraints extends APolicyRule
 
     private boolean mEnabled = false;
     private ILogger mLogger = CMS.getLogger();
-    private Hashtable mContentParams = new Hashtable();
 
     private ICertAuthority mSub = null;
     private IConfigStore mConfig = null;
@@ -180,13 +179,13 @@ public class AttributePresentConstraints extends APolicyRule
     protected static final String PROP_VALUE = "value";
     protected static final String DEF_VALUE = "";
 
-    protected static Vector    mParamNames;
-    protected static Hashtable mParamDefault;
-    protected        Hashtable mParamValue = null;
+    protected static Vector<String>    mParamNames;
+    protected static Hashtable<String, Object> mParamDefault;
+    protected        Hashtable<String, Object> mParamValue = null;
 
     static {
-        mParamNames = new Vector();
-        mParamDefault = new Hashtable();
+        mParamNames = new Vector<String>();
+        mParamDefault = new Hashtable<String, Object>();
         addParam(PROP_LDAP_HOST, DEF_LDAP_HOST);
         addParam(PROP_LDAP_PORT, DEF_LDAP_PORT);
         addParam(PROP_LDAP_SSL, DEF_LDAP_SSL);
@@ -246,7 +245,7 @@ public class AttributePresentConstraints extends APolicyRule
         throws EBaseException {
         mConfig = config;
 
-        mParamValue = new Hashtable();
+        mParamValue = new Hashtable<String, Object>();
 
         getStringConfigParam(mConfig, PROP_LDAP_HOST);
         getIntConfigParam(mConfig, PROP_LDAP_PORT);
@@ -345,10 +344,10 @@ public class AttributePresentConstraints extends APolicyRule
         return res;
     }
 
-    public Vector getInstanceParams() {
-        Vector params = new Vector();
+    public Vector<String>  getInstanceParams() {
+        Vector<String> params = new Vector<String>();
 
-        Enumeration e = mParamNames.elements();
+        Enumeration<String> e = mParamNames.elements();
 
         while (e.hasMoreElements()) {
             try {
@@ -364,10 +363,10 @@ public class AttributePresentConstraints extends APolicyRule
         return params;
     }
 
-    public Vector getDefaultParams() {
-        Vector params = new Vector();
+    public Vector<String> getDefaultParams() {
+        Vector<String> params = new Vector<String>();
 
-        Enumeration e = mParamNames.elements();
+        Enumeration<String> e = mParamNames.elements();
 
         while (e.hasMoreElements()) {
             try {
diff --git a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
index fd89ceaf1..b90278fa6 100644
--- a/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
+++ b/pki/base/common/src/com/netscape/cms/servlet/common/CMSTemplate.java
@@ -154,7 +154,8 @@ public class CMSTemplate extends CMSFile {
      */
     public void renderOutput(OutputStream rout, CMSTemplateParams input)
         throws IOException {
-        Enumeration e = null, q = null;
+        Enumeration<String> e = null;
+        Enumeration<IArgBlock>  q = null;
         IArgBlock r = null;
         boolean headerBlock = false, fixedBlock = false, queryBlock = false;
         CMSTemplateParams data = (CMSTemplateParams) input;
@@ -193,7 +194,7 @@ public class CMSTemplate extends CMSFile {
                 e = r.elements();
                 while (e.hasMoreElements()) {
                     headerBlock = true;
-                    String n = (String) e.nextElement();
+                    String n =  e.nextElement();
                     Object v = r.getValue(n);
 
                     out.println("header." + n + " = " + renderValue(v) + ";");
@@ -206,7 +207,7 @@ public class CMSTemplate extends CMSFile {
                 e = r.elements();
                 while (e.hasMoreElements()) {
                     fixedBlock = true;
-                    String n = (String) e.nextElement();
+                    String n = e.nextElement();
                     Object v = r.getValue(n);
 
                     out.println("fixed." + n + " = " + renderValue(v) + ";");
@@ -227,10 +228,10 @@ public class CMSTemplate extends CMSFile {
                     out.println("record.SERVER_ATTRS = new Array;");
 
                     // Get a query record
-                    r = (IArgBlock) q.nextElement();
+                    r =  q.nextElement();
                     e = r.elements();
                     while (e.hasMoreElements()) {
-                        String n = (String) e.nextElement();
+                        String n = e.nextElement();
                         Object v = r.getValue(n);
 
                         out.println("record." + n + "=" + renderValue(v) + ";");
diff --git a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java b/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
index 8d6c325fa..7cd563f99 100644
--- a/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
+++ b/pki/base/common/src/com/netscape/cmscore/dbs/BigIntegerMapper.java
@@ -41,7 +41,7 @@ import com.netscape.certsrv.dbs.IDBObj;
 public class BigIntegerMapper implements IDBAttrMapper {
 
     private String mLdapName = null;
-    private Vector v = new Vector();
+    private Vector<String> v = new Vector<String>();
 
     /**
      * Constructs BigInteger mapper.
@@ -54,7 +54,7 @@ public class BigIntegerMapper implements IDBAttrMapper {
     /**
      * Returns a list of supported ldap attribute names.
      */
-    public Enumeration getSupportedLDAPAttributeNames() {
+    public Enumeration<String> getSupportedLDAPAttributeNames() {
         return v.elements();
     }