diff options
Diffstat (limited to 'base/console/src/com/netscape/admin/certsrv/keycert')
33 files changed, 168 insertions, 168 deletions
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java index 81ffc2d0e..66a2b2bd4 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java @@ -215,10 +215,10 @@ public class CertSetupWizardInfo extends WizardInfo { return (String)get(Constants.PR_ISSUER_NAME); } - public String getSerialNumber() { + public String getSerialNumber() { return (String)get(Constants.PR_SERIAL_NUMBER); } - + public String getNotBefore() { return (String)get(Constants.PR_BEFORE_VALIDDATE); } @@ -306,7 +306,7 @@ public class CertSetupWizardInfo extends WizardInfo { public String getHashType() { return (String)get(ConfigConstants.PR_HASH_TYPE); } - + public void setHashType(String type) { put(ConfigConstants.PR_HASH_TYPE, type); } @@ -314,7 +314,7 @@ public class CertSetupWizardInfo extends WizardInfo { public String getSignedByType() { return (String)get(ConfigConstants.PR_SIGNEDBY_TYPE); } - + public void setSignedByType(String type) { put(ConfigConstants.PR_SIGNEDBY_TYPE, type); } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java index fe5ebd2d7..3a1b9dd23 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java @@ -45,7 +45,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CACERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCACertRequest1Page() { super(PANELNAME); init(); @@ -59,7 +59,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) return true; - return false; + return false; } public boolean validatePanel() { @@ -91,7 +91,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(caLbl, gbc); - + mCABtn = makeJRadioButton("SELFSIGN", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -109,7 +109,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSubBtn, gbc); - + ButtonGroup caGroup = new ButtonGroup(); caGroup.add(mCABtn); caGroup.add(mSubBtn); @@ -196,7 +196,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel { public void getUpdateInfo(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - + if (mCABtn.isSelected()) wizardInfo.addEntry(wizardInfo.CA_TYPE, wizardInfo.SELF_SIGNED); else if (mSubBtn.isSelected()) diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java index fe06a6313..c16e3268c 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java @@ -37,7 +37,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "CAKEYWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCAKeyPage() { super(PANELNAME); init(); @@ -49,7 +49,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { // (wizardInfo.isNewKey())) return false; - return true; + return true; } public boolean validatePanel() { @@ -61,7 +61,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; AdminConnection connection = wizardInfo.getAdminConnection(); NameValuePairs nvps = new NameValuePairs(); - + nvps.add(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName()); nvps.add(Constants.PR_KEY_LENGTH, (String)mKeyLengthBox.getSelectedItem()); nvps.add(Constants.PR_KEY_TYPE, (String)mKeyTypeBox.getSelectedItem()); @@ -69,7 +69,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { try { NameValuePairs response = connection.process( DestDef.DEST_SERVER_ADMIN, - ScopeDef.SC_CA_SIGNINGCERT, + ScopeDef.SC_CA_SIGNINGCERT, Constants.PR_CERT_REQUEST, nvps); } catch (EAdminException e) { showErrorDialog(e.toString()); @@ -94,7 +94,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel { public void getUpdateInfo(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - wizardInfo.addEntry(Constants.PR_KEY_LENGTH, + wizardInfo.addEntry(Constants.PR_KEY_LENGTH, (String)mKeyLengthBox.getSelectedItem()); wizardInfo.addEntry(Constants.PR_KEY_TYPE, (String)mKeyTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java index 1c2268bb2..975a09c3d 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java @@ -39,7 +39,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { "configuration-keycert-wizard-subjectdn-help"; private String certType = ""; - + WCertDNPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -98,7 +98,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { //enableFields(true, mActiveColor); if (subjectName != null) populateDN(subjectName); - return true; + return true; } public boolean validatePanel() { @@ -118,7 +118,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { } else { str = str2; } - + if (str.equals("")) { setErrorMessage("BLANKFIELD"); return false; @@ -135,7 +135,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel { wizardInfo.addEntry(Constants.PR_SUBJECT_NAME, str); try { - connection.validate(DestDef.DEST_SERVER_ADMIN, + connection.validate(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_SUBJECT_NAME, nvps); } catch (EAdminException e) { //showErrorDialog(e.toString()); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java index d6359cf6c..9a6d17ec8 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java @@ -37,7 +37,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel { private static final String PANELNAME = "CERTDNVALIDWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCertDNValidityPage() { super(PANELNAME); init(); @@ -53,7 +53,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel { (wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA))) return false; - return true; + return true; } public boolean validatePanel() { @@ -62,7 +62,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel { public boolean concludePanel(WizardInfo info) { String str = mSubjectDNText.getText().trim(); - + if (str.equals("")) { setErrorMessage("BLANKFIELD"); return false; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java index f7505be2e..8b71f6932 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java @@ -32,12 +32,12 @@ import com.netscape.admin.certsrv.config.*; * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config.install */ -class WCertExtensionPage extends WBaseCertExtensionPage implements +class WCertExtensionPage extends WBaseCertExtensionPage implements IWizardPanel { private static final String PANELNAME = "CERTEXTENSION1WIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-extension-help"; - + WCertExtensionPage(JDialog parent) { super(PANELNAME); mPanelName = PANELNAME; @@ -68,7 +68,7 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements return false; String title = ""; - + if (!mModified) { String certType = wizardInfo.getCertType(); if (certType.equals(Constants.PR_CA_SIGNING_CERT)) { @@ -195,13 +195,13 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements if (mMIMECheckBox.isSelected()) nvps.put(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim()); - wizardInfo.addEntry(wizardInfo.ALL_INFO, nvps); + wizardInfo.addEntry(wizardInfo.ALL_INFO, nvps); mModified = true; return true; } - private void addValidityPeriod(CertSetupWizardInfo wizardInfo, + private void addValidityPeriod(CertSetupWizardInfo wizardInfo, NameValuePairs nvps) { nvps.put(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear()); nvps.put(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth()); @@ -229,7 +229,7 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements private void addExtendedKey(NameValuePairs nvps) { - if (mSSLClient.isSelected()) + if (mSSLClient.isSelected()) nvps.put(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE); if (mSSLServer.isSelected()) nvps.put(Constants.PR_SSL_SERVER_BIT, Constants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java index a378e91d3..bc5875589 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java @@ -39,7 +39,7 @@ import com.netscape.admin.certsrv.task.*; * @see com.netscape.admin.certsrv.config.install */ class WCertMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "CERTMESSAGEDIGESTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-messagedigest-help"; @@ -63,9 +63,9 @@ class WCertMessageDigestPage extends WMessageDigestPage { if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE)) return false; - + if ((wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA)) - && !(wizardInfo.isSSLCertLocalCA())) + && !(wizardInfo.isSSLCertLocalCA())) return false; if (!wizardInfo.isNewKey()) @@ -85,15 +85,15 @@ class WCertMessageDigestPage extends WMessageDigestPage { // non-signing cert, algorithm specified by CA return false; } - - return super.initializePanel(info); + + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); - else if (mECCHashTypeBox.isVisible()) + else if (mECCHashTypeBox.isVisible()) wizardInfo.setHashType((String)mECCHashTypeBox.getSelectedItem()); else if (mRSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java index 8fa126148..2099a736f 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java @@ -36,7 +36,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel { private static final String PANELNAME = "COPYCERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WCertRequestPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - + if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE) || wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) return false; @@ -57,7 +57,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel { // mText.setText(CMSAdminUtil.certRequestWrapText(str, 40)); mText.setText(str); setBorder(makeTitledBorder("COPYCERTREQUESTWIZARD")); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java index 88350fc32..71226f9d7 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java @@ -49,7 +49,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, private static final String PANELNAME = "CERTTYPEWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-certtype-help"; - + WCertTypePage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -87,10 +87,10 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, for (String name : response.keySet()) { String type = response.get(name); - if (type.equals(Constants.PR_RA_INSTANCE)) + if (type.equals(Constants.PR_RA_INSTANCE)) mRASigningCert = mResource.getString( "CERTTYPEWIZARD_LABEL_RASIGNINGCERT_LABEL"); - else if (type.equals(Constants.PR_CA_INSTANCE)) + else if (type.equals(Constants.PR_CA_INSTANCE)) mCASigningCert = mResource.getString( "CERTTYPEWIZARD_LABEL_CASIGNINGCERT_LABEL"); else if (type.equals(Constants.PR_KRA_INSTANCE)) @@ -175,7 +175,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, CMSAdminUtil.repaintComp(mCALbl); CMSAdminUtil.repaintComp(mCertType); CMSAdminUtil.repaintComp(mCertTypeText); - return true; + return true; } public boolean validatePanel() { @@ -202,23 +202,23 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, else if (mRASigningCert != null && item.equals(mRASigningCert.trim())) wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_RA_SIGNING_CERT); - else if (mKRATransportCert != null && + else if (mKRATransportCert != null && item.equals(mKRATransportCert.trim())) wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_KRA_TRANSPORT_CERT); else if (mServerCert != null && item.equals(mServerCert.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_SERVER_CERT); else if (mServerCertRadm != null && item.equals(mServerCertRadm.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_SERVER_CERT_RADM); else if (mOCSPSigningCert != null && item.equals(mOCSPSigningCert.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_OCSP_SIGNING_CERT); - else if (mOtherCert != null && item.equals(mOtherCert.trim())) - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + else if (mOtherCert != null && item.equals(mOtherCert.trim())) + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_OTHER_CERT); - + if (item.equals(mOtherCert.trim())) { try { NameValuePairs response = null; @@ -295,7 +295,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; add(dummy, gbc); - + mCertType = createTextArea(mResource.getString( PANELNAME+"_LABEL_CERTTYPE_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -304,7 +304,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mCertType, gbc); - + /* JLabel dummy1 = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); @@ -321,7 +321,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, COMPONENT_SPACE,COMPONENT_SPACE); add(mCertTypeText, gbc); mActiveColor = mCertTypeText.getBackground(); - + JLabel dummy2 = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -463,21 +463,21 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel, mResource.getString("CERTTYPEWIZARD_TEXT_CATYPE_LABEL"); b1 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SELFSIGN_LABEL"); - b2 = + b2 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SUBORDINATE_LABEL"); } else if (type.equals("server")) { label = mResource.getString("CERTTYPEWIZARD_TEXT_SERVERTYPE_LABEL"); b1 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SERVER_SELFSIGN_LABEL"); - b2 = + b2 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SERVER_SUBORDINATE_LABEL"); } else if (type.equals("ocspsigning")) { label = mResource.getString("CERTTYPEWIZARD_TEXT_OCSPTYPE_LABEL"); b1 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SELFSIGNOCSP_LABEL"); - b2 = + b2 = mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SUBORDINATEOCSP_LABEL"); } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java index 8567703d4..11476e046 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java @@ -40,7 +40,7 @@ class WCertValidityPage extends WBaseValidityPage implements IWizardPanel { private String mCertType = ""; private static final String HELPINDEX = "configuration-keycert-wizard-validityperiod-help"; - + WCertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -81,7 +81,7 @@ class WCertValidityPage extends WBaseValidityPage implements IWizardPanel { title = mResource.getString("CERTVALIDWIZARD_BORDER_SERVER_LABEL"); setBorder(new TitledBorder(title)); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java index a7fe56352..3e1f557d5 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java @@ -44,7 +44,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { private JTextArea mTextArea; private JTextField mCertNameField; private Color mActiveColor; - + WDisplayCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -84,7 +84,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { mCertNameField.setText(certName); CMSAdminUtil.repaintComp(mCertNameField); - return true; + return true; } public boolean validatePanel() { @@ -94,7 +94,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { setErrorMessage("EMPTYCERTNAME"); return false; } - } + } return true; } @@ -150,7 +150,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { } wizardInfo.addEntry(Constants.PR_ADD_CERT, new Boolean(true)); /* - CMSAdminUtil.showMessageDialog(mResource, PANELNAME, + CMSAdminUtil.showMessageDialog(mResource, PANELNAME, "INSTALL", JOptionPane.INFORMATION_MESSAGE); */ return true; @@ -182,7 +182,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE, COMPONENT_SPACE); add(mCertNameField, gbc); mActiveColor = mCertNameField.getBackground(); - + mCertNameField.setEditable(false); mCertNameField.setBackground(getBackground()); mCertNameField.setEnabled(false); @@ -245,7 +245,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel { } private String[] parseStr(String dn) { - StringTokenizer tokenizer = new StringTokenizer(dn, ","); + StringTokenizer tokenizer = new StringTokenizer(dn, ","); int numTokens = tokenizer.countTokens(); String[] results = new String[numTokens]; int i=0; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java index d13bca6e4..c505219b9 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java @@ -37,7 +37,7 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-certrequest-help"; private JTextArea desc; - + WExecute1Page(JDialog parent) { super(PANELNAME); mParent = parent; @@ -58,8 +58,8 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && -// !wizardInfo.isNewKey() && - wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA) && +// !wizardInfo.isNewKey() && + wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA) && !(wizardInfo.isSSLCertLocalCA())) { String title = ""; @@ -78,7 +78,7 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { else if (certType.equals(Constants.PR_OTHER_CERT)) title = mResource.getString("EXECUTE1WIZARD_BORDER_OTHER_LABEL"); setBorder(new TitledBorder(title)); - + String str = ""; if (wizardInfo.isNewKey()) { str = mResource.getString("EXECUTE1WIZARD_TEXT_NEWKEY_LABEL"); @@ -88,8 +88,8 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel { desc.setText(str); return true; } - - return false; + + return false; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java index a3ce14257..7543b54e6 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java @@ -36,7 +36,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-selfsignedcert-help"; private JTextArea desc; - + WExecutePage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -57,34 +57,34 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && -// !wizardInfo.isNewKey() && +// !wizardInfo.isNewKey() && ((wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) && wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) || - (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT) && + (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT) && wizardInfo.isSSLCertLocalCA()) || - (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT) && + (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT) && wizardInfo.isSSLCertLocalCA()) || - (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT_RADM) && + (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT_RADM) && wizardInfo.isSSLCertLocalCA()))) { - + setBorder(makeTitledBorder(PANELNAME)); if (wizardInfo.isNewKey()) { String str = mResource.getString( "EXECUTEWIZARD_TEXT_NEWKEY_LABEL"); desc.setText(str); - } else { + } else { String str = mResource.getString( "EXECUTEWIZARD_TEXT_OLDKEY_LABEL"); desc.setText(str); } return true; } - - return false; + + return false; } public boolean validatePanel() { @@ -98,7 +98,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { CMSServerInfo serverInfo = wizardInfo.getServerInfo(); String dir = ""; - if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) + if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) dir = "prevCACert.txt"; else if (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT)) dir = "prevOCSPCert.txt"; @@ -110,7 +110,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { NameValuePairs nvps = wizardInfo.getNameValuePairs(); if (wizardInfo.isNewKey()) { - if (wizardInfo.getHashType() != null) + if (wizardInfo.getHashType() != null) nvps.put(ConfigConstants.PR_HASH_TYPE, wizardInfo.getHashType()); if (wizardInfo.getSignedByType() != null) nvps.put(ConfigConstants.PR_SIGNEDBY_TYPE, wizardInfo.getSignedByType()); @@ -126,7 +126,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel { endProgressStatus(); return false; } - + endProgressStatus(); return true; } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java index b2a0005b6..ea8a6b191 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java @@ -34,7 +34,7 @@ class WGenerateReqPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "GENERATEREQWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WGenerateReqPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WGenerateReqPage extends WizardBasePanel implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE)) return false; - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java index 0ea476b6a..39edb1666 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java @@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This page allows the user to do such selections as the installation of + * This page allows the user to do such selections as the installation of * certificates, server certificate chain, or trusted CA. * * @author Christine Ho @@ -40,7 +40,7 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLCERTCHAINWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-installcerttype-help"; - + WInstallCertChainPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -109,11 +109,11 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(opLbl, gbc); - + mCertBox = makeJComboBox("CERTCHAINTYPE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.weighty = 1.0; add(mCertBox, gbc); @@ -134,7 +134,7 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel { String str = (String)(mCertBox.getSelectedItem()); if (str.startsWith("Trusted")) { wizardInfo.addEntry(wizardInfo.INSTALLCERTTYPE, Constants.PR_TRUSTED_CA_CERT); - } else if (str.startsWith("Untrusted")) { + } else if (str.startsWith("Untrusted")) { wizardInfo.addEntry(wizardInfo.INSTALLCERTTYPE, Constants.PR_SERVER_CERT_CHAIN); } } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java index 5b4d2d340..1cdc6f8d5 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java @@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This page allows the user to do such selections as the installation of + * This page allows the user to do such selections as the installation of * certificates, server certificate chain, or trusted CA. * * @author Christine Ho @@ -45,7 +45,7 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLOPWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-installcerttype-help"; - + WInstallOpPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -138,12 +138,12 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { } if (mCrossCert != null) { - mCertBox.addItem(mCrossCert); + mCertBox.addItem(mCrossCert); mCerts.addElement(Constants.PR_CROSS_CERT); } if (mOtherCert != null) { - mCertBox.addItem(mOtherCert); + mCertBox.addItem(mOtherCert); mCerts.addElement(Constants.PR_OTHER_CERT); } @@ -154,7 +154,7 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { } mCertBox.setSelectedIndex(0); - return true; + return true; } public boolean validatePanel() { @@ -193,11 +193,11 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(opLbl, gbc); - + mCertBox = makeJComboBox("CERTTYPE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.weighty = 1.0; add(mCertBox, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java index 25022bbb9..86eedad78 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java @@ -36,7 +36,7 @@ class WInstallStatusPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLSTATUSWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-installcertstatus-help"; - + WInstallStatusPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -61,13 +61,13 @@ class WInstallStatusPage extends WizardBasePanel implements IWizardPanel { if (wizardInfo.isCertAdded().booleanValue()) mDesc.setText(mResource.getString( "INSTALLSTATUSWIZARD_TEXT_SUCCESS_LABEL")); - else + else mDesc.setText(mResource.getString( "INSTALLSTATUSWIZARD_TEXT_FAIL_LABEL")); setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java index 18c6ef068..549c5aa2b 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java @@ -35,7 +35,7 @@ class WIntroInstallCertPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INTROINSTALLCERTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WIntroInstallCertPage() { super(PANELNAME); init(); @@ -49,7 +49,7 @@ class WIntroInstallCertPage extends WizardBasePanel implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE)) return false; - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java index abcec63f3..116f3a496 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java @@ -35,7 +35,7 @@ class WIntroPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INTROKEYCERTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-introduction-help"; - + WIntroPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -51,7 +51,7 @@ class WIntroPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean isLastPage() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java index 65e02ddd7..3807a1824 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java @@ -36,7 +36,7 @@ class WIssueImportStatusPage extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-selfsignedstatus-help"; private JTextArea desc; - + WIssueImportStatusPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -61,8 +61,8 @@ class WIssueImportStatusPage extends WizardBasePanel implements IWizardPanel { str = mResource.getString( "ISSUEIMPORTSTATUSWIZARD_TEXT_DESC_LABEL"); desc.setText(str); - return true; - } + return true; + } return false; } diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java index 40d601c1d..6c9038ffa 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java @@ -54,7 +54,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { private CertSetupWizardInfo wizardInfo; private static final String HELPINDEX = "configuration-keycert-wizard-key-help"; - + WKeyPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -79,7 +79,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { String title = ""; String certType = wizardInfo.getCertType(); - if (certType.equals(Constants.PR_CA_SIGNING_CERT)) + if (certType.equals(Constants.PR_CA_SIGNING_CERT)) title = mResource.getString("KEYWIZARD_BORDER_CASIGNING_LABEL"); else if (certType.equals(Constants.PR_RA_SIGNING_CERT)) title = mResource.getString("KEYWIZARD_BORDER_RASIGNING_LABEL"); @@ -92,7 +92,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { title = mResource.getString("KEYWIZARD_BORDER_SERVER_LABEL"); else if (certType.equals(Constants.PR_OTHER_CERT)) title = mResource.getString("KEYWIZARD_BORDER_OTHER_LABEL"); - + setBorder(new TitledBorder(title)); if (certType.equals(Constants.PR_OTHER_CERT)) { mNicknamePanel.setVisible(true); @@ -101,7 +101,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (mNicknameBox.getItemCount() <= 0) { String str = wizardInfo.getNicknames(); StringTokenizer tokenizer1 = new StringTokenizer(str, ","); - while (tokenizer1.hasMoreTokens()) { + while (tokenizer1.hasMoreTokens()) { mNicknameBox.addItem((String)tokenizer1.nextToken()); } } @@ -179,7 +179,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { CMSAdminUtil.repaintComp(mNicknameLbl); CMSAdminUtil.repaintComp(mNicknameBox); - return true; + return true; } public boolean validatePanel() { @@ -208,7 +208,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (str.equals("")) { setErrorMessage("BLANKCURVE"); return false; - } + } }*/ return true; @@ -232,11 +232,11 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (val.equals("Custom")) { if (mKeyCurveBox.isVisible()) { // ECC - wizardInfo.addEntry(Constants.PR_KEY_CURVENAME, + wizardInfo.addEntry(Constants.PR_KEY_CURVENAME, mKeyCurveText.getText().trim()); nvps.put(Constants.PR_KEY_CURVENAME, mKeyCurveText.getText().trim()); } else { - wizardInfo.addEntry(Constants.PR_KEY_LENGTH, + wizardInfo.addEntry(Constants.PR_KEY_LENGTH, mKeyLengthText.getText().trim()); nvps.put(Constants.PR_KEY_LENGTH, mKeyLengthText.getText().trim()); } @@ -249,7 +249,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { nvps.put(Constants.PR_KEY_LENGTH, val.trim()); } } - + if (mKeyTypeBox.isVisible()) { wizardInfo.addEntry(Constants.PR_KEY_TYPE, (String)mKeyTypeBox.getSelectedItem()); @@ -285,13 +285,13 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { nvps.put(Constants.PR_NICKNAME, nicknameStr); response = connection.process( DestDef.DEST_SERVER_ADMIN, - ScopeDef.SC_SUBJECT_NAME, + ScopeDef.SC_SUBJECT_NAME, wizardInfo.getCertType(), nvps); wizardInfo.addEntry(Constants.PR_NICKNAME, nicknameStr); } else { response = connection.read( DestDef.DEST_SERVER_ADMIN, - ScopeDef.SC_SUBJECT_NAME, + ScopeDef.SC_SUBJECT_NAME, wizardInfo.getCertType(), nvps); } @@ -301,13 +301,13 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (mNewKeyBtn.isSelected()) { String tokenName = (String)mTokenBox.getSelectedItem(); - if (tokenName.equals("internal")) + if (tokenName.equals("internal")) tokenName = Constants.PR_INTERNAL_TOKEN_NAME; nvps.clear(); nvps.put(Constants.PR_TOKEN_NAME, tokenName); response = connection.process(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_TOKEN_STATUS, Constants.RS_ID_CONFIG, nvps); - + String value = response.get(Constants.PR_LOGGED_IN); wizardInfo.addEntry(Constants.PR_LOGGED_IN, value); wizardInfo.addEntry(Constants.PR_TOKEN_NAME, tokenName); @@ -342,7 +342,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(panel, gbc); - + JTextArea selectTokenLbl = createTextArea(mResource.getString( PANELNAME+"_LABEL_SELECTTOKEN_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -350,7 +350,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,0); panel.add(selectTokenLbl, gbc); - + mTokenLbl = makeJLabel("TOKEN"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.CENTER; @@ -386,7 +386,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.gridwidth = gbc.REMAINDER; add(createKeyLbl, gbc); - mExistingKeyBtn = makeJRadioButton("OLDKEY", true); + mExistingKeyBtn = makeJRadioButton("OLDKEY", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; @@ -403,7 +403,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, - COMPONENT_SPACE, COMPONENT_SPACE); + COMPONENT_SPACE, COMPONENT_SPACE); gbc.fill = gbc.BOTH; gbc.weightx = 1.0; add(mNicknamePanel, gbc); @@ -704,18 +704,18 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { public void itemStateChanged(ItemEvent e) { if (e.getSource().equals(mKeyLengthBox) || - e.getSource().equals(mKeyCurveBox) || + e.getSource().equals(mKeyCurveBox) || e.getSource().equals(mDSAKeyLengthBox)) { enableKeyLengthFields(); - } else if (e.getSource().equals(mKeyTypeBox) || + } else if (e.getSource().equals(mKeyTypeBox) || e.getSource().equals(mDSAKeyTypeBox)) { String type = ""; if (mKeyTypeBox.isVisible()) type = (String)mKeyTypeBox.getSelectedItem(); else if (mDSAKeyTypeBox.isVisible()) type = (String)mDSAKeyTypeBox.getSelectedItem(); - - setLengthCurveFields(type); + + setLengthCurveFields(type); enableKeyLengthFields(); CMSAdminUtil.repaintComp(this); } @@ -723,10 +723,10 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { private void enableKeyLengthFields() { String value = ""; - + if (mKeyLengthBox.isVisible()) value = (String)mKeyLengthBox.getSelectedItem(); - else if (mKeyCurveBox.isVisible()) + else if (mKeyCurveBox.isVisible()) value = (String)mKeyCurveBox.getSelectedItem(); else value = (String)mDSAKeyLengthBox.getSelectedItem(); @@ -750,7 +750,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { } } - protected void enableFields(JComponent comp1, JTextComponent comp2, + protected void enableFields(JComponent comp1, JTextComponent comp2, boolean enable, Color color) { if (comp1 != null) { comp1.setEnabled(enable); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java index 4ad069133..ebbbd6be2 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java @@ -50,7 +50,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza private static final String PANELNAME = "MANUALCERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-displaycertrequest-help"; - + WManualCertRequestPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -70,7 +70,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; - + if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE) || wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) return false; @@ -120,7 +120,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza if (port != null && !port.equals("")) mPortText.setText(port); - return true; + return true; } public boolean validatePanel() { @@ -135,7 +135,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza if (mHost != null && !mHost.equals("")) wizardInfo.setCMHost(mHost); if (mPort != null && !mPort.equals("")) - wizardInfo.setCMEEPort(mPort); + wizardInfo.setCMEEPort(mPort); if (mSSL.isSelected()) wizardInfo.setCMEEType("https"); else diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java index f2cdeff3d..c9d867466 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java @@ -78,7 +78,7 @@ class WOperationSelectionPage extends WizardBasePanel implements IWizardPanel { startProgressStatus(); if (mRequestBtn.isSelected()) info.addEntry(wizardInfo.OPTYPE, wizardInfo.REQUESTTYPE); - else + else info.addEntry(wizardInfo.OPTYPE, wizardInfo.INSTALLTYPE); endProgressStatus(); return true; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java index 1dbd614d1..aa4b32ff1 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java @@ -40,7 +40,7 @@ class WOtherCertRequest1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CACERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WOtherCertRequest1Page() { super(PANELNAME); init(); @@ -59,7 +59,7 @@ class WOtherCertRequest1Page extends WizardBasePanel implements IWizardPanel { if (type.equals(Constants.PR_CA_SIGNING_CERT)) return false; - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java index 50e14a50e..65aca8241 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java @@ -27,8 +27,8 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This page is to install the certificate in the internal token. The user can - * import the cert from the file or paste the Base 64 encoded blob in the + * This page is to install the certificate in the internal token. The user can + * import the cert from the file or paste the Base 64 encoded blob in the * text area. * * @author Christine Ho @@ -48,7 +48,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "PASTECERTWIZARD"; private static final String HELPINDEX = "configuration-keycert-wizard-pastecert-help"; - + WPasteCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -71,7 +71,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE)) return false; setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { @@ -114,7 +114,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { NameValuePairs response = connection.process( DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_CERTINFO, wizardInfo.getInstallCertType(), nvps); - + for (String name : response.keySet()) { String str = response.get(name); wizardInfo.addEntry(name, str); @@ -198,7 +198,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { mBase64Text = new JTextArea(null, null, 0, 0); Font f = new Font("Monospaced", Font.PLAIN, 12); if (f != null) mBase64Text.setFont(f); - JScrollPane scrollPane = new JScrollPane(mBase64Text, + JScrollPane scrollPane = new JScrollPane(mBase64Text, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); scrollPane.setPreferredSize(new Dimension(50, 20)); @@ -206,7 +206,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.weighty = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, 0, + gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, 0, COMPONENT_SPACE); gbc.fill = gbc.BOTH; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java index 616deb74f..e18488696 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java @@ -37,7 +37,7 @@ class WRAKeyPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "RAKEYWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WRAKeyPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WRAKeyPage extends WBaseKeyPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java index a52def44a..124a819d6 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java @@ -37,9 +37,9 @@ class WRequestStatusPage extends WizardBasePanel implements IWizardPanel { private static final String HELPINDEX = "configuration-keycert-wizard-certrequeststatus-help"; protected JTextArea mDesc; - + protected String mRequestId; - + WRequestStatusPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -78,15 +78,15 @@ class WRequestStatusPage extends WizardBasePanel implements IWizardPanel { mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_REJECT_LABEL") + error + "\n\n"+ mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str + mResource.getString("REQUESTRESULTWIZARD_TEXT_REJECTEND_LABEL")); } else { // success - mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + - mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str + + mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + + mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str + mResource.getString("REQUESTRESULTWIZARD_TEXT_END_LABEL")); } } else if (error != null) mDesc.setText(error); else - mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + + mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") + mResource.getString("REQUESTRESULTWIZARD_TEXT_NOID_LABEL")); } return true; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java index 7065f68b6..36c626751 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java @@ -37,7 +37,7 @@ class WSSLKeyPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "SSLKEYWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WSSLKeyPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WSSLKeyPage extends WBaseKeyPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java index 53a623d0a..b1fd2031c 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java @@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*; import com.netscape.certsrv.common.*; /** - * This panel asks for the user to logon to the keycert token . + * This panel asks for the user to logon to the keycert token . * * @author Christine Ho * @version $Revision$, $Date$ @@ -69,7 +69,7 @@ class WTokenLogonPage extends WizardBasePanel implements IWizardPanel { mDesc.setText(mResource.getString(mPanelName+"_TEXT_HEADING_LABEL")); mTokenNameText.setText(wizardInfo.getTokenName()); - return true; + return true; } public boolean validatePanel() { @@ -154,7 +154,7 @@ class WTokenLogonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(passwordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java index b595e1ffd..4f5f7c6de 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java @@ -67,7 +67,7 @@ class WTokenSelectionPage extends WizardBasePanel implements IWizardPanel { info.addEntry(wizardInfo.TOKENNAME, (String)mToken.getSelectedItem()); if (mRequestBtn.isSelected()) info.addEntry(wizardInfo.OPTYPE, wizardInfo.REQUESTTYPE); - else + else info.addEntry(wizardInfo.OPTYPE, wizardInfo.INSTALLTYPE); return true; } @@ -138,7 +138,7 @@ class WTokenSelectionPage extends WizardBasePanel implements IWizardPanel { gbc.weightx = 1.0; gbc.fill = gbc.NONE; gbc.weighty = 0.0; - gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mToken, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java index be844576c..d2e0b3c58 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java @@ -38,7 +38,7 @@ class WWarningExecute1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "WARNINGEXECUTE1WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WWarningExecute1Page() { super(PANELNAME); init(); @@ -51,12 +51,12 @@ class WWarningExecute1Page extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && - wizardInfo.isNewKey() && + wizardInfo.isNewKey() && wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) && wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA)) return true; - - return false; + + return false; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java index a64f67188..a0559f6fb 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java @@ -38,7 +38,7 @@ class WWarningExecutePage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "WARNINGEXECUTEWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WWarningExecutePage() { super(PANELNAME); init(); @@ -51,12 +51,12 @@ class WWarningExecutePage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && - wizardInfo.isNewKey() && + wizardInfo.isNewKey() && wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) && wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED)) return true; - - return false; + + return false; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java index 7a4eabe57..c20cbb8ea 100644 --- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java +++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java @@ -38,7 +38,7 @@ class WWarningPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "WARNINGWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WWarningPage() { super(PANELNAME); init(); @@ -52,11 +52,11 @@ class WWarningPage extends WizardBasePanel implements IWizardPanel { CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info; if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) && - wizardInfo.isNewKey() && + wizardInfo.isNewKey() && wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) return true; - - return false; + + return false; } public boolean validatePanel() { |