Added generics (part 1).

This patch is based on Adam's patch. It brings down the warnings
from 6139 to 4648.

Ticket #2

6 files changed, 36 insertions, 33 deletions

diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
index b7e6502ee..18bfb51fc 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCEnroll.java
@@ -237,8 +237,8 @@ public class CMCEnroll {
             // SHA1 is the default digest Alg for now.
             DigestAlgorithm digestAlg = null;
             SignatureAlgorithm signAlg = SignatureAlgorithm.RSASignatureWithSHA1Digest;
-            org.mozilla.jss.crypto.PrivateKey.Type signingKeyType = ((org.mozilla.jss.crypto.PrivateKey) privKey)
-                    .getType();
+            org.mozilla.jss.crypto.PrivateKey.Type signingKeyType =
+                    ((org.mozilla.jss.crypto.PrivateKey) privKey).getType();
 
             if (signingKeyType.equals(org.mozilla.jss.crypto.PrivateKey.Type.DSA))
                 signAlg = SignatureAlgorithm.DSASignatureWithSHA1Digest;
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index 00ca4709e..197f29e15 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -246,8 +246,8 @@ public class CMCRequest {
             // SHA1 is the default digest Alg for now.
             DigestAlgorithm digestAlg = null;
             SignatureAlgorithm signAlg = SignatureAlgorithm.RSASignatureWithSHA1Digest;
-            org.mozilla.jss.crypto.PrivateKey.Type signingKeyType = ((org.mozilla.jss.crypto.PrivateKey) privKey)
-                    .getType();
+            org.mozilla.jss.crypto.PrivateKey.Type signingKeyType =
+                    ((org.mozilla.jss.crypto.PrivateKey) privKey).getType();
 
             if (signingKeyType.equals(org.mozilla.jss.crypto.PrivateKey.Type.DSA))
                 signAlg = SignatureAlgorithm.DSASignatureWithSHA1Digest;
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
index bab8b84fd..3be8167a1 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CMCRevoke.java
@@ -145,8 +145,8 @@ public class CMCRevoke {
             // optional parameter
             if (cValue == null)
                 cValue = new String();
-            if (dValue == null || nValue == null || iValue == null || sValue == null || mValue == null
-                    || hValue == null)
+            if (dValue == null
+                    || nValue == null || iValue == null || sValue == null || mValue == null || hValue == null)
                 bWrongParam = true;
             else if (dValue.length() == 0 || nValue.length() == 0 || iValue.length() == 0 ||
                     sValue.length() == 0 || mValue.length() == 0 || hValue.length() == 0)
@@ -331,23 +331,23 @@ public class CMCRevoke {
             }
             String sn = com.netscape.osutil.OSUtil.BtoA(dig);
 
-            TaggedAttribute senderNonce = new TaggedAttribute(new INTEGER(bpid++),
-                    OBJECT_IDENTIFIER.id_cmc_senderNonce,
-                    new OCTET_STRING(sn.getBytes()));
+            TaggedAttribute senderNonce =
+                    new TaggedAttribute(new INTEGER(bpid++), OBJECT_IDENTIFIER.id_cmc_senderNonce,
+                            new OCTET_STRING(sn.getBytes()));
 
             controlSeq.addElement(senderNonce);
 
             Name subjectName = new Name();
 
             subjectName.addCommonName(iValue);
-            org.mozilla.jss.pkix.cmmf.RevRequest lRevokeRequest = new org.mozilla.jss.pkix.cmmf.RevRequest(new ANY(
-                    (new X500Name(iValue)).getEncoded()),
-                    new INTEGER(sValue),
-                    //org.mozilla.jss.pkix.cmmf.RevRequest.unspecified, 
-                    new ENUMERATED((new Integer(mValue)).longValue()),
-                    //new GeneralizedTime(new Date(lValue)), 
-                    new OCTET_STRING(hValue.getBytes()),
-                    new UTF8String(cValue.toCharArray()));
+            org.mozilla.jss.pkix.cmmf.RevRequest lRevokeRequest =
+                    new org.mozilla.jss.pkix.cmmf.RevRequest(new ANY((new X500Name(iValue)).getEncoded()),
+                            new INTEGER(sValue),
+                            //org.mozilla.jss.pkix.cmmf.RevRequest.unspecified,
+                            new ENUMERATED((new Integer(mValue)).longValue()),
+                            //new GeneralizedTime(new Date(lValue)),
+                            new OCTET_STRING(hValue.getBytes()),
+                            new UTF8String(cValue.toCharArray()));
             //byte[] encoded = ASN1Util.encode(lRevokeRequest);
             //org.mozilla.jss.asn1.ASN1Template template = new  org.mozilla.jss.pkix.cmmf.RevRequest.Template();
             //org.mozilla.jss.pkix.cmmf.RevRequest revRequest = (org.mozilla.jss.pkix.cmmf.RevRequest) 
@@ -356,9 +356,9 @@ public class CMCRevoke {
 
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             //lRevokeRequest.encode(os); // khai
-            TaggedAttribute revokeRequestTag = new TaggedAttribute(new INTEGER(bpid++),
-                    OBJECT_IDENTIFIER.id_cmc_revokeRequest,
-                    lRevokeRequest);
+            TaggedAttribute revokeRequestTag =
+                    new TaggedAttribute(new INTEGER(bpid++), OBJECT_IDENTIFIER.id_cmc_revokeRequest,
+                            lRevokeRequest);
 
             controlSeq.addElement(revokeRequestTag);
             PKIData pkidata = new PKIData(controlSeq, new SEQUENCE(), new SEQUENCE(), new SEQUENCE());
@@ -367,8 +367,8 @@ public class CMCRevoke {
             // SHA1 is the default digest Alg for now.
             DigestAlgorithm digestAlg = null;
             SignatureAlgorithm signAlg = SignatureAlgorithm.RSASignatureWithSHA1Digest;
-            org.mozilla.jss.crypto.PrivateKey.Type signingKeyType = ((org.mozilla.jss.crypto.PrivateKey) privKey)
-                    .getType();
+            org.mozilla.jss.crypto.PrivateKey.Type signingKeyType =
+                    ((org.mozilla.jss.crypto.PrivateKey) privKey).getType();
 
             if (signingKeyType.equals(org.mozilla.jss.crypto.PrivateKey.Type.DSA))
                 signAlg = SignatureAlgorithm.DSASignatureWithSHA1Digest;
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
index a38ff8b96..73c56ffea 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/CRMFPopClient.java
@@ -370,10 +370,11 @@ public class CRMFPopClient {
 
                 certTemplate.setPublicKey(new SubjectPublicKeyInfo(pair.getPublic()));
                 // set extension
-                AlgorithmIdentifier algS = new AlgorithmIdentifier(new OBJECT_IDENTIFIER("1.2.840.113549.3.7"),
-                        new OCTET_STRING(iv));
-                EncryptedValue encValue = new EncryptedValue(null, algS, new BIT_STRING(session_data, 0), null, null,
-                        new BIT_STRING(key_data, 0));
+                AlgorithmIdentifier algS =
+                        new AlgorithmIdentifier(new OBJECT_IDENTIFIER("1.2.840.113549.3.7"), new OCTET_STRING(iv));
+                EncryptedValue encValue =
+                        new EncryptedValue(null, algS, new BIT_STRING(session_data, 0), null, null, new BIT_STRING(
+                                key_data, 0));
                 EncryptedKey key = new EncryptedKey(encValue);
                 PKIArchiveOptions opt = new PKIArchiveOptions(key);
                 SEQUENCE seq = new SEQUENCE();
@@ -493,10 +494,12 @@ public class CRMFPopClient {
 
                 // post PKCS10 
 
-                url = new URL("http://" + HOST + ":" + PORT
-                        + "/ca/ee/ca/profileSubmit?cert_request_type=crmf&cert_request=" + Req + "&renewal=false&uid="
-                        + USER_NAME + "&xmlOutput=false&&profileId=" + profileName + "&sn_uid=" + USER_NAME
-                        + "&SubId=profile&requestor_name=" + REQUESTOR_NAME);
+                url =
+                        new URL("http://"
+                                + HOST + ":" + PORT + "/ca/ee/ca/profileSubmit?cert_request_type=crmf&cert_request="
+                                + Req + "&renewal=false&uid=" + USER_NAME + "&xmlOutput=false&&profileId="
+                                + profileName + "&sn_uid=" + USER_NAME + "&SubId=profile&requestor_name="
+                                + REQUESTOR_NAME);
                 //System.out.println("Posting " + url);
 
                 System.out.println("");
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java b/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
index c2d4e869b..fc3511f27 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/GenExtKeyUsage.java
@@ -54,7 +54,7 @@ public class GenExtKeyUsage {
             }
 
             // Generate vector of object identifiers from command line
-            Vector oids = new Vector();
+            Vector<ObjectIdentifier> oids = new Vector<ObjectIdentifier>();
 
             for (int i = 1; i < args.length; i++) {
                 ObjectIdentifier oid = new ObjectIdentifier(args[i]);
@@ -66,7 +66,7 @@ public class GenExtKeyUsage {
             DerOutputStream contents = new DerOutputStream();
 
             for (int i = 0; i < oids.size(); i++) {
-                contents.putOID((ObjectIdentifier) oids.elementAt(i));
+                contents.putOID(oids.elementAt(i));
             }
 
             // stuff the object identifiers into a SEQUENCE
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
index 671a175f7..9d9142927 100644
--- a/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
+++ b/pki/base/java-tools/src/com/netscape/cmstools/PrettyPrintCert.java
@@ -190,7 +190,7 @@ public class PrettyPrintCert {
                 CertificateSubjectName csn = (CertificateSubjectName)
                         certinfo.get(X509CertInfo.SUBJECT);
 
-                Enumeration en = csn.getElements();
+                Enumeration<String> en = csn.getAttributeNames();
 
                 X500Name dname = (X500Name) csn.get(CertificateSubjectName.DN_NAME);