Removed unused variables (part 2).

This patch brings down the warnings from 1943 to 1221.

Ticket #103

11 files changed, 17 insertions, 18 deletions

diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
index bf4de6a83..bf8a9cfc1 100644
--- a/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
+++ b/pki/base/util/src/com/netscape/cmsutil/crypto/CryptoUtil.java
@@ -965,7 +965,6 @@ public class CryptoUtil {
 
         while (enums.hasMoreElements()) {
             CryptoToken token = enums.nextElement();
-            String tokenName = token.getName();
             CryptoStore store = token.getCryptoStore();
             PrivateKey keys[] = store.getPrivateKeys();
 
diff --git a/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java b/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java
index 16f948fd7..bf4a7fe73 100644
--- a/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java
+++ b/pki/base/util/src/com/netscape/cmsutil/crypto/Module.java
@@ -28,20 +28,20 @@ public class Module {
     private String mUserFriendlyName = "";
     private String mImagePath = "";
     // a Vector of Tokens
-    private Vector mTokens = null;
+    private Vector<Token> mTokens = null;
     private boolean mFound = false;
 
     public Module(String name, String printName) {
         mCommonName = name;
         mUserFriendlyName = printName;
-        mTokens = new Vector();
+        mTokens = new Vector<Token>();
     }
 
     public Module(String name, String printName, String image) {
         mCommonName = name;
         mUserFriendlyName = printName;
         mImagePath = image;
-        mTokens = new Vector();
+        mTokens = new Vector<Token>();
     }
 
     public void addToken(CryptoToken t) {
@@ -69,7 +69,7 @@ public class Module {
         mFound = isFound;
     }
 
-    public Vector getTokens() {
+    public Vector<Token> getTokens() {
         return mTokens;
     }
 }
diff --git a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java b/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
index 8317ad785..ed2fb67ee 100644
--- a/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
+++ b/pki/base/util/src/com/netscape/cmsutil/xml/XMLObject.java
@@ -122,8 +122,8 @@ public class XMLObject {
         return null;
     }
 
-    public Vector getAllValues(String tagname) {
-        Vector v = new Vector();
+    public Vector<String> getAllValues(String tagname) {
+        Vector<String> v = new Vector<String>();
         NodeList nodes = mDoc.getElementsByTagName(tagname);
         for (int i = 0; i < nodes.getLength(); i++) {
             Node n = nodes.item(i);
diff --git a/pki/base/util/src/netscape/net/TransferProtocolClient.java b/pki/base/util/src/netscape/net/TransferProtocolClient.java
index cadacaa0f..76e3a9c21 100644
--- a/pki/base/util/src/netscape/net/TransferProtocolClient.java
+++ b/pki/base/util/src/netscape/net/TransferProtocolClient.java
@@ -35,7 +35,7 @@ public class TransferProtocolClient extends NetworkClient {
      * Array of strings (usually 1 entry) for the last reply
      * from the server.
      */
-    protected Vector serverResponse = new Vector(1);
+    protected Vector<String> serverResponse = new Vector<String>(1);
 
     /** code for last reply */
     protected int lastReplyCode;
@@ -112,7 +112,7 @@ public class TransferProtocolClient extends NetworkClient {
     }
 
     /** Returns all server response strings. */
-    public Vector getResponseStrings() {
+    public Vector<String> getResponseStrings() {
         return serverResponse;
     }
 
diff --git a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
index 6e28b4a0e..ff1ea7173 100644
--- a/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
+++ b/pki/base/util/src/netscape/security/extensions/GenericASN1Extension.java
@@ -73,9 +73,9 @@ public class GenericASN1Extension extends Extension
      * get, set, delete methods of Certificate, x509 type.
      */
     private String name;
-    public static String OID = null;
+    public String OID = null;
     public static Hashtable<String, String> mConfig = null;
-    public static String pattern = null;
+    public String pattern = null;
     private int index = 0;
 
     // Encode this value
@@ -325,7 +325,7 @@ public class GenericASN1Extension extends Extension
      * Return the OID of this attribute.
      */
     public String getOID() {
-        return (OID);
+        return OID;
     }
 
     /**
diff --git a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
index a90abe7e3..c67fe9965 100644
--- a/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
+++ b/pki/base/util/src/netscape/security/extensions/PresenceServerExtension.java
@@ -312,6 +312,8 @@ public class PresenceServerExtension extends Extension implements CertAttrSet {
         fos.close();
 
         Extension ext1 = new Extension(new DerValue(dos.toByteArray()));
+
+        @SuppressWarnings("unused")
         PresenceServerExtension ext2 = new PresenceServerExtension(
                 new Boolean(false), ext1.getExtensionValue());
 
diff --git a/pki/base/util/src/netscape/security/pkcs/PKCS7.java b/pki/base/util/src/netscape/security/pkcs/PKCS7.java
index 4de75a4e1..c8fb69582 100644
--- a/pki/base/util/src/netscape/security/pkcs/PKCS7.java
+++ b/pki/base/util/src/netscape/security/pkcs/PKCS7.java
@@ -336,7 +336,7 @@ public class PKCS7 {
     public SignerInfo[] verify(byte[] bytes)
             throws NoSuchAlgorithmException, SignatureException {
 
-        Vector intResult = new Vector();
+        Vector<SignerInfo> intResult = new Vector<SignerInfo>();
         for (int i = 0; i < signerInfos.length; i++) {
 
             SignerInfo signerInfo = verify(signerInfos[i], bytes);
diff --git a/pki/base/util/src/netscape/security/util/DerInputStream.java b/pki/base/util/src/netscape/security/util/DerInputStream.java
index e85d48ed6..20ced6757 100644
--- a/pki/base/util/src/netscape/security/util/DerInputStream.java
+++ b/pki/base/util/src/netscape/security/util/DerInputStream.java
@@ -314,7 +314,7 @@ public class DerInputStream {
         /*
          * Pull values out of the stream.
          */
-        Vector vec = new Vector(startLen);
+        Vector<DerValue> vec = new Vector<DerValue>(startLen);
         DerValue value;
 
         do {
diff --git a/pki/base/util/src/netscape/security/x509/Extension.java b/pki/base/util/src/netscape/security/x509/Extension.java
index 5d0029875..7dc9e2890 100644
--- a/pki/base/util/src/netscape/security/x509/Extension.java
+++ b/pki/base/util/src/netscape/security/x509/Extension.java
@@ -177,7 +177,7 @@ public class Extension implements Serializable {
 
         byte[] dup = new byte[extensionValue.length];
         System.arraycopy(extensionValue, 0, dup, 0, dup.length);
-        return (dup);
+        return dup;
     }
 
     public void setExtensionValue(byte value[]) {
diff --git a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
index b24ce1158..0912d5b0c 100644
--- a/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
+++ b/pki/base/util/src/netscape/security/x509/NSCCommentExtension.java
@@ -65,9 +65,9 @@ public class NSCCommentExtension extends Extension
     // Encode this extension value
     private void encodeThis() throws IOException {
         DerOutputStream os = new DerOutputStream();
-        DerOutputStream tmp = new DerOutputStream();
 
         os.putIA5String(mComment);
+        // DerOutputStream tmp = new DerOutputStream();
         // os.write(DerValue.tag_Sequence,tmp);
         extensionValue = os.toByteArray();
     }
diff --git a/pki/base/util/src/netscape/security/x509/X500Name.java b/pki/base/util/src/netscape/security/x509/X500Name.java
index 920b0e1e4..d44003baa 100644
--- a/pki/base/util/src/netscape/security/x509/X500Name.java
+++ b/pki/base/util/src/netscape/security/x509/X500Name.java
@@ -148,7 +148,6 @@ public class X500Name implements Principal, GeneralNameInterface {
             String country) throws IOException {
         DirStrConverter dirStrConverter = new DirStrConverter();
         PrintableConverter printableConverter = new PrintableConverter();
-        DerValue val;
         AVA[] assertion = new AVA[1]; // array is cloned in constructors.
         int i = 4;
 
@@ -194,7 +193,6 @@ public class X500Name implements Principal, GeneralNameInterface {
             String country) throws IOException {
         DirStrConverter dirStrConverter = new DirStrConverter();
         PrintableConverter printableConverter = new PrintableConverter();
-        DerValue val;
         AVA[] assertion = new AVA[1]; // array is cloned in constructors.
         int i = 6;