PKISilent type safety changes

Specifies the types for the collections.
Changes no behavior, and, due to erasure,  should not even change the resulting byte code.

1 files changed, 24 insertions, 27 deletions

diff --git a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
index 715cc2306..d492d5fcb 100644
--- a/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
+++ b/pki/base/silent/src/com/netscape/pkisilent/ConfigureSubCA.java
@@ -20,7 +20,6 @@ package com.netscape.pkisilent;
 import java.io.ByteArrayInputStream;
 import java.net.URLEncoder;
 import java.util.ArrayList;
-import java.util.Hashtable;
 
 import com.netscape.osutil.OSUtil;
 import com.netscape.pkisilent.argparser.ArgParser;
@@ -33,8 +32,6 @@ import com.netscape.pkisilent.http.HTTPResponse;
 public class ConfigureSubCA
 {
 
-    public static Hashtable mUsedPort = new Hashtable();
-
     // global constants
     public static final String DEFAULT_KEY_TYPE = "RSA";
     public static final String DEFAULT_KEY_SIZE = "2048";
@@ -439,7 +436,7 @@ public class ConfigureSubCA
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
-        ArrayList al = null;
+        ArrayList<String> al = null;
 
         String query_string = "p=10" + "&op=next" + "&xml=true"
                     + "&subsystem_custom_size=" + subsystem_key_size
@@ -479,11 +476,11 @@ public class ConfigureSubCA
         px.parse(bais);
         px.prettyprintxml();
         
-        al = px.constructvaluelist("CertReqPair","DN");
+        al = px.constructValueList("CertReqPair","DN");
         // get ca cert subject name
         if (al != null) {
             for (int i=0; i < al.size(); i++) {
-                String temp = (String) al.get(i);
+                String temp =  al.get(i);
                 if (temp.indexOf("Certificate Authority") > 0 ) {
                     ca_cert_name = temp;
                 } else if (temp.indexOf("OCSP Signing Certificate") > 0 ) {
@@ -514,9 +511,9 @@ public class ConfigureSubCA
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
-        ArrayList req_list = null;
-        ArrayList cert_list = null;
-        ArrayList dn_list = null;
+        ArrayList<String> req_list = null;
+        ArrayList<String> cert_list = null;
+        ArrayList<String> dn_list = null;
 
         String domain_url = "https://" + ca_hostname + ":" + ca_ssl_port ;
 
@@ -542,9 +539,9 @@ public class ConfigureSubCA
         px.parse(bais);
         px.prettyprintxml();
         
-        req_list = px.constructvaluelist("CertReqPair","Request");
-        cert_list = px.constructvaluelist("CertReqPair","Certificate");
-        dn_list = px.constructvaluelist("CertReqPair","Nickname");
+        req_list = px.constructValueList("CertReqPair","Request");
+        cert_list = px.constructValueList("CertReqPair","Certificate");
+        dn_list = px.constructValueList("CertReqPair","Nickname");
 
         System.out.println("req_list_size=" + req_list.size());
         System.out.println("cert_list_size=" + cert_list.size());
@@ -552,23 +549,23 @@ public class ConfigureSubCA
 
         if (req_list != null && cert_list != null && dn_list != null) {
             for (int i=0; i < dn_list.size(); i++) {
-                String temp = (String) dn_list.get(i);
+                String temp =  dn_list.get(i);
 
                 if (temp.indexOf("caSigningCert") >= 0 ) {
-                    ca_cert_req = (String) req_list.get(i);
-                    ca_cert_cert = (String) cert_list.get(i);
+                    ca_cert_req =  req_list.get(i);
+                    ca_cert_cert =  cert_list.get(i);
                 } else if (temp.indexOf("ocspSigningCert") >= 0 ) {
-                    ocsp_cert_req = (String) req_list.get(i);
-                    ocsp_cert_cert = (String) cert_list.get(i);
+                    ocsp_cert_req =  req_list.get(i);
+                    ocsp_cert_cert =  cert_list.get(i);
                 } else if (temp.indexOf("subsystemCert") >= 0 ) {
-                    ca_subsystem_cert_req = (String) req_list.get(i);
-                    ca_subsystem_cert_cert = (String) cert_list.get(i);
+                    ca_subsystem_cert_req =  req_list.get(i);
+                    ca_subsystem_cert_cert =  cert_list.get(i);
                 } else if (temp.indexOf("auditSigningCert") >=0) {
-                    ca_audit_signing_cert_req = (String) req_list.get(i);
-                    ca_audit_signing_cert_cert = (String) cert_list.get(i);
+                    ca_audit_signing_cert_req =  req_list.get(i);
+                    ca_audit_signing_cert_cert =  cert_list.get(i);
                 } else {
-                    server_cert_req = (String) req_list.get(i);
-                    server_cert_cert = (String) cert_list.get(i);
+                    server_cert_req =  req_list.get(i);
+                    server_cert_cert =  cert_list.get(i);
                 }
             }
         }
@@ -605,10 +602,10 @@ public class ConfigureSubCA
         HTTPResponse hr = null;
         ByteArrayInputStream bais = null;
         ParseXML px = new ParseXML();
-        ArrayList req_list = null;
-        ArrayList cert_list = null;
-        ArrayList dn_list = null;
-        ArrayList pp_list = null;
+        ArrayList<String> req_list = null;
+        ArrayList<String> cert_list = null;
+        ArrayList<String> dn_list = null;
+        ArrayList<String> pp_list = null;
 
 
         String query_string = "p=12" + "&op=next" + "&xml=true" +