diff options
Diffstat (limited to 'pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java')
-rw-r--r-- | pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java b/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java index b53e200dc..f7505be2e 100644 --- a/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java +++ b/pki/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java @@ -17,8 +17,6 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.admin.certsrv.keycert; -import java.awt.*; -import java.awt.event.*; import javax.swing.border.*; import javax.swing.*; import com.netscape.admin.certsrv.*; @@ -145,7 +143,7 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements if (mMIMECheckBox.isSelected()) { startProgressStatus(); NameValuePairs nvps = new NameValuePairs(); - nvps.add(ConfigConstants.PR_CERTIFICATE_EXTENSION, mMIMEText.getText().trim()); + nvps.put(ConfigConstants.PR_CERTIFICATE_EXTENSION, mMIMEText.getText().trim()); AdminConnection connection = wizardInfo.getAdminConnection(); try { connection.validate( @@ -159,16 +157,16 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements NameValuePairs nvps = new NameValuePairs(); - nvps.add(Constants.PR_SUBJECT_NAME, wizardInfo.getSubjectName()); + nvps.put(Constants.PR_SUBJECT_NAME, wizardInfo.getSubjectName()); if (wizardInfo.isNewKey()) { String type = wizardInfo.getKeyType(); if (type.equals("ECC")) { - nvps.add(Constants.PR_KEY_CURVENAME, wizardInfo.getKeyCurveName()); + nvps.put(Constants.PR_KEY_CURVENAME, wizardInfo.getKeyCurveName()); } else { - nvps.add(Constants.PR_KEY_LENGTH, wizardInfo.getKeyLength()); + nvps.put(Constants.PR_KEY_LENGTH, wizardInfo.getKeyLength()); } - nvps.add(Constants.PR_KEY_TYPE, type); - nvps.add(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName()); + nvps.put(Constants.PR_KEY_TYPE, type); + nvps.put(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName()); } //nvps.add(Constants.PR_VALIDITY_PERIOD, wizardInfo.getValidityPeriod()); addValidityPeriod(wizardInfo, nvps); @@ -180,22 +178,22 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements addExtendedKey(nvps); if (mAIACheckBox.isSelected()) - nvps.add(Constants.PR_AIA, Constants.TRUE); + nvps.put(Constants.PR_AIA, Constants.TRUE); if (mAKICheckBox.isSelected()) - nvps.add(Constants.PR_AKI, Constants.TRUE); + nvps.put(Constants.PR_AKI, Constants.TRUE); if (mSKICheckBox.isSelected()) - nvps.add(Constants.PR_SKI, Constants.TRUE); + nvps.put(Constants.PR_SKI, Constants.TRUE); if (mOCSPNoCheck.isSelected()) - nvps.add(Constants.PR_OCSP_NOCHECK, Constants.TRUE); + nvps.put(Constants.PR_OCSP_NOCHECK, Constants.TRUE); if (mKeyUsageBox.isSelected()) - nvps.add(Constants.PR_KEY_USAGE, Constants.TRUE); + nvps.put(Constants.PR_KEY_USAGE, Constants.TRUE); if (mMIMECheckBox.isSelected()) - nvps.add(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim()); + nvps.put(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim()); wizardInfo.addEntry(wizardInfo.ALL_INFO, nvps); @@ -205,44 +203,44 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements private void addValidityPeriod(CertSetupWizardInfo wizardInfo, NameValuePairs nvps) { - nvps.add(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear()); - nvps.add(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth()); - nvps.add(Constants.PR_BEGIN_DATE, wizardInfo.getBeginDate()); - nvps.add(Constants.PR_BEGIN_HOUR, wizardInfo.getBeginHour()); - nvps.add(Constants.PR_BEGIN_MIN, wizardInfo.getBeginMin()); - nvps.add(Constants.PR_BEGIN_SEC, wizardInfo.getBeginSec()); - nvps.add(Constants.PR_AFTER_YEAR, wizardInfo.getAfterYear()); - nvps.add(Constants.PR_AFTER_MONTH, wizardInfo.getAfterMonth()); - nvps.add(Constants.PR_AFTER_DATE, wizardInfo.getAfterDate()); - nvps.add(Constants.PR_AFTER_HOUR, wizardInfo.getAfterHour()); - nvps.add(Constants.PR_AFTER_MIN, wizardInfo.getAfterMin()); - nvps.add(Constants.PR_AFTER_SEC, wizardInfo.getAfterSec()); + nvps.put(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear()); + nvps.put(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth()); + nvps.put(Constants.PR_BEGIN_DATE, wizardInfo.getBeginDate()); + nvps.put(Constants.PR_BEGIN_HOUR, wizardInfo.getBeginHour()); + nvps.put(Constants.PR_BEGIN_MIN, wizardInfo.getBeginMin()); + nvps.put(Constants.PR_BEGIN_SEC, wizardInfo.getBeginSec()); + nvps.put(Constants.PR_AFTER_YEAR, wizardInfo.getAfterYear()); + nvps.put(Constants.PR_AFTER_MONTH, wizardInfo.getAfterMonth()); + nvps.put(Constants.PR_AFTER_DATE, wizardInfo.getAfterDate()); + nvps.put(Constants.PR_AFTER_HOUR, wizardInfo.getAfterHour()); + nvps.put(Constants.PR_AFTER_MIN, wizardInfo.getAfterMin()); + nvps.put(Constants.PR_AFTER_SEC, wizardInfo.getAfterSec()); } private void addBasicConstraints(NameValuePairs nvps) { if (mCACheckBox.isSelected()) - nvps.add(Constants.PR_IS_CA, Constants.TRUE); + nvps.put(Constants.PR_IS_CA, Constants.TRUE); String certLen = mCertPathText.getText().trim(); if (!certLen.equals("")) - nvps.add(Constants.PR_CERT_LEN, certLen); + nvps.put(Constants.PR_CERT_LEN, certLen); } private void addExtendedKey(NameValuePairs nvps) { if (mSSLClient.isSelected()) - nvps.add(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE); + nvps.put(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE); if (mSSLServer.isSelected()) - nvps.add(Constants.PR_SSL_SERVER_BIT, Constants.TRUE); + nvps.put(Constants.PR_SSL_SERVER_BIT, Constants.TRUE); if (mSSLMail.isSelected()) - nvps.add(Constants.PR_SSL_MAIL_BIT, Constants.TRUE); + nvps.put(Constants.PR_SSL_MAIL_BIT, Constants.TRUE); if (mObjectSigning.isSelected()) - nvps.add(Constants.PR_OBJECT_SIGNING_BIT, Constants.TRUE); + nvps.put(Constants.PR_OBJECT_SIGNING_BIT, Constants.TRUE); if (mTimeStamping.isSelected()) - nvps.add(Constants.PR_TIMESTAMPING_BIT, Constants.TRUE); + nvps.put(Constants.PR_TIMESTAMPING_BIT, Constants.TRUE); if (mOCSPSigning.isSelected()) - nvps.add(Constants.PR_OCSP_SIGNING, Constants.TRUE); + nvps.put(Constants.PR_OCSP_SIGNING, Constants.TRUE); } public void callHelp() { |