Removed unnecessary type casts.

Unnecessary type casts have been removed using Eclipse Quick Fix.

Ticket #134

3 files changed, 12 insertions, 19 deletions

diff --git a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
index dc0222dda..44ff46a9b 100644
--- a/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
+++ b/base/common/src/com/netscape/cms/listeners/CertificateIssuedListener.java
@@ -354,11 +354,10 @@ public class CertificateIssuedListener implements IRequestListener {
                 }
 
                 // build some token data
-                mContentParams.put(IEmailFormProcessor.TOKEN_ID,
-                        mConfig.getName());
+                mContentParams.put(IEmailFormProcessor.TOKEN_ID, mConfig.getName());
                 mReqId = r.getRequestId();
                 mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-                        (Object) mReqId.toString());
+                        mReqId.toString());
                 IEmailFormProcessor et = CMS.getEmailFormProcessor();
                 String c = et.getEmailContent(template.toString(), mContentParams);
 
@@ -402,12 +401,12 @@ public class CertificateIssuedListener implements IRequestListener {
         mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN,
                 issuedCert[0].getSubjectDN().toString());
 
-        Date date = (Date) issuedCert[0].getNotAfter();
+        Date date = issuedCert[0].getNotAfter();
 
         mContentParams.put(IEmailFormProcessor.TOKEN_NOT_AFTER,
                 mDateFormat.format(date));
 
-        date = (Date) issuedCert[0].getNotBefore();
+        date = issuedCert[0].getNotBefore();
         mContentParams.put(IEmailFormProcessor.TOKEN_NOT_BEFORE,
                 mDateFormat.format(date));
 
diff --git a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
index ad91738e9..b361057b4 100644
--- a/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
+++ b/base/common/src/com/netscape/cms/listeners/CertificateRevokedListener.java
@@ -311,7 +311,7 @@ public class CertificateRevokedListener implements IRequestListener {
                 mHttpPort);
 
         try {
-            RevokedCertImpl revCert = (RevokedCertImpl) crlentries[0];
+            RevokedCertImpl revCert = crlentries[0];
             ICertificateAuthority ca = (ICertificateAuthority) CMS.getSubsystem(CMS.SUBSYSTEM_CA);
             ICertificateRepository certDB = ca.getCertificateRepository();
             X509Certificate cert = certDB.getX509Certificate(revCert.getSerialNumber());
@@ -320,7 +320,7 @@ public class CertificateRevokedListener implements IRequestListener {
                     cert.getIssuerDN().toString());
             mContentParams.put(IEmailFormProcessor.TOKEN_SUBJECT_DN,
                     cert.getSubjectDN().toString());
-            Date date = (Date) crlentries[0].getRevocationDate();
+            Date date = crlentries[0].getRevocationDate();
 
             mContentParams.put(IEmailFormProcessor.TOKEN_REVOCATION_DATE,
                     mDateFormat.format(date));
diff --git a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
index 3d236baea..f1f396ca3 100644
--- a/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
+++ b/base/common/src/com/netscape/cms/listeners/RequestInQListener.java
@@ -227,25 +227,19 @@ public class RequestInQListener implements IRequestListener {
 
         RequestId reqId = r.getRequestId();
 
-        mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID,
-                (Object) reqId.toString());
+        mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_ID, reqId.toString());
 
         mContentParams.put(IEmailFormProcessor.TOKEN_ID, mId);
 
         val = r.getRequestType();
         if (val != null)
-            mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE,
-                    val);
+            mContentParams.put(IEmailFormProcessor.TOKEN_REQUEST_TYPE, val);
 
-        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST,
-                (Object) mHttpHost);
-        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT,
-                (Object) mAgentPort);
+        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_HOST, mHttpHost);
+        mContentParams.put(IEmailFormProcessor.TOKEN_HTTP_PORT, mAgentPort);
 
-        mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL,
-                (Object) mSenderEmail);
-        mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL,
-                (Object) mRecipientEmail);
+        mContentParams.put(IEmailFormProcessor.TOKEN_SENDER_EMAIL, mSenderEmail);
+        mContentParams.put(IEmailFormProcessor.TOKEN_RECIPIENT_EMAIL, mRecipientEmail);
     }
 
     /**