From d5c6e6c69e678a79f9e8cd312e6007ad88026a36 Mon Sep 17 00:00:00 2001
From: Endi Sukma Dewata <edewata@redhat.com>
Date: Mon, 6 Feb 2012 15:44:34 -0600
Subject: Added generics (part 4).

This patch brings down the warnings from 3427 to 2917.

Ticket #2
---
 pki/base/util/src/netscape/security/pkcs/PKCS7.java         |  3 ---
 pki/base/util/src/netscape/security/pkcs/PKCS8Key.java      |  2 +-
 .../util/src/netscape/security/pkcs/PKCS9Attributes.java    | 13 +++++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'pki/base/util/src/netscape/security/pkcs')

diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/pki/base/util/src/netscape/security/pkcs/PKCS7.java
index b28c570c3..4de75a4e1 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS7.java
+++ b/pki/base/util/src/netscape/security/pkcs/PKCS7.java
@@ -272,9 +272,6 @@ public class PKCS7 {
         // contentInfo
         contentInfo.encode(signedData);
 
-        // certificates
-        DerOutputStream certs = new DerOutputStream();
-
         // cast to X509CertImpl[] since X509CertImpl implements DerEncoder
         X509CertImpl implCerts[] = new X509CertImpl[certificates.length];
         try {
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java
index b3ec07906..6fc89610a 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java
+++ b/pki/base/util/src/netscape/security/pkcs/PKCS8Key.java
@@ -184,7 +184,7 @@ public class PKCS8Key implements PrivateKey {
                 throw new InstantiationException();
             }
 
-            Class keyClass = Class.forName(classname);
+            Class<?> keyClass = Class.forName(classname);
             Object inst;
             PKCS8Key result;
 
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
index 6f7ce6abb..485cdded1 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
+++ b/pki/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
@@ -38,12 +38,12 @@ public class PKCS9Attributes {
     /**
      * Attributes in this set indexed by OID.
      */
-    private final Hashtable attributes = new Hashtable(3);
+    private final Hashtable<ObjectIdentifier, PKCS9Attribute> attributes = new Hashtable<ObjectIdentifier, PKCS9Attribute>(3);
 
     /**
      * The keys of this hashtable are the OIDs of permitted attributes.
      */
-    private final Hashtable permittedAttributes;
+    private final Hashtable<ObjectIdentifier, ObjectIdentifier> permittedAttributes;
 
     /**
      * The DER encoding of this attribute set. The tag byte must be
@@ -73,7 +73,7 @@ public class PKCS9Attributes {
                DerInputStream in) throws IOException {
         if (permittedAttributes != null) {
             this.permittedAttributes =
-                    new Hashtable(permittedAttributes.length);
+                    new Hashtable<ObjectIdentifier, ObjectIdentifier>(permittedAttributes.length);
 
             for (int i = 0; i < permittedAttributes.length; i++)
                 this.permittedAttributes.put(permittedAttributes[i],
@@ -157,7 +157,6 @@ public class PKCS9Attributes {
 
         PKCS9Attribute attrib;
         ObjectIdentifier oid;
-        int index;
 
         for (int i = 0; i < derVals.length; i++) {
             attrib = new PKCS9Attribute(derVals[i]);
@@ -213,14 +212,14 @@ public class PKCS9Attributes {
      * Get an attribute from this set.
      */
     public PKCS9Attribute getAttribute(ObjectIdentifier oid) {
-        return (PKCS9Attribute) attributes.get(oid);
+        return attributes.get(oid);
     }
 
     /**
      * Get an attribute from this set.
      */
     public PKCS9Attribute getAttribute(String name) {
-        return (PKCS9Attribute) attributes.get(PKCS9Attribute.getOID(name));
+        return attributes.get(PKCS9Attribute.getOID(name));
     }
 
     /**
@@ -228,7 +227,6 @@ public class PKCS9Attributes {
      */
     public PKCS9Attribute[] getAttributes() {
         PKCS9Attribute[] attribs = new PKCS9Attribute[attributes.size()];
-        ObjectIdentifier oid;
 
         int j = 0;
         for (int i = 1; i < PKCS9Attribute.PKCS9_OIDS.length &&
@@ -275,7 +273,6 @@ public class PKCS9Attributes {
         StringBuffer buf = new StringBuffer(200);
         buf.append("PKCS9 Attributes: [\n\t");
 
-        ObjectIdentifier oid;
         PKCS9Attribute value;
 
         boolean first = true;
-- 
cgit