Removed unnecessary type casts.

Unnecessary type casts have been removed using Eclipse Quick Fix.

Ticket #134

4 files changed, 8 insertions, 9 deletions

diff --git a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
index eae4b0479..3a2c7b437 100644
--- a/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
+++ b/base/util/src/netscape/security/pkcs/PKCS10Attribute.java
@@ -105,8 +105,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
                 //DerValue dv = inAttrValue.data.getDerValue();
                 // hack. toDerInputStream only gives one extension.
                 DerInputStream fi = new DerInputStream(inAttrValue.toByteArray());
-                attributeValue = (CertAttrSet) new
-                            Extensions(fi);
+                attributeValue = new Extensions(fi);
                 //CertificateExtensions(fi);
                 return;
             } catch (Exception e) {
@@ -119,7 +118,7 @@ public class PKCS10Attribute implements DerEncoder, Serializable {
             @SuppressWarnings("unchecked")
             Class<CertAttrSet> extClass = (Class<CertAttrSet>) OIDMap.getClass(attributeId);
             if (extClass != null) {
-                Constructor<CertAttrSet> cons = (Constructor<CertAttrSet>) extClass.getConstructor(params);
+                Constructor<CertAttrSet> cons = extClass.getConstructor(params);
                 Object value = Array.newInstance(byte.class, val.length);
                 for (int i = 0; i < val.length; i++) {
                     Array.setByte(value, i, val[i]);
diff --git a/base/util/src/netscape/security/pkcs/PKCS7.java b/base/util/src/netscape/security/pkcs/PKCS7.java
index 26a0bdb34..8bd514099 100644
--- a/base/util/src/netscape/security/pkcs/PKCS7.java
+++ b/base/util/src/netscape/security/pkcs/PKCS7.java
@@ -191,7 +191,7 @@ public class PKCS7 {
 
             for (int i = 0; i < len; i++) {
                 try {
-                    X509Certificate cert = (X509Certificate) new
+                    X509Certificate cert = new
                                            X509CertImpl(certificateVals[i]);
                     certificates[i] = cert;
                 } catch (CertificateException e) {
@@ -412,7 +412,7 @@ public class PKCS7 {
         for (int i = 0; i < certificates.length; i++) {
             X509Certificate cert = certificates[i];
             X500Name thisName = (X500Name) cert.getIssuerDN();
-            BigInteger tmpSerial = (BigInteger) cert.getSerialNumber();
+            BigInteger tmpSerial = cert.getSerialNumber();
             BigInt thisSerial = new BigInt(tmpSerial);
             if (serial.equals(thisSerial) && name.equals(thisName)) {
                 return cert;
diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
index 1239ccaf3..398fc0174 100644
--- a/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
+++ b/base/util/src/netscape/security/pkcs/PKCS9Attribute.java
@@ -1013,7 +1013,7 @@ public class PKCS9Attribute implements DerEncoder {
      * Return the name of this attribute.
      */
     public String getName() {
-        return (String) OID_NAME_TABLE.get(PKCS9_OIDS[index]);
+        return OID_NAME_TABLE.get(PKCS9_OIDS[index]);
     }
 
     /**
@@ -1021,7 +1021,7 @@ public class PKCS9Attribute implements DerEncoder {
      * the name.
      */
     public static ObjectIdentifier getOID(String name) {
-        return (ObjectIdentifier) NAME_OID_TABLE.get(name.toLowerCase());
+        return NAME_OID_TABLE.get(name.toLowerCase());
     }
 
     /**
@@ -1029,7 +1029,7 @@ public class PKCS9Attribute implements DerEncoder {
      * the oid.
      */
     public static String getName(ObjectIdentifier oid) {
-        return (String) OID_NAME_TABLE.get(oid);
+        return OID_NAME_TABLE.get(oid);
     }
 
     /**
diff --git a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
index 39bf2340e..35996b4b6 100644
--- a/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
+++ b/base/util/src/netscape/security/pkcs/PKCS9Attributes.java
@@ -204,7 +204,7 @@ public class PKCS9Attributes {
      * DerValue.tag_SetOf.
      */
     public byte[] getDerEncoding() throws IOException {
-        return (byte[]) derEncoding.clone();
+        return derEncoding.clone();
 
     }