diff options
Diffstat (limited to 'base/console/src/com/netscape/admin/certsrv/config/install')
114 files changed, 562 insertions, 562 deletions
diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java index 557dc2739..e59da68f5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java @@ -33,7 +33,7 @@ import com.netscape.admin.certsrv.wizard.*; public class InstallWizard extends WizardWidget implements Runnable { - public InstallWizard(JFrame parent, InstallWizardInfo info, + public InstallWizard(JFrame parent, InstallWizardInfo info, IWizardDone wizDone) { super(parent, wizDone); setWizardInfo(info); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java index a88101cc4..aa639ecb3 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java @@ -72,7 +72,7 @@ public class InstallWizardInfo extends WizardInfo { public InstallWizardInfo(ConsoleInfo consoleInfo) { super(); - mConsoleInfo = consoleInfo; + mConsoleInfo = consoleInfo; } public JFrame getAdminFrame() { @@ -85,7 +85,7 @@ public class InstallWizardInfo extends WizardInfo { return true; else return false; - + } public void setAdminFrame(JFrame frame) { @@ -102,7 +102,7 @@ public class InstallWizardInfo extends WizardInfo { public String getCloneCertsList() { String s = (String)get(ConfigConstants.PR_CLONE_CERTIFICATES); - if (s == null || s.equals("")) + if (s == null || s.equals("")) return " "; return s; } @@ -120,7 +120,7 @@ public class InstallWizardInfo extends WizardInfo { public boolean isCACloningDone() { String str = (String)get(ConfigConstants.STAGE_CACLONING); - + if (str != null && str.equals(ConfigConstants.TRUE)) return true; else @@ -133,9 +133,9 @@ public class InstallWizardInfo extends WizardInfo { public boolean isOCSPCloningDone() { String str = (String)get(ConfigConstants.STAGE_OCSPCLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; - + return false; } @@ -145,27 +145,27 @@ public class InstallWizardInfo extends WizardInfo { public boolean isRACloningDone() { String str = (String)get(ConfigConstants.STAGE_RACLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; - + return false; } - + public void setRACloningDone(String str) { put(ConfigConstants.STAGE_RACLONING, str); } public boolean isKRACloningDone() { String str = (String)get(ConfigConstants.STAGE_KRACLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; - + return false; } public boolean isTKSCloningDone() { String str = (String)get(ConfigConstants.STAGE_TKSCLONING); - if (str != null && str.equals(ConfigConstants.TRUE)) + if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; @@ -248,9 +248,9 @@ public class InstallWizardInfo extends WizardInfo { public boolean isAdministratorDone() { String str = (String)get(ConfigConstants.STAGE_SETUP_ADMINISTRATOR); - if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) + if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) return false; - + return true; } @@ -281,7 +281,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isRACertRequestBack() { String str = (String)get(ConfigConstants.RA_CERT_REQUEST_BACK); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -295,35 +295,35 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isKRACertRequestBack() { String str = (String)get(ConfigConstants.KRA_CERT_REQUEST_BACK); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isSSLCertRequestBack() { String str = (String)get(ConfigConstants.SSL_CERT_REQUEST_BACK); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isSelfSignedCACertDone() { String str = (String)get(ConfigConstants.STAGE_CA_SELFSIGNED_CERT); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isCACertRequestDone() { String str = (String)get(ConfigConstants.STAGE_CA_CERT_REQUEST); if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; } - + public boolean isCACertInstalledDone() { String str = (String)get(ConfigConstants.STAGE_CA_CERT_INSTALL); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -375,7 +375,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isOCSPLocalCertDone() { String str = (String)get(ConfigConstants.STAGE_OCSP_LOCAL_CERT); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -389,7 +389,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public boolean isOCSPCertInstalledDone() { String str = (String)get(ConfigConstants.STAGE_OCSP_CERT_INSTALL); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -531,7 +531,7 @@ public class InstallWizardInfo extends WizardInfo { if (str != null && str.equals(ConfigConstants.TRUE)) return true; return false; - } + } public String getSingleSignOnPassword() { return mPassword; @@ -629,7 +629,7 @@ public class InstallWizardInfo extends WizardInfo { val = "8001"; return val; } - + public void setEESecurePort(String port) { put(ConfigConstants.PR_EE_SECURE_PORT, port); } @@ -651,7 +651,7 @@ public class InstallWizardInfo extends WizardInfo { return true; return false; } - + public void setEEEnable(String enable) { put(ConfigConstants.PR_EE_PORT_ENABLE, enable); } @@ -835,7 +835,7 @@ public class InstallWizardInfo extends WizardInfo { public String getKeyCurveName() { String val = (String)get(ConfigConstants.PR_KEY_CURVENAME); - if (val ==null) + if (val ==null) val = "nistp521"; return val; } @@ -847,7 +847,7 @@ public class InstallWizardInfo extends WizardInfo { public String getKeyType() { String type = (String)get(ConfigConstants.PR_KEY_TYPE); // work around the historical mistake, - // not touching files around the places. + // not touching files around the places. if ( type == null || type.equals("")) { String certType = getCertType(); if (certType.equals(Constants.PR_CA_SIGNING_CERT)) { @@ -1214,7 +1214,7 @@ public class InstallWizardInfo extends WizardInfo { public void setInstalledKRA(String val) { put(ConfigConstants.PR_KRA, val); } - + public void setInstalledTKS(String val) { put(ConfigConstants.PR_TKS, val); } @@ -1403,7 +1403,7 @@ public class InstallWizardInfo extends WizardInfo { public void setTotalAgents(String val) { put(ConfigConstants.PR_AGENT_N, val); } - + public String getTotalAgents() { return (String)get(ConfigConstants.PR_AGENT_N); } @@ -1603,7 +1603,7 @@ public class InstallWizardInfo extends WizardInfo { public String getEndRequestNumber() { return (String)get(ConfigConstants.PR_ENDREQUEST_NUMBER); } - + public boolean isCloning() { String str = (String)get("cloning"); if (str != null && str.equals(ConfigConstants.TRUE)) @@ -1692,21 +1692,21 @@ public class InstallWizardInfo extends WizardInfo { return false; return true; } - + public boolean isRACertRequestSucc() { String str = (String)get(ConfigConstants.STAGE_RA_REQ_SUCCESS); if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) return false; return true; } - + public boolean isKRACertRequestSucc() { String str = (String)get(ConfigConstants.STAGE_KRA_REQ_SUCCESS); if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) return false; return true; } - + public boolean isSSLCertRequestSucc() { String str = (String)get(ConfigConstants.STAGE_SSL_REQ_SUCCESS); if (str == null || str.equals("") || str.equals(ConfigConstants.FALSE)) diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java index 467632102..4d1681477 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java @@ -36,12 +36,12 @@ import com.netscape.management.client.console.*; */ class WIAdminPage extends WizardBasePanel implements IWizardPanel { private JCheckBox mEnable; - private JTextField mIDText, mFullNameText, mPasswordText, + private JTextField mIDText, mFullNameText, mPasswordText, mPasswordAgainText; private static final String PANELNAME = "ADMININSTALLWIZARD"; private static final String HELPINDEX = "install-administrator-configuration-wizard-help"; - + WIAdminPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -68,12 +68,12 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isAdministratorDone()) return false; - mIDText.setText(wizardInfo.getCertAdminUid()); + mIDText.setText(wizardInfo.getCertAdminUid()); mFullNameText.setText(wizardInfo.getCertAdminName()); setBorder(makeTitledBorder(PANELNAME)); - - return true; + + return true; } public boolean validatePanel() { @@ -83,22 +83,22 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { setErrorMessage("BLANKPASSWD"); return false; } - + if (!password.equals(passwordAgain)) { setErrorMessage("NOTSAMEPASSWD"); return false; } - + if (mIDText.getText().trim().equals("")) { setErrorMessage("BLANKADMINID"); return false; } - - if (mFullNameText.getText().trim().equals("")) { + + if (mFullNameText.getText().trim().equals("")) { setErrorMessage("BLANKADMINNAME"); return false; } - + return true; } @@ -111,9 +111,9 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+ConfigConstants.PR_CERT_ADMINNAME+"="+mFullNameText.getText(); rawData = rawData+"&"+ConfigConstants.PR_CERT_ADMINPASSWD+"="+mPasswordAgainText.getText(); if (mEnable.isSelected()) { - rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=true"; + rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=true"; } else { - rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=false"; + rawData = rawData+"&"+ConfigConstants.PR_ENABLE+"=false"; } if (wizardInfo.getInternalDBPasswd() != null) rawData = rawData+"&"+ConfigConstants.PR_DB_PWD+"="+wizardInfo.getInternalDBPasswd(); @@ -155,7 +155,7 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(desc, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel idLbl = makeJLabel("ADMINID"); gbc.anchor = gbc.NORTHEAST; @@ -163,7 +163,7 @@ class WIAdminPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(idLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mIDText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java index b84460814..a9994a159 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java @@ -40,7 +40,7 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "ALLCERTSINSTALLEDWIZARD"; private static final String HELPINDEX = "install-allcerts-getinstalled-wizard-help"; - + WIAllCertsInstalledPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -77,7 +77,7 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { } } } - } + } else if (wizardInfo.isRAInstalled() && wizardInfo.isKRAInstalled()) { if (raCertInstalled(wizardInfo) && kraCertInstalled(wizardInfo)) @@ -148,8 +148,8 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { } setBorder(makeTitledBorder(PANELNAME)); mLabel.setVisible(false); - - return true; + + return true; } private boolean caCertInstalled(InstallWizardInfo wizardInfo) { @@ -202,8 +202,8 @@ class WIAllCertsInstalledPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_READ; // #344791 - help server to make up the hostname /* - data.put(ConfigConstants.PR_HOST, - consoleInfo.get(ConfigConstants.PR_HOST)); + data.put(ConfigConstants.PR_HOST, + consoleInfo.get(ConfigConstants.PR_HOST)); */ startProgressStatus(); boolean ready = send(rawData, wizardInfo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java index 6f8c26032..65264ab7f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java @@ -37,7 +37,7 @@ class WICACert1CustomPage extends WBaseKeyPage implements IWizardPanel { private static final String PANELNAME = "CACERT1CUSTOMWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACert1CustomPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WICACert1CustomPage 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/config/install/WICACert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java index c3ca75420..8b511ced5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java @@ -37,18 +37,18 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { private JComboBox mKeyLengthBox; //private JComboBox mTokenBox; //private JPasswordField mPasswordText; - + private static final String PANELNAME = "CACERT1WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACert1Page() { super(PANELNAME); init(); } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean isLastPage() { @@ -83,7 +83,7 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(desc, gbc); - + /* JTextArea desc1 = createTextArea( CMSAdminUtil.wrapText(mResource.getString( @@ -117,7 +117,7 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,0, + gbc.insets = new Insets(COMPONENT_SPACE,0, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(dummy, gbc); @@ -161,15 +161,15 @@ class WICACert1Page extends WizardBasePanel implements IWizardPanel { CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); panel.add(keyTypeLbl, gbc); - + mKeyTypeBox = makeJComboBox("KEYTYPE"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); gbc.fill = gbc.NONE; panel.add(mKeyTypeBox, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java index 79fc00b02..dce6afad5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java @@ -37,7 +37,7 @@ class WICACert2Page extends WBaseDNPage implements IWizardPanel { private static final String PANELNAME = "CACERT2WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACert2Page() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WICACert2Page extends WBaseDNPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java index 531de6be5..f224cb59e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for CA signing certificate + * Subject DN page for CA signing certificate * * @author Christine Ho * @version $Revision$, $Date$ diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java index 1a1a1a8b9..b1faf554a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java @@ -69,7 +69,7 @@ class WICACertExtensionPage extends WICertExtensionPage { mExtendedKeyCheckBox.setSelected(false); mKeyUsageBox.setSelected(true); } - + if (wizardInfo.isCAInstalled() && wizardInfo.isKRAInstalled()) mHelpIndex = CAKRAHELPINDEX; else diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java index b962c6ca1..e92122bbf 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java @@ -39,7 +39,7 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CACERTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICACertPage() { super(PANELNAME); init(); @@ -50,7 +50,7 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -94,12 +94,12 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { mSubordinateBtn = makeJRadioButton("SUBORDINATE", false); CMSAdminUtil.resetGBC(gbc); gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSubordinateBtn, gbc); - JTextArea desc1 = createTextArea( + JTextArea desc1 = createTextArea( CMSAdminUtil.wrapText(mResource.getString( "CACERTWIZARD_TEXT_HEADING1_LABEL"), 80), 2, 80); CMSAdminUtil.resetGBC(gbc); @@ -132,7 +132,7 @@ class WICACertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, 0, COMPONENT_SPACE); add(mUrlBtn, gbc); - + mUrlText = makeJTextField(30); CMSAdminUtil.resetGBC(gbc); gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java index efa2d8b0c..299f5947b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java @@ -55,8 +55,8 @@ class WICACertSubmitPage extends WICertSubmitPage implements IWizardPanel { if (wizardInfo.isCloning() && wizardInfo.isCACloningDone()) return false; - - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_CA_SIGNING_CERT); if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java index cb8fa550d..3948c908f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java @@ -38,7 +38,7 @@ class WICACertValidityPage extends WICertValidityPage { private static final String PANELNAME = "INSTALLCACERTVALIDWIZARD"; private static final String CAHELPINDEX = "install-cacert-validity-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakracert-validity-wizard-help"; - + WICACertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java index accc866b2..8c413ca01 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java @@ -82,10 +82,10 @@ class WICAKeyPage extends WIKeyPage implements IWizardPanel { int counts = mKeyTypeBox.getItemCount(); if (counts == 1) - mKeyTypeBox.addItem("DSA"); + mKeyTypeBox.addItem("DSA"); if (mWizardInfo.isCAInstalled() && mWizardInfo.isKRAInstalled()) { - if (mWizardInfo.isCACertLocalCA()) + if (mWizardInfo.isCACertLocalCA()) mHelpIndex = CAKRALOCALHELPINDEX; else mHelpIndex = CAKRAREMOTEHELPINDEX; @@ -102,7 +102,7 @@ class WICAKeyPage extends WIKeyPage implements IWizardPanel { public void getUpdateInfo(WizardInfo info) { super.getUpdateInfo(info); mWizardInfo.setCATokenName(mWizardInfo.getTokenName()); - + if (mPassword.isEditable()) { String tokenname = mWizardInfo.getCATokenName(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java index e19fc6586..bfe1e595f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WICAMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLCAMESSAGEDIGESTWIZARD"; WICAMessageDigestPage(JDialog parent) { @@ -67,12 +67,12 @@ class WICAMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java index 9245b14bf..d2f810414 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java @@ -67,7 +67,7 @@ class WICAOCSPServicePage extends WizardBasePanel implements IWizardPanel { String serial; InstallWizardInfo wizardInfo = (InstallWizardInfo)info; setBorder(makeTitledBorder(PANELNAME)); - // If ca's signing cert is not generated, + // If ca's signing cert is not generated, // we allow "back" to modify the panel if (!wizardInfo.isCAInstalled()) return false; @@ -78,10 +78,10 @@ class WICAOCSPServicePage extends WizardBasePanel implements IWizardPanel { mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL")); - return true; + return true; } - public boolean validatePanel() + public boolean validatePanel() { mEnable = mOCSPServiceCB.isSelected(); return true; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java index 3b1653d7f..19295344c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java @@ -45,15 +45,15 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { private String mEndSerialNumber = null; private JTextField mEndSerialNumberText; private JLabel mEndSerialNumberLabel; - + private String mbeginRequestNumber; private JTextField mbeginRequestNumberText; private JLabel mbeginRequestNumberLabel; - + private String mEndRequestNumber = null; private JTextField mEndRequestNumberText; private JLabel mEndRequestNumberLabel; - + private static final String DEFAULT_SERIAL_NUMBER = "1"; private static final String PANELNAME = "CASERIALNUMBERWIZARD"; private static final String HELPINDEX = @@ -80,9 +80,9 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { String serial; InstallWizardInfo wizardInfo = (InstallWizardInfo)info; setBorder(makeTitledBorder(PANELNAME)); - // If ca's signing cert is not generated, + // If ca's signing cert is not generated, // we allow "back" to modify the panel - + if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone() ||wizardInfo.isNumberPageDone()) @@ -91,7 +91,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { if (wizardInfo.isCloning()) mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL") + mResource.getString(PANELNAME+"_TEXT_MORE_LABEL")); - else + else mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL")); @@ -104,14 +104,14 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { mbeginRequestNumberText.setText(serial); else mbeginRequestNumberText.setText(DEFAULT_SERIAL_NUMBER); - + if ((serial = wizardInfo.getCAEndSerialNumber()) != null) mEndSerialNumberText.setText(serial); if ((serial = wizardInfo.getEndRequestNumber()) != null) mEndRequestNumberText.setText(serial); - - return true; + + return true; } private String hexToDecimal(String hex, boolean isHex) @@ -191,7 +191,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { else mEndRequestNumber = ""; } - + if (num != null && endNum != null && num.compareTo(endNum) > 0) { setErrorMessage("Ending number must be greater than starting number."); return false; @@ -210,13 +210,13 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) wizardInfo.setCASerialNumber(mSerialNumber); else { wizardInfo.setCASerialNumber(DEFAULT_SERIAL_NUMBER); mSerialNumber = DEFAULT_SERIAL_NUMBER; } - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) wizardInfo.setRequestNumber(mbeginRequestNumber); else { wizardInfo.setRequestNumber(DEFAULT_SERIAL_NUMBER); @@ -225,16 +225,16 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { String rawData = ConfigConstants.TASKID+"="+TaskId.TASK_SET_CA_SERIAL; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_SERIAL_NUMBER+"="+ mSerialNumber; - if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) + if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_ENDSERIAL_NUMBER+"="+ mEndSerialNumber; - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_REQUEST_NUMBER+"="+ mbeginRequestNumber; - if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) + if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_ENDREQUEST_NUMBER+"="+ mEndRequestNumber; if (wizardInfo.getInternalDBPasswd() != null) @@ -322,7 +322,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mbeginRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -331,7 +331,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberLabel = makeJLabel("ENDREQUESTNUMBER"); gbc.anchor = gbc.EAST; @@ -339,7 +339,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -348,7 +348,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); mSerialNumberLabel = makeJLabel("PWD"); @@ -357,7 +357,7 @@ class WICASerialNumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mSerialNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mSerialNumberText = makeJSerialNumberField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java index cf7e623ad..f541a0389 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java @@ -66,7 +66,7 @@ class WICertDNPage extends WBaseDNPage { populateDN(str); */ - return true; + return true; } public boolean validatePanel() { @@ -84,7 +84,7 @@ class WICertDNPage extends WBaseDNPage { } else { str = str2; } - + if (str.equals("")) { setErrorMessage("BLANKFIELD"); return false; @@ -123,7 +123,7 @@ class WICertDNPage extends WBaseDNPage { 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/config/install/WICertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java index 8c989685a..f44b1a3ec 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java @@ -29,10 +29,10 @@ import com.netscape.admin.certsrv.config.*; * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.config.install */ -class WICertExtensionPage extends WBaseCertExtensionPage implements +class WICertExtensionPage extends WBaseCertExtensionPage implements IWizardPanel { protected String mHelpIndex; - + WICertExtensionPage(String panelName) { super(panelName); mPanelName = panelName; @@ -45,7 +45,7 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(mPanelName)); - return super.initializePanel(info); + return super.initializePanel(info); } public boolean concludePanel(WizardInfo info) { @@ -60,7 +60,7 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements rawData = rawData+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; rawData = rawData+ConfigConstants.PR_CERTIFICATE_EXTENSION+"="+ mMIMEText.getText().trim(); - + startProgressStatus(); ready = send(rawData, wizardInfo); endProgressStatus(); @@ -105,14 +105,14 @@ class WICertExtensionPage extends WBaseCertExtensionPage implements if (mMIMECheckBox.isSelected()) nvps.put(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim()); - wizardInfo.put(wizardInfo.ALL_CERT_INFO, nvps); + wizardInfo.put(wizardInfo.ALL_CERT_INFO, nvps); } mModified = true; return ready; } - private void addValidityPeriod(InstallWizardInfo wizardInfo, + private void addValidityPeriod(InstallWizardInfo wizardInfo, NameValuePairs nvps) { nvps.put(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear()); nvps.put(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth()); @@ -143,7 +143,7 @@ class WICertExtensionPage 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/config/install/WICertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java index d4926e1e9..c891c1a0a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java @@ -38,7 +38,7 @@ class WICertRequestPage extends WBaseCertRequestPage implements IWizardPanel { private static final String PANELNAME = "CERTREQUESTWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WICertRequestPage() { super(PANELNAME); init(); @@ -49,7 +49,7 @@ class WICertRequestPage extends WBaseCertRequestPage implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java index ff9ca97a6..eaa52c6a4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java @@ -80,7 +80,7 @@ class WICertSetupStatusPage extends WizardBasePanel implements IWizardPanel { desc.setText(mResource.getString( "INSTALLCONFIGSTATUSWIZARD_OCSPTEXT_DESC_LABEL")); } else if (wizardInfo.isRAInstalled()) { - if (wizardInfo.isKRAInstalled()) + if (wizardInfo.isKRAInstalled()) desc.setText(mResource.getString( "INSTALLCONFIGSTATUSWIZARD_RAKRATEXT_DESC_LABEL")); else @@ -98,7 +98,7 @@ class WICertSetupStatusPage extends WizardBasePanel implements IWizardPanel { CMSAdmin admin = (CMSAdmin)wizardInfo.get("CMSAdmin"); IPage viewInstance = (IPage)wizardInfo.get("viewInstance"); - if (viewInstance != null) + if (viewInstance != null) admin.updateMenu(viewInstance); return true; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java index 18beac219..3fcd127fc 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java @@ -42,7 +42,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { protected String mHelpIndex; private String mPanelName; protected InstallWizardInfo mWizardInfo; - + WICertSubmitPage(String panelName) { super(panelName); mPanelName = panelName; @@ -57,13 +57,13 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { setBorder(makeTitledBorder(mPanelName)); mWizardInfo = (InstallWizardInfo)info; if (!mWizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) { - if (mWizardInfo.isCACertRequestDone() && + if (mWizardInfo.isCACertRequestDone() && !mWizardInfo.isCACertInstalledDone()) { mSubordinateButton.setSelected(true); mSelfButton.setSelected(false); } } - return true; + return true; } public boolean validatePanel() { @@ -88,7 +88,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { mPanelName+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mLabel, gbc); @@ -96,7 +96,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { mSelfButton = makeJRadioButton("SELF", true); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSelfButton, gbc); @@ -104,7 +104,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { mSubordinateButton = makeJRadioButton("SUB", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mSubordinateButton, gbc); @@ -129,7 +129,7 @@ class WICertSubmitPage extends WizardBasePanel implements IWizardPanel { public void actionPerformed(ActionEvent e) { if (!mWizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT)) { if (e.getSource().equals(mSelfButton)) { - if (mWizardInfo.isCACertRequestDone() && + if (mWizardInfo.isCACertRequestDone() && !mWizardInfo.isCACertInstalledDone()) { String errorMsg = mResource.getString(mPanelName+"_LABEL_INCOMPLETE_LABEL"); JOptionPane.showMessageDialog(mParent, errorMsg, "Warning", diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java index 8f2acd493..477fed1ae 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.console.*; class WICertValidityPage extends WBaseValidityPage implements IWizardPanel { private String mPanelName; protected String mHelpIndex; - + WICertValidityPage(String panelName) { super(panelName); mPanelName = panelName; @@ -111,7 +111,7 @@ class WICertValidityPage extends WBaseValidityPage implements IWizardPanel { setErrorMessage(mResource.getString(mPanelName+"_ERROR1")); return false; } - } else + } else setErrorMessage(str); return ready; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java index d5722df32..8f2ee32af 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mCANicknameBox, mOCSPNicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONECAKEYCERTWIZARD"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "install-cacertclone-wizard-help"; - + WICloneCAKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -77,8 +77,8 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isCACloningDone()) return false; - if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() - || wizardInfo.isSelfSignedCACertDone() + if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() + || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone()) return false; @@ -116,7 +116,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { mOCSPNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { @@ -195,7 +195,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(heading, gbc); @@ -207,7 +207,7 @@ class WICloneCAKeyCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(caNicknameLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mCANicknameBox = new JComboBox(); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java index bea79b2e0..e32c367a2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mKRANicknameBox, mStorageNicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONEKRAKEYCERTWIZARD"; - private static final String KRAHELPINDEX = + private static final String KRAHELPINDEX = "install-kracertclone-wizard-help"; - + WICloneKRAKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -117,7 +117,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { mKRANicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { @@ -196,7 +196,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(heading, gbc); @@ -208,7 +208,7 @@ class WICloneKRAKeyCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(kraNicknameLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mKRANicknameBox = new JComboBox(); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java index c8498f306..f67253173 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java @@ -140,9 +140,9 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { Debug.println("WICloneMasterPage: in concludePanel"); InstallWizardInfo wizardInfo = (InstallWizardInfo)info; wizardInfo.setCLAHost(mHost); - wizardInfo.setCLAPort(mPort); - wizardInfo.setCLAPortEE(mPortEE); - wizardInfo.setCLATimeout(mTimeout); + wizardInfo.setCLAPort(mPort); + wizardInfo.setCLAPortEE(mPortEE); + wizardInfo.setCLATimeout(mTimeout); ConsoleInfo consoleInfo = wizardInfo.getAdminConsoleInfo(); CMSConfigCert configCertCgi = new CMSConfigCert(); configCertCgi.initialize(wizardInfo); @@ -202,7 +202,7 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.CLA_TIMEOUT, wizardInfo.getCLATimeout()); data.put(ConfigConstants.CLONE_CA, ConfigConstants.TRUE); - } else { + } else { Debug.println("WICloneMasterPage: Cloning page yes NOT selected"); // admin will have to manually add if not through wizard } @@ -214,7 +214,7 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONFIGDB"); boolean ready = configCertCgi.configCert(data); dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -354,7 +354,7 @@ class WICloneMasterPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(mTimeunitLbl, gbc); */ - + JLabel label = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java index 9061b5f7a..94aee9a08 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneOCSPKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mOCSPNicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONEOCSPKEYCERTWIZARD"; - private static final String OCSPHELPINDEX = + private static final String OCSPHELPINDEX = "install-ocspcertclone-wizard-help"; - + WICloneOCSPKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -100,7 +100,7 @@ class WICloneOCSPKeyCertPage extends WizardBasePanel implements IWizardPanel { mOCSPNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java index cdfa23199..56d903852 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java @@ -40,7 +40,7 @@ class WIClonePage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "CLONEINSTALLWIZARD"; private static final String HELPINDEX = "install-general-intro-wizard-help"; - + WIClonePage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -61,14 +61,14 @@ class WIClonePage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; setBorder(makeTitledBorder(PANELNAME)); - + if //(wizardInfo.isKRACertLocalCA() || !wizardInfo.isInstallCertNow() || (!wizardInfo.isCloning()||wizardInfo.isClonePageDone()) return false; - + mAdminFrame = wizardInfo.getAdminFrame(); - return true; + return true; } public boolean validatePanel() { @@ -88,9 +88,9 @@ class WIClonePage extends WizardBasePanel implements IWizardPanel { boolean ready = send(rawData, wizardInfo); Debug.println("WIClonePage:concludePanel() 2"); - + endProgressStatus(); - + if (!ready) { String str = getErrorMessage(wizardInfo); if (str == null) diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java index 7194ee3cc..63cffdea0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java @@ -41,10 +41,10 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mRANicknameBox, mSSLNicknameBox; private static final String PANELNAME = "CLONERAKEYCERTWIZARD"; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "install-racertclone-wizard-help"; - + WICloneRAKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -102,7 +102,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { mSSLNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { @@ -137,10 +137,10 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); data.put(ConfigConstants.PR_CLONE_RA_TOKEN_NAME, mRATokenname); - data.put(ConfigConstants.PR_CLONE_RA_NICKNAME, + data.put(ConfigConstants.PR_CLONE_RA_NICKNAME, mRANicknameBox.getSelectedItem()); data.put(ConfigConstants.PR_CLONE_SSL_TOKEN_NAME, mSSLTokenname); - data.put(ConfigConstants.PR_CLONE_SSL_NICKNAME, + data.put(ConfigConstants.PR_CLONE_SSL_NICKNAME, mSSLNicknameBox.getSelectedItem()); startProgressStatus(); @@ -173,7 +173,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(heading, gbc); @@ -185,7 +185,7 @@ class WICloneRAKeyCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(raNicknameLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mRANicknameBox = new JComboBox(); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java index baeaaec8d..52c103521 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java @@ -40,10 +40,10 @@ class WICloneTKSKeyCertPage extends WizardBasePanel implements IWizardPanel { protected InstallWizardInfo mWizardInfo; protected JComboBox mSSLNicknameBox; private static final String PANELNAME = "CLONETKSKEYCERTWIZARD"; - private static final String TKSHELPINDEX = + private static final String TKSHELPINDEX = "install-tkscertclone-wizard-help"; - + WICloneTKSKeyCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -86,7 +86,7 @@ class WICloneTKSKeyCertPage extends WizardBasePanel implements IWizardPanel { mSSLNicknameBox.addItem(s1); } - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java index ad9e8b4d6..41bed883a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java @@ -83,20 +83,20 @@ class WIConfigWebServerPage extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.TASKID,TaskId.TASK_CONFIG_WEB_SERVER); data.put(ConfigConstants.OPTYPE, OpDef.OP_MODIFY); - data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, + data.put(ConfigConstants.PR_CERT_INSTANCE_NAME, consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); - data.put(ConfigConstants.PR_WEB_SERVERROOT, + data.put(ConfigConstants.PR_WEB_SERVERROOT, mServerRootText.getText().trim()); data.put(ConfigConstants.PR_USER_ID, mUserIDText.getText().trim()); - + startProgressStatus(); CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEWEBSERVER"); - + boolean ready = configCertCgi.configCert(data); dlg.setVisible(false); - + endProgressStatus(); if (!ready) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java index 4aee62e27..7b494205f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java @@ -82,7 +82,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { enableRemoteDB(mEnable.isSelected()); } } - + private void enableLocalDB(boolean e) { Color c; @@ -156,15 +156,15 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { mPasswordText.setText(""); mPasswordAgainText.setText(""); mRemoteBaseDNText.setText("o=netscapeCertificateServer"); - mRemoteDatabaseText.setText("userRoot"); + mRemoteDatabaseText.setText("userRoot"); mRemoteBindAsText.setText("cn=directory manager"); enableLocalDB(mEnable.isSelected()); enableRemoteDB(mEnable.isSelected()); mLocal.setEnabled(mEnable.isSelected()); mRemote.setEnabled(mEnable.isSelected()); - return true; + return true; } - + return false; } @@ -270,10 +270,10 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setDBBindDN(mBindAsText.getText().trim()); wizardInfo.setDBName(mInstanceIDText.getText().trim()); } - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEDB"); - + boolean ready = send(rawData, wizardInfo); if (ready) { @@ -282,7 +282,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { ready = send(rawData, wizardInfo); } //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -332,7 +332,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mLocal, gbc); @@ -355,13 +355,13 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { mActiveColor = mInstanceIDText.getBackground(); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("PORT"); + JLabel portNumber = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -370,7 +370,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); mBindAsLabel = makeJLabel("ADMIN"); //gbc.anchor = gbc.NORTHWEST; @@ -396,7 +396,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; @@ -428,7 +428,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.NONE; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 2*COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mRemote, gbc); @@ -454,13 +454,13 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { add(mRemoteHostText, gbc); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber1 = makeJLabel("PORT"); + JLabel portNumber1 = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber1, gbc); - + CMSAdminUtil.resetGBC(gbc); mRemotePortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -469,7 +469,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mRemotePortText, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel baseDNLbl = makeJLabel("BASEDN"); gbc.anchor = gbc.NORTHEAST; @@ -512,7 +512,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(passwordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mRemotePasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; @@ -546,7 +546,7 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(dummy1, gbc); - + CMSAdminUtil.resetGBC(gbc); mSchema = makeJCheckBox("SCHEMA", true); gbc.anchor = gbc.NORTHWEST; @@ -570,8 +570,8 @@ class WICreateInternalDBPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setDBCreated(ConfigConstants.TRUE); wizardInfo.setDBCreateNow(ConfigConstants.FALSE); wizardInfo.setCreateDBDone(ConfigConstants.TRUE); - - if (mEnable.isSelected()) + + if (mEnable.isSelected()) wizardInfo.setCloneDBCreated("true"); else { wizardInfo.setUpdateDBInfoDone(ConfigConstants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java index d63a07129..e07ba063e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java @@ -50,7 +50,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -112,7 +112,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0, COMPONENT_SPACE); panel.add(hostName, gbc); - + CMSAdminUtil.resetGBC(gbc); mHostNameText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -121,7 +121,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; panel.add(mHostNameText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); JTextArea dummy = createTextArea(" ", 2, 5); @@ -132,13 +132,13 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { */ CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("PORT"); + JLabel portNumber = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(10); gbc.anchor = gbc.NORTHWEST; @@ -147,7 +147,7 @@ class WIDBEnrollPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(mPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel versionLbl = makeJLabel("VERSION"); gbc.anchor = gbc.NORTHEAST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java index 442fa2b29..b1b4d28ec 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java @@ -32,7 +32,7 @@ class WIDisplayCACertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYCACERTWIZARD"; private static final String CAHELPINDEX = "install-cacert-display-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakracert-display-wizard-help"; - + WIDisplayCACertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -68,7 +68,7 @@ class WIDisplayCACertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java index 30e0bac13..ca180ad42 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java @@ -42,7 +42,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { private JTextField mCertNameField; protected String mPanelName; protected String mHelpIndex; - + WIDisplayCertPage(String panelName) { super(panelName); mPanelName = panelName; @@ -80,7 +80,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { certType); } } - if ((tokenName != null) && + if ((tokenName != null) && !(tokenName.equalsIgnoreCase(Constants.PR_INTERNAL_TOKEN_NAME))) { Debug.println("tokenName="+tokenName); mCertNameField.setText(tokenName+":"+wizardInfo.getNickname()); @@ -88,7 +88,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { Debug.println("tokenName=null"); mCertNameField.setText(wizardInfo.getNickname()); } - return true; + return true; } private String reformat(String content, String certOrder) { @@ -140,7 +140,7 @@ class WIDisplayCertPage extends WizardBasePanel implements IWizardPanel { } else setErrorMessage(str); } - + return ready; } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java index cae06e6cf..1973a6902 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java @@ -33,7 +33,7 @@ class WIDisplayKRACertPage extends WIDisplayCertPage { private static final String KRAHELPINDEX = "install-kracert-display-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakra-kracert-display-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakra-kracert-display-wizard-help"; - + WIDisplayKRACertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -70,7 +70,7 @@ class WIDisplayKRACertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java index e9db0e436..dac57fe7d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java @@ -32,7 +32,7 @@ import com.netscape.management.client.util.*; class WIDisplayOCSPCertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYOCSPCERTWIZARD"; private static final String OCSPHELPINDEX = "install-ocspcert-display-wizard-help"; - + WIDisplayOCSPCertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -64,7 +64,7 @@ class WIDisplayOCSPCertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java index 891e68038..ac8128fca 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java @@ -32,7 +32,7 @@ class WIDisplayRACertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYRACERTWIZARD"; private static final String RAHELPINDEX = "install-racert-display-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakracert-display-wizard-help"; - + WIDisplayRACertPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -66,7 +66,7 @@ class WIDisplayRACertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java index 3a791b4ed..0bbbb4af8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java @@ -31,7 +31,7 @@ import com.netscape.certsrv.common.*; class WIDisplaySSLCertPage extends WIDisplayCertPage { private static final String PANELNAME = "INSTALLDISPLAYSSLCERTWIZARD"; private static final String HELPINDEX = "install-sslcert-display-wizard-help"; - + WIDisplaySSLCertPage(JDialog parent) { super(PANELNAME); mHelpIndex = HELPINDEX; @@ -63,7 +63,7 @@ class WIDisplaySSLCertPage extends WIDisplayCertPage { ConfigConstants.TRUE); return true; } - + return false; } } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java index 93bbde830..5dd302dba 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java @@ -66,16 +66,16 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { public void actionPerformed(ActionEvent e) { } - + public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && !wizardInfo.isConnectDBDone()) { setBorder(makeTitledBorder(PANELNAME)); mRMBindAsText.setText(wizardInfo.getDBBindDN()); - return true; + return true; } - + return false; } @@ -88,7 +88,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { if (rmhostname.equals("")) { setErrorMessage("EMPTYHOST"); return false; - } + } if (rmport.equals("")) { setErrorMessage("EMPTYPORT"); @@ -129,10 +129,10 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+ConfigConstants.PR_DB_NAME+"="+mRMBaseDNText.getText(); wizardInfo.setInternalDBPasswd(mRMPasswordText.getText().trim()); wizardInfo.setDBBindDN(mRMBindAsText.getText().trim()); - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONNECTDB"); - + boolean ready = send(rawData, wizardInfo); if (ready) { @@ -141,7 +141,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { ready = send(rawData, wizardInfo); } //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -195,13 +195,13 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { add(mRMHostText, gbc); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("REMOTEPORT"); + JLabel portNumber = makeJLabel("REMOTEPORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -210,7 +210,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mRMPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); JLabel mRMBindAsLabel = makeJLabel("REMOTEADMIN"); //gbc.anchor = gbc.NORTHWEST; @@ -236,7 +236,7 @@ class WIExistingDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mRMPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java index 2bbb2f570..41d361f6d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the CA signing certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert @@ -52,7 +52,7 @@ class WIGenCAKeyCertPage extends WIGenKeyCertPage { if (wizardInfo.isCloning() && wizardInfo.isCACloningDone()) return false; - if (!wizardInfo.isCACertLocalCA() || !wizardInfo.isCAInstalled() || + if (!wizardInfo.isCACertLocalCA() || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || wizardInfo.isCACertRequestDone() || wizardInfo.isCACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java index c1f3c11ea..56ed8522c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java @@ -55,7 +55,7 @@ class WIGenCAKeyCertReqPage extends WIGenKeyCertReqPage { if (wizardInfo.isCACertLocalCA() || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isSelfSignedCACertDone() || (wizardInfo.isCACertRequestDone() && - !wizardInfo.isCACertRequestBack()) || + !wizardInfo.isCACertRequestBack()) || wizardInfo.isCACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java index 98ef24812..ce55fd720 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the KRA transport certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java index f6e5df9fe..f2f598b21 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java @@ -54,7 +54,7 @@ class WIGenKRAKeyCertReqPage extends WIGenKeyCertReqPage { return false; if (wizardInfo.isKRACertLocalCA() || !wizardInfo.isKRAInstalled() || (wizardInfo.isKRACertRequestDone() && - !wizardInfo.isKRACertRequestBack()) || + !wizardInfo.isKRACertRequestBack()) || wizardInfo.isKRALocalCertDone() || wizardInfo.isKRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java index 8272d44df..7a905999e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java @@ -34,7 +34,7 @@ class WIGenKeyCertPage extends WizardBasePanel implements IWizardPanel { private JTextArea desc; private String mPanelName; protected String mHelpIndex; - + WIGenKeyCertPage(String panelName) { super(panelName); mPanelName = panelName; @@ -51,7 +51,7 @@ class WIGenKeyCertPage extends WizardBasePanel implements IWizardPanel { String str = mResource.getString(mPanelName+"_TEXT_NEWKEY_LABEL"); desc.setText(str); - return true; + return true; } public boolean validatePanel() { @@ -86,15 +86,15 @@ class WIGenKeyCertPage extends WizardBasePanel implements IWizardPanel { rawData = rawData+"&"+name+"="+value; } } - + startProgressStatus(); - + //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATECERT"); - + boolean ready = send(rawData, wizardInfo); - + //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java index b5c0378c3..cb7100d16 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java @@ -33,14 +33,14 @@ import com.netscape.certsrv.common.*; class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { private JTextArea desc; private String mPanelName; - private static final String CERTREQ_BEGIN_HEADING = + private static final String CERTREQ_BEGIN_HEADING = "-----BEGIN NEW CERTIFICATE REQUEST-----"; - private static final String CERTREQ_END_HEADING = + private static final String CERTREQ_END_HEADING = "-----END NEW CERTIFICATE REQUEST-----"; private static final int LINE_COUNT = 76; protected String mHelpIndex; protected String mTokenName; - + protected JRadioButton mPKCS10; protected JRadioButton mCMC; protected String mSigningCert = null; @@ -126,7 +126,7 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { CMSAdminUtil.repaintComp(mPKCS10); } - return true; + return true; } public boolean validatePanel() { @@ -206,12 +206,12 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { return ready; } - + private String reformat(String pkcs) { int beginIndex = CERTREQ_BEGIN_HEADING.length(); int endIndex = CERTREQ_END_HEADING.length(); int totalLen = pkcs.length(); - String content = pkcs.substring(beginIndex, totalLen-endIndex); + String content = pkcs.substring(beginIndex, totalLen-endIndex); String result = CERTREQ_BEGIN_HEADING+"\n"; int index = 0; while (content.length() >= LINE_COUNT) { @@ -273,7 +273,7 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { ButtonGroup group = new ButtonGroup(); group.add(mCMC); group.add(mPKCS10); - + CMSAdminUtil.resetGBC(gbc); JLabel d1 = new JLabel(" "); gbc.anchor = gbc.NORTHWEST; @@ -282,7 +282,7 @@ class WIGenKeyCertReqPage extends WizardBasePanel implements IWizardPanel { gbc.gridheight = gbc.REMAINDER; gbc.gridwidth = gbc.REMAINDER; add(d1, gbc); - + super.init(); } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java index 2e2fbdbed..d5beea55f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java @@ -27,7 +27,7 @@ import com.netscape.management.client.util.*; /** * Generate the OCSP signing certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert @@ -51,7 +51,7 @@ class WIGenOCSPKeyCertPage extends WIGenKeyCertPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; Debug.println("+++++++++++++++++++++++++++++=WIGenOCSPKeyCertPage "); - if (!wizardInfo.isOCSPInstalled()) + if (!wizardInfo.isOCSPInstalled()) return false; mHelpIndex = OCSPHELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java index 7c27f673d..e23fa9d9c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java @@ -54,7 +54,7 @@ class WIGenOCSPKeyCertReqPage extends WIGenKeyCertReqPage { if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isOCSPInstalled() || (wizardInfo.isOCSPCertRequestDone() && - !wizardInfo.isOCSPCertRequestBack()) || + !wizardInfo.isOCSPCertRequestBack()) || wizardInfo.isOCSPLocalCertDone() || wizardInfo.isOCSPCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java index 05859e54c..6b8a8477a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the RA signing certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java index 89aa21f14..4517a236e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java @@ -53,7 +53,7 @@ class WIGenRAKeyCertReqPage extends WIGenKeyCertReqPage { return false; if (wizardInfo.isRACertLocalCA() || !wizardInfo.isRAInstalled() || (wizardInfo.isRACertRequestDone() && - !wizardInfo.isRACertRequestBack()) || + !wizardInfo.isRACertRequestBack()) || wizardInfo.isRALocalCertDone() || wizardInfo.isRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java index 58a85f790..ecf1afbe9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java @@ -54,7 +54,7 @@ class WIGenSSLKeyCertReqPage extends WIGenKeyCertReqPage { return false; if (wizardInfo.isSSLCertLocalCA() || wizardInfo.isMigrationEnable() || (wizardInfo.isSSLCertRequestDone() && - !wizardInfo.isSSLCertRequestBack()) || + !wizardInfo.isSSLCertRequestBack()) || wizardInfo.isSSLLocalCertDone() || wizardInfo.isSSLCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java index e93c378f6..bde7f8d4e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java @@ -26,7 +26,7 @@ import com.netscape.certsrv.common.*; /** * Generate the SSL server certificate - * + * * @author Christine Ho * @version $Revision$, $Date$ * @see com.netscape.admin.certsrv.keycert diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java index 240134536..b3a36cd70 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java @@ -25,8 +25,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 @@ -42,7 +42,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLCERT1WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WIInstallCert1Page() { super(PANELNAME); init(); @@ -53,7 +53,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -124,7 +124,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { mBase64Text = new JTextArea(null, null, 0, 0); mBase64Text.setLineWrap(true); mBase64Text.setWrapStyleWord(true); - JScrollPane scrollPane = new JScrollPane(mBase64Text, + JScrollPane scrollPane = new JScrollPane(mBase64Text, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); scrollPane.setPreferredSize(new Dimension(50, 20)); @@ -132,7 +132,7 @@ class WIInstallCert1Page extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.weighty = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, + gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, COMPONENT_SPACE); gbc.fill = gbc.BOTH; gbc.gridwidth = gbc.REMAINDER; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java index fc9eaacb0..543925c1d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java @@ -37,7 +37,7 @@ class WIInstallCert2Page extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INSTALLCERT2WIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WIInstallCert2Page() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WIInstallCert2Page extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -97,14 +97,14 @@ class WIInstallCert2Page extends WizardBasePanel implements IWizardPanel { gbc.weightx = 1.0; gbc.fill = gbc.BOTH; add(subjectScrollPane, gbc); - + JTextArea issueText = new JTextArea(null, null, 0, 0); JScrollPane issueScrollPane = new JScrollPane(issueText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); //issueScrollPane.setPreferredSize(new Dimension(50, 30)); CMSAdminUtil.resetGBC(gbc); - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); gbc.anchor = gbc.NORTHWEST; gbc.weighty = 1.0; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java index 860e5b60e..1af8353be 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java @@ -49,7 +49,7 @@ class WIInstallCertStatusPage extends WizardBasePanel implements IWizardPanel { protected String mHelpIndex; protected String mCertChain; protected String mCertFilePath; - + WIInstallCertStatusPage(String panelName) { super(panelName); mPanelName = panelName; @@ -61,7 +61,7 @@ class WIInstallCertStatusPage extends WizardBasePanel implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; String str = mResource.getString(mPanelName+"_TEXT_DESC_LABEL"); desc.setText(str); - return true; + return true; } public boolean isLastPage() { @@ -118,9 +118,9 @@ class WIInstallCertStatusPage extends WizardBasePanel implements IWizardPanel { return true; } else { setErrorMessage(mResource.getString(mPanelName+"_ERROR1")); - return false; + return false; } - } else + } else setErrorMessage(str); } return ready; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java index 29ddd0a46..dde93d3f4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java @@ -43,7 +43,7 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { protected JRadioButton mNo; protected String mPanelName; protected String mHelpIndex; - + WIInstallIntroPage(String panelName) { super(panelName); mPanelName = panelName; @@ -57,7 +57,7 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(mPanelName)); - return true; + return true; } public boolean validatePanel() { @@ -83,26 +83,26 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(heading, gbc); mNo = makeJRadioButton("NO", false); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); - + mYes = makeJRadioButton("YES", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - + JLabel dummy = new JLabel(""); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -112,7 +112,7 @@ class WIInstallIntroPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(dummy, gbc); - + ButtonGroup buttonGrp = new ButtonGroup(); buttonGrp.add(mYes); buttonGrp.add(mNo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java index d33601151..2587c791a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java @@ -53,7 +53,7 @@ class WIInstallKRACertStatusPage extends WIInstallCertStatusPage { !wizardInfo.isKRAInstalled() || wizardInfo.isKRACertChainImportDone()) return false; - if (wizardInfo.hasEntireKRAChain()) + if (wizardInfo.hasEntireKRAChain()) return false; wizardInfo.setCertType(Constants.PR_KRA_TRANSPORT_CERT); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java index c98b7b045..5f44ceb06 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java @@ -53,7 +53,7 @@ class WIInstallOCSPCertStatusPage extends WIInstallCertStatusPage { !wizardInfo.isOCSPInstalled() || wizardInfo.isOCSPCertChainImportDone()) return false; - if (wizardInfo.hasEntireOCSPChain()) + if (wizardInfo.hasEntireOCSPChain()) return false; wizardInfo.setCertType(Constants.PR_OCSP_SIGNING_CERT); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java index 326f5067a..b3fc368fb 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java @@ -52,7 +52,7 @@ class WIInstallRACertStatusPage extends WIInstallCertStatusPage { !wizardInfo.isRAInstalled() || wizardInfo.isRACertChainImportDone()) return false; - if (wizardInfo.hasEntireRAChain()) + if (wizardInfo.hasEntireRAChain()) return false; wizardInfo.setCertType(Constants.PR_RA_SIGNING_CERT); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java index 5338e820d..be0bd1f20 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java @@ -28,7 +28,7 @@ import com.netscape.admin.certsrv.task.*; import com.netscape.management.client.console.*; /** - * This panel asks for the information of the current internal database. + * This panel asks for the information of the current internal database. * * @author Christine Ho * @version $Revision$, $Date$ @@ -66,7 +66,7 @@ class WIInternalDBInfoPage extends WizardBasePanel implements IWizardPanel { return false; setBorder(makeTitledBorder(PANELNAME)); mBindAsText.setText(wizardInfo.getDBBindDN()); - return true; + return true; } public boolean validatePanel() { @@ -149,7 +149,7 @@ class WIInternalDBInfoPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java index 936d252d8..c6ab70d8b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java @@ -69,7 +69,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { } public void actionPerformed(ActionEvent e) { - if (e.getSource().equals(mSchema)) { + if (e.getSource().equals(mSchema)) { if (mSchema.isSelected()) { mRMDBNameAsText.setEnabled(true); mRMDBNameAsText.setBackground(mActiveColor); @@ -77,11 +77,11 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { mRMDBNameAsText.setEnabled(false); mRMDBNameAsText.setBackground(getBackground()); } - } else { - super.actionPerformed(e); + } else { + super.actionPerformed(e); } } - + public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; @@ -91,9 +91,9 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { setBorder(makeTitledBorder(PANELNAME)); mRMBaseText.setText("o="+wizardInfo.getDBName()+", o=netscapeCertificateServer"); mRMBindAsText.setText(wizardInfo.getDBBindDN()); - return true; + return true; } - + return false; } @@ -126,10 +126,10 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setInternalDBPasswd(mRMPasswordText.getText().trim()); wizardInfo.setDBBindDN(mRMBindAsText.getText().trim()); wizardInfo.setDBName(mRMBaseText.getText().trim()); - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEDB"); - + boolean ready = send(rawData, wizardInfo); if (ready) { @@ -138,7 +138,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { ready = send(rawData, wizardInfo); } //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -194,13 +194,13 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { mActiveColor = mRMHostText.getBackground(); CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("REMOTEPORT"); + JLabel portNumber = makeJLabel("REMOTEPORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPortText = makeJTextField(10); gbc.anchor = gbc.WEST; @@ -209,7 +209,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mRMPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMBaseLabel = makeJLabel("REMOTEDN"); gbc.anchor = gbc.NORTHEAST; @@ -252,7 +252,7 @@ class WIInternalDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mRMPasswordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mRMPasswordText = makeJPasswordField(30); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java index 3bc9bd2f3..ff2adab5d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java @@ -54,7 +54,7 @@ class WIInternalTokenLogonPage extends WITokenLogonPage implements IWizardPanel public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - String pwd = + String pwd = (String)wizardInfo.get("TOKEN:"+Constants.PR_INTERNAL_TOKEN_NAME); if (pwd != null) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java index 616911252..5045dbfa8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java @@ -39,11 +39,11 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { private JRadioButton mNo; private static final String PANELNAME = "INTROMIGRATIONWIZARD"; private String mHelpIndex; - private static final String CAHELPINDEX = + private static final String CAHELPINDEX = "install-ca-migration-enable-wizard-help"; - private static final String CAKRAHELPINDEX = + private static final String CAKRAHELPINDEX = "install-cakra-migration-enable-wizard-help"; - + WIIntroMigrationPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -66,7 +66,7 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { if (!wizardInfo.isCAInstalled() || wizardInfo.isMigrationDone()) return false; if (wizardInfo.isCAInstalled() && wizardInfo.isKRAInstalled()) - mHelpIndex = CAKRAHELPINDEX; + mHelpIndex = CAKRAHELPINDEX; else mHelpIndex = CAHELPINDEX; setBorder(makeTitledBorder(PANELNAME)); @@ -91,7 +91,7 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { // do the data migration data.put(ConfigConstants.TASKID, TaskId.TASK_MIGRATION); data.put(ConfigConstants.OPTYPE, OpDef.OP_MODIFY); - data.put(ConfigConstants.PR_ENABLE_MIGRATION, + data.put(ConfigConstants.PR_ENABLE_MIGRATION, ConfigConstants.FALSE); } @@ -138,8 +138,8 @@ class WIIntroMigrationPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - - mNo = makeJRadioButton("NO", true); + + mNo = makeJRadioButton("NO", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.insets = new Insets(0,COMPONENT_SPACE, diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java index 208a92cb8..9419b02c4 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java @@ -45,7 +45,7 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "INTROINSTALLWIZARD"; private static final String HELPINDEX = "install-general-intro-wizard-help"; - + WIIntroPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -74,7 +74,7 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { mSubsystemButton.setVisible(false); mMigrationButton.setVisible(false); String stages = wizardInfo.getStages(); - + if (stages != null && !stages.equals("")) { StringTokenizer tokenizer = new StringTokenizer(stages, ":"); mLabel.setVisible(true); @@ -89,7 +89,7 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { } } } - return true; + return true; } public boolean validatePanel() { @@ -104,13 +104,13 @@ class WIIntroPage extends WizardBasePanel implements IWizardPanel { String rawData = ConfigConstants.TASKID+"="+TaskId.TASK_GET_DEFAULT_INFO; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+ OpDef.OP_READ; boolean ready = send(rawData, wizardInfo); - if (ready) { + if (ready) { rawData = ConfigConstants.TASKID+"="+TaskId.TASK_TOKEN_INFO; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_READ; rawData = rawData+"&"+ConfigConstants.PR_CMS_SEED+"="+ (new Long(WizardBasePanel.mSeed).toString()); - ready = send(rawData, wizardInfo); + ready = send(rawData, wizardInfo); } endProgressStatus(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java index 659dd6969..083ce16b9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java @@ -61,7 +61,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { @@ -81,7 +81,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME)); data.put(ConfigConstants.PR_ADMIN_PASSWD, (String)consoleInfo.get(ConfigConstants.PR_ADMIN_PASSWD)); - + boolean ready = configCertCgi.configCert(data); return ready; } @@ -106,7 +106,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(heading, gbc); */ @@ -115,26 +115,26 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(heading, gbc); mNo = makeJRadioButton("NO", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); - + mYes = makeJRadioButton("YES", false); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - + JLabel dummy = new JLabel(""); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -144,7 +144,7 @@ class WIIntroSingleSignonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(dummy, gbc); - + ButtonGroup buttonGrp = new ButtonGroup(); buttonGrp.add(mYes); buttonGrp.add(mNo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java index 2dca713b5..4e200b676 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for KRA transport certificate + * Subject DN page for KRA transport certificate * * @author Christine Ho * @version $Revision$, $Date$ diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java index 2b1f0dc99..9132fbcc3 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java @@ -28,7 +28,7 @@ import com.netscape.certsrv.common.*; import com.netscape.admin.certsrv.config.*; /** - * Certificate Extension page for KRA transport certificate. + * Certificate Extension page for KRA transport certificate. * * @author Christine Ho * @version $Revision$, $Date$ @@ -55,7 +55,7 @@ class WIKRACertExtensionPage extends WICertExtensionPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isKRACloningDone()) return false; - if (!wizardInfo.isKRAInstalled() || + if (!wizardInfo.isKRAInstalled() || wizardInfo.isKRALocalCertDone() || wizardInfo.isKRACertRequestDone() || wizardInfo.isKRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java index 992bd7f14..8b197732f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java @@ -50,7 +50,7 @@ class WIKRACertSubmitPage extends WICertSubmitPage implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isKRACloningDone()) return false; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_KRA_TRANSPORT_CERT); if (!wizardInfo.isKRAInstalled() || wizardInfo.isKRACertRequestDone() || wizardInfo.isKRACertInstalledDone() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java index feaa29983..694b26cf5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java @@ -39,7 +39,7 @@ class WIKRACertValidityPage extends WICertValidityPage { private static final String KRAHELPINDEX = "install-kracert-validity-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakracert-validity-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakra-kracert-validity-wizard-help"; - + WIKRACertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java index 38941ec7b..91e54901e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WIKRAMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLKRAMESSAGEDIGESTWIZARD"; WIKRAMessageDigestPage(JDialog parent) { @@ -66,12 +66,12 @@ class WIKRAMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java index 000b3eb9f..4575f2a83 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java @@ -49,11 +49,11 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { private String mbeginRequestNumber; private JTextField mbeginRequestNumberText; private JLabel mbeginRequestNumberLabel; - + private String mEndRequestNumber = null; private JTextField mEndRequestNumberText; private JLabel mEndRequestNumberLabel; - + private static final String DEFAULT_SERIAL_NUMBER = "1"; private static final String PANELNAME = "KRAREQUESTNUMBERWIZARD"; private static final String HELPINDEX = @@ -84,11 +84,11 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { !wizardInfo.isKRAInstalled() || wizardInfo.isKRACertInstalledDone()|| wizardInfo.isNumberPageDone()) return false; - + if (wizardInfo.isCloning()) mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL") + mResource.getString(PANELNAME+"_TEXT_MORE_LABEL")); - else + else mDesc.setText(mResource.getString(PANELNAME+"_TEXT_HEADING_LABEL")); @@ -107,7 +107,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { if ((serial = wizardInfo.getEndRequestNumber()) != null) mEndRequestNumberText.setText(serial); - return true; + return true; } private String hexToDecimal(String hex, boolean isHex) @@ -188,7 +188,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { else mEndRequestNumber = ""; } - + if (num != null && endNum != null && num.compareTo(endNum) > 0) { setErrorMessage("Ending number must be greater than starting number."); return false; @@ -206,13 +206,13 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) wizardInfo.setCASerialNumber(mSerialNumber); else { wizardInfo.setCASerialNumber(DEFAULT_SERIAL_NUMBER); mSerialNumber = DEFAULT_SERIAL_NUMBER; } - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) wizardInfo.setRequestNumber(mbeginRequestNumber); else { wizardInfo.setRequestNumber(DEFAULT_SERIAL_NUMBER); @@ -221,16 +221,16 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { String rawData = ConfigConstants.TASKID+"="+TaskId.TASK_SET_KRA_NUMBER; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; - if (mSerialNumber != null && !mSerialNumber.equals("")) + if (mSerialNumber != null && !mSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_SERIAL_NUMBER+"="+ mSerialNumber; - if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) + if (mEndSerialNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_CA_ENDSERIAL_NUMBER+"="+ mEndSerialNumber; - if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) + if (mbeginRequestNumber != null && !mbeginRequestNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_REQUEST_NUMBER+"="+ mbeginRequestNumber; - if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) + if (mEndRequestNumber != null && !mEndSerialNumber.equals("")) rawData = rawData+"&"+ConfigConstants.PR_ENDREQUEST_NUMBER+"="+ mEndRequestNumber; if (wizardInfo.getInternalDBPasswd() != null) @@ -294,7 +294,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(mSerialNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndSerialNumberLabel = makeJLabel("ENDSERIALNUMBER"); gbc.anchor = gbc.EAST; @@ -311,7 +311,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndSerialNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mbeginRequestNumberLabel = makeJLabel("REQUESTNUMBER"); gbc.anchor = gbc.EAST; @@ -319,7 +319,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mbeginRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -328,7 +328,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mbeginRequestNumberText, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberLabel = makeJLabel("ENDREQUESTNUMBER"); gbc.anchor = gbc.EAST; @@ -336,7 +336,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mEndRequestNumberText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -345,7 +345,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mEndRequestNumberText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); mSerialNumberLabel = makeJLabel("PWD"); @@ -354,7 +354,7 @@ class WIKRANumberPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mSerialNumberLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mSerialNumberText = makeJSerialNumberField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java index d6171e651..390e20b64 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java @@ -44,7 +44,7 @@ class WIKRAScheme1Page extends WizardBasePanel implements IWizardPanel { private static final String RAKRAHELPINDEX = "install-rakra-mnscheme-wizard-help"; private int mRequired, mAvail; - + WIKRAScheme1Page(JDialog parent) { super(PANELNAME); mParent = parent; @@ -80,7 +80,7 @@ class WIKRAScheme1Page extends WizardBasePanel implements IWizardPanel { mHelpIndex = RAKRAHELPINDEX; else mHelpIndex = KRAHELPINDEX; - return true; + return true; } public boolean validatePanel() { @@ -135,7 +135,7 @@ class WIKRAScheme1Page extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(requiredLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mRequiredText = makeJTextField(5); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java index f8c9c9f8e..027a8b404 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java @@ -48,7 +48,7 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { "install-cakra-scheme-usrpwds-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakra-scheme-usrpwds-wizard-help"; - + WIKRAScheme2Page(JDialog parent) { super(PANELNAME); mParent = parent; @@ -99,7 +99,7 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { else mHelpIndex = KRAHELPINDEX; - return true; + return true; } public boolean validatePanel() { @@ -185,15 +185,15 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - - String rawData = ""; + + String rawData = ""; int total = Integer.parseInt(wizardInfo.getTotalAgents()); for (int i=0; i<total; i++) { String val1 = (String)mDataModel.getValueAt(i,1); String val2 = (String)mDataModel.getValueAt(i,2); rawData = rawData+ConfigConstants.PR_AGENT_UID+i+"="+val1; rawData = rawData+"&"+ConfigConstants.PR_AGENT_PWD+i+"="+val2; - } + } rawData = rawData+"&"+ConfigConstants.TASKID+"="+TaskId.TASK_AGENTS; rawData = rawData+"&"+ConfigConstants.OPTYPE+"="+OpDef.OP_MODIFY; @@ -242,7 +242,7 @@ class WIKRAScheme2Page extends WizardBasePanel implements IWizardPanel { scrollPane.setHorizontalScrollBarPolicy(scrollPane.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setVerticalScrollBarPolicy(scrollPane.VERTICAL_SCROLLBAR_ALWAYS); mTable.setAutoscrolls(true); - mTable.sizeColumnsToFit(true); + mTable.sizeColumnsToFit(true); mTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION); scrollPane.setBackground(Color.white); setLabelCellRenderer(mTable, 1); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java index 6cce19d95..7f42e7671 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java @@ -30,7 +30,7 @@ import javax.swing.event.*; import java.awt.event.*; /** - * Install KRA storage key. + * Install KRA storage key. * * @author Christine Ho * @version $Revision$, $Date$ @@ -45,7 +45,7 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { "install-cakra-storagekey-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakra-storagekey-wizard-help"; - + protected JComboBox mKeyTypeBox, mKeyLengthBox, mDSAKeyLengthBox, mTokenBox; protected JPasswordField mPassword, mPasswordAgain, mSOPPassword; protected JLabel keyTypeLbl, keyLengthCustomText, keyLengthLbl, unitLbl, @@ -122,7 +122,7 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { //mTokenBox.setSelectedIndex(0); mTokenBox.addItemListener(this); - return true; + return true; } public boolean validatePanel() { @@ -131,13 +131,13 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { public void actionPerformed(ActionEvent e) { int index = mTokenBox.getSelectedIndex(); - if (index > 0) { + if (index > 0) { mPassword.setEnabled(true); mPassword.setBackground(mActiveColor); } else { // Internal Token mPassword.setEnabled(false); - mPassword.setBackground(getBackground()); + mPassword.setBackground(getBackground()); } } @@ -293,7 +293,7 @@ class WIKRAStorageKeyPage extends WizardBasePanel implements IWizardPanel { gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); panel2.add(mSOPPassword, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java index d67d0e339..425ecb869 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java @@ -55,7 +55,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { protected InstallWizardInfo mWizardInfo; protected String mHelpIndex; protected boolean mIsCAKey; - + WIKeyPage(String panelName) { super(panelName); mPanelName = panelName; @@ -85,13 +85,13 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { int i=0; mTokenInitialized = new String[count]; while (tokenizer.hasMoreElements()) { - mTokenInitialized[i] = (String)tokenizer.nextToken(); + mTokenInitialized[i] = (String)tokenizer.nextToken(); i++; } String loginList = mWizardInfo.getTokensLogin(); - tokenizer = new StringTokenizer(loginList, ":"); - i=0; + tokenizer = new StringTokenizer(loginList, ":"); + i=0; mTokenLogin = new String[count]; while (tokenizer.hasMoreElements()) { mTokenLogin[i] = (String)tokenizer.nextToken(); @@ -111,7 +111,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { } enableKeyLengthFields(); - return true; + return true; } public boolean validatePanel() { @@ -155,7 +155,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { if (index > 0) return validateHardwareToken(index); - else + else return validateInternalToken(index); } @@ -252,7 +252,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { startProgressStatus(); // CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "INITTOKEN"); - + boolean ready = send(rawData, mWizardInfo); if (ready) { @@ -307,14 +307,14 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(panel, gbc); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(panel2, gbc); - + JTextArea selectTokenLbl = createTextArea(mResource.getString( mPanelName+"_LABEL_SELECTTOKEN_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -322,7 +322,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.gridwidth = gbc.REMAINDER; gbc.insets = new Insets(0, 0, COMPONENT_SPACE,0); panel.add(selectTokenLbl, gbc); - + JLabel tokenLbl = makeJLabel("TOKEN"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.CENTER; @@ -501,7 +501,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.NONE; //gbc.gridheight = gbc.REMAINDER; - gbc.insets = new Insets(0, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, 0); panel1.add(mKeyLengthText, gbc); mActiveColor = mKeyLengthText.getBackground(); @@ -537,7 +537,7 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { // the prefix "TOKEN:" and the value is the token password. mWizardInfo.put("TOKEN:"+name, mPassword.getText().trim()); } - + mTokenBox.removeItemListener(this); } @@ -578,13 +578,13 @@ class WIKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener { enableFields(keyLengthCustomText, mKeyLengthText, true, mActiveColor); enableFields(unit1Lbl, null, true, mActiveColor); } else { - enableFields(keyLengthCustomText, mKeyLengthText, false, + enableFields(keyLengthCustomText, mKeyLengthText, false, getBackground()); enableFields(unit1Lbl, null, false, getBackground()); } } - protected void enableFields(JComponent comp1, JTextComponent comp2, boolean enable, + 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/config/install/WILDAPPublishingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java index 5cb6b3db3..0dd19333c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java @@ -34,7 +34,7 @@ import com.netscape.certsrv.common.*; class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { private JTextField mHostNameText, mPortText, mBindAsText; private JCheckBox mSecurePort, mEnable; - private JLabel mBindAsLabel, mCertLabel; + private JLabel mBindAsLabel, mCertLabel; private JComboBox mAuthBox, mCertBox, mVersionBox; private static final String PANELNAME = "LDAPPUBLISHINGWIZARD"; @@ -55,7 +55,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -118,7 +118,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0, COMPONENT_SPACE); panel.add(hostName, gbc); - + CMSAdminUtil.resetGBC(gbc); mHostNameText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -127,7 +127,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; panel.add(mHostNameText, gbc); - + /* CMSAdminUtil.resetGBC(gbc); JTextArea dummy = createTextArea(" ", 2, 5); @@ -138,13 +138,13 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { */ CMSAdminUtil.resetGBC(gbc); - JLabel portNumber = makeJLabel("PORT"); + JLabel portNumber = makeJLabel("PORT"); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(portNumber, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(10); gbc.anchor = gbc.NORTHWEST; @@ -152,7 +152,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); panel.add(mPortText, gbc); - + CMSAdminUtil.resetGBC(gbc); mSecurePort = makeJCheckBox("SECUREPORT"); gbc.anchor = gbc.NORTHWEST; @@ -259,7 +259,7 @@ class WILDAPPublishingPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); panel.add(dummy2, gbc); - + /* CMSAdminUtil.resetGBC(gbc); JTextArea dummy1 = createTextArea(" ", 2, 30); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java index a28a4795d..c3431b51a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java @@ -47,7 +47,7 @@ class WILoggingPage extends WizardBasePanel implements IWizardPanel { protected final static int WEEK = 604800; protected final static int DAY = 86400; protected final static int HOUR = 3600; - + WILoggingPage() { super(PANELNAME); init(); @@ -58,8 +58,8 @@ class WILoggingPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - - return true; + + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java index 9a8060b30..dbbe3a2e2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java @@ -83,9 +83,9 @@ class WILogonAllTokensPage extends WizardBasePanel implements IWizardPanel { String token = (String)tokenizer.nextElement(); loggedIn = (String)tokenizerLoggedIn.nextElement(); inits = (String)tokenizerInits.nextElement(); - - // if (loggedIn.equals("false")) { - // always logon to the token. + + // if (loggedIn.equals("false")) { + // always logon to the token. if (inits.equals("true")) { Vector v = new Vector(); v.addElement(new JLabel(token)); @@ -141,8 +141,8 @@ class WILogonAllTokensPage extends WizardBasePanel implements IWizardPanel { } else { tokenNames = tokenNames+":"+val1; pwds = pwds+":"+val2; - } - } + } + } startProgressStatus(); String rawData = ConfigConstants.PR_TOKEN_LOGONLIST+"="+tokenNames; @@ -225,7 +225,7 @@ class WILogonAllTokensPage extends WizardBasePanel implements IWizardPanel { mTable.setDefaultRenderer(JComponent.class, new ComponentCellRenderer()); mTable.setDefaultEditor(JComponent.class, new ProfileComponentCellEditor()); - + CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.fill = gbc.BOTH; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java index 37adddb98..c0ffcd964 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java @@ -38,7 +38,7 @@ import com.netscape.management.client.util.*; class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWizardPanel { // private static final String PANELNAME = "INSTALLMANUALCERTREQUESTWIZARD"; String mHelpIndex; - + WIManualCertRequestPage(String panelName) { super(panelName); init(); @@ -49,7 +49,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz } public boolean initializePanel(WizardInfo info) { - return super.initializePanel(info); + return super.initializePanel(info); } public boolean validatePanel() { @@ -64,7 +64,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz 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 @@ -96,7 +96,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz } startProgressStatus(); - boolean ready = send(mHost, Integer.parseInt(mPort), + boolean ready = send(mHost, Integer.parseInt(mPort), "/ca/ee/ca/profileSubmit", rawData, wizardInfo); endProgressStatus(); @@ -145,7 +145,7 @@ class WIManualCertRequestPage extends WBaseManualCertRequestPage implements IWiz if (!ready) { String str = getErrorMessage(); - if (str.equals("")) { + if (str.equals("")) { String errorMsg = mResource.getString( mPanelName+"_ERRORMSG"); setErrorMessage(errorMsg); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java index c1355b3d5..9df684ada 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java @@ -53,7 +53,7 @@ class WIManualKRACertRequestPage extends WIManualCertRequestPage { if (wizardInfo.isCloning() && wizardInfo.isKRACloningDone()) return false; if (wizardInfo.isKRACertLocalCA() || !wizardInfo.isKRAInstalled() || - wizardInfo.isKRALocalCertDone() || + wizardInfo.isKRALocalCertDone() || wizardInfo.isKRACertInstalledDone() || wizardInfo.isKRACertRequestSucc()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java index 268c6c395..b5d4c8e2a 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java @@ -53,7 +53,7 @@ class WIManualOCSPCertRequestPage extends WIManualCertRequestPage { if (wizardInfo.isCloning() && wizardInfo.isOCSPCloningDone()) return false; if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isOCSPInstalled() || - wizardInfo.isOCSPLocalCertDone() || + wizardInfo.isOCSPLocalCertDone() || wizardInfo.isOCSPCertInstalledDone() || wizardInfo.isOCSPCertRequestSucc() ) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java index 7439ed7b5..e119a723b 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java @@ -52,7 +52,7 @@ class WIManualRACertRequestPage extends WIManualCertRequestPage { if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; if (wizardInfo.isRACertLocalCA() || !wizardInfo.isRAInstalled() || - wizardInfo.isRALocalCertDone() || + wizardInfo.isRALocalCertDone() || wizardInfo.isRACertInstalledDone() || wizardInfo.isRACertRequestSucc() ) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java index 96c764381..e2dc64593 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java @@ -40,9 +40,9 @@ class WIMasterOrClone extends WizardBasePanel implements IWizardPanel { protected JRadioButton mNo; protected JTextArea mLabel; private static final String PANELNAME = "MASTERORCLONE"; - private static final String HELPINDEX = + private static final String HELPINDEX = "install-internaldb-createdbagain-help"; - + WIMasterOrClone(JDialog parent) { super(PANELNAME); mParent = parent; @@ -97,7 +97,7 @@ class WIMasterOrClone extends WizardBasePanel implements IWizardPanel { Debug.println("WIMasterOrClone:concludePanel() 2"); boolean ready = send(rawData, wizardInfo); endProgressStatus(); - + if (!ready) { String str = getErrorMessage(wizardInfo); if (str == null) @@ -125,24 +125,24 @@ class WIMasterOrClone extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mLabel, gbc); - - + + mYes = makeJRadioButton("YES", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); - + mNo = makeJRadioButton("NO", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java index ab9bcebb9..68faf10d0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java @@ -58,7 +58,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe "install-ca-migration-configuration-wizard-help"; private static final String CAKRAHELPINDEX = "install-cakra-migration-configuration-wizard-help"; - + WIMigrationPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -84,19 +84,19 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe setBorder(makeTitledBorder(PANELNAME)); initializeTokenBox(mCATokenBox); - if (mSSLTokenBox.getItemCount() > 0) + if (mSSLTokenBox.getItemCount() > 0) mSSLTokenBox.removeAllItems(); for (int i=0; i<mCATokenBox.getItemCount(); i++) { String str = (String)mCATokenBox.getItemAt(i); mSSLTokenBox.addItem(str); } int index = mCATokenBox.getSelectedIndex(); - mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); + mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); enableFields(index, mLogonInitCATokenLbl, mCAPasswdLbl, mCAPassword, mCAPasswdAgainLbl, mCAPasswordAgain, mCASOPLbl, mCASOPPassword); index = mSSLTokenBox.getSelectedIndex(); - mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); + mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); enableFields(index, mLogonInitSSLTokenLbl, mSSLPasswdLbl, mSSLPassword, mSSLPasswdAgainLbl, mSSLPasswordAgain, mSSLSOPLbl, mSSLSOPPassword); @@ -104,16 +104,16 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe mSSLTokenBox.addItemListener(this); enablePasswordFields(); - if (mWizardInfo.isCAInstalled() && mWizardInfo.isKRAInstalled()) + if (mWizardInfo.isCAInstalled() && mWizardInfo.isKRAInstalled()) mHelpIndex = CAKRAHELPINDEX; else mHelpIndex = CAHELPINDEX; - return true; + return true; } private void initializeTokenBox(JComboBox tokenBox) { - if (tokenBox.getItemCount() > 0) + if (tokenBox.getItemCount() > 0) tokenBox.removeAllItems(); String tokenList = mWizardInfo.getTokensList(); @@ -278,16 +278,16 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe data.put(ConfigConstants.PR_ENABLE_MIGRATION, ConfigConstants.TRUE); else data.put(ConfigConstants.PR_ENABLE_MIGRATION, ConfigConstants.FALSE); - data.put(ConfigConstants.PR_OUTPUT_PATH, + data.put(ConfigConstants.PR_OUTPUT_PATH, mWizardInfo.getMigrationOutputPath()); if (mWizardInfo.getInternalDBPasswd() != null) - data.put(ConfigConstants.PR_DB_PWD, + data.put(ConfigConstants.PR_DB_PWD, mWizardInfo.getInternalDBPasswd()); - data.put(ConfigConstants.PR_MIGRATION_PASSWORD, + data.put(ConfigConstants.PR_MIGRATION_PASSWORD, mWizardInfo.getMigrationPasswd()); - data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN, + data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN, mWizardInfo.getSigningKeyMigrationToken()); - data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN_PASSWD, + data.put(ConfigConstants.PR_SIGNING_KEY_MIGRATION_TOKEN_PASSWD, mWizardInfo.getSigningKeyMigrationPasswd()); data.put(ConfigConstants.PR_SSL_KEY_MIGRATION_TOKEN, mWizardInfo.getSSLKeyMigrationToken()); @@ -299,7 +299,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe endProgressStatus(); mWizardInfo.put("TOKEN:"+caTokenName, mCAPassword.getText().trim()); - mWizardInfo.put("TOKEN:"+sslTokenName, + mWizardInfo.put("TOKEN:"+sslTokenName, mSSLPassword.getText().trim()); if (!ready) { @@ -320,21 +320,21 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe int index = 0; if (e.getSource().equals(mCATokenBox)) { index = mCATokenBox.getSelectedIndex(); - mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); + mWizardInfo.setMigrateCACertTokenName((String)mCATokenBox.getSelectedItem()); enableFields(index, mLogonInitCATokenLbl, mCAPasswdLbl, mCAPassword, mCAPasswdAgainLbl, mCAPasswordAgain, mCASOPLbl, mCASOPPassword); enablePasswordFields(); } else if (e.getSource().equals(mSSLTokenBox)) { index = mSSLTokenBox.getSelectedIndex(); - mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); + mWizardInfo.setMigrateSSLCertTokenName((String)mSSLTokenBox.getSelectedItem()); enableFields(index, mLogonInitSSLTokenLbl, mSSLPasswdLbl, mSSLPassword, mSSLPasswdAgainLbl, mSSLPasswordAgain, mSSLSOPLbl, mSSLSOPPassword); enablePasswordFields(); } } - private void enableFields(int index, JLabel logonInitLbl, JLabel passwdLbl, - JPasswordField passwd, JLabel passwdAgainLbl, JPasswordField passwdAgain, + private void enableFields(int index, JLabel logonInitLbl, JLabel passwdLbl, + JPasswordField passwd, JLabel passwdAgainLbl, JPasswordField passwdAgain, JLabel sopLbl, JPasswordField sopPasswd) { if (mTokenLogin[index].equals(ConfigConstants.TRUE)) { logonInitLbl.setText(""); @@ -367,7 +367,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe } } - protected void enableFields(JComponent comp1, JTextComponent comp2, + protected void enableFields(JComponent comp1, JTextComponent comp2, boolean enable, Color color) { if (comp1 != null) { comp1.setEnabled(enable); @@ -423,7 +423,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mPathLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mPathText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -432,11 +432,11 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe gbc.gridwidth = gbc.REMAINDER; add(mPathText, gbc); - mTransportLbl = makeJLabel("TRANSPORTPASSWORD"); + mTransportLbl = makeJLabel("TRANSPORTPASSWORD"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; gbc.fill = gbc.NONE; - gbc.insets = new Insets(0, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(mTransportLbl, gbc); @@ -463,7 +463,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, + gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mDBPassword, gbc); */ @@ -476,7 +476,7 @@ class WIMigrationPage extends WizardBasePanel implements IWizardPanel, ItemListe CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.gridwidth = gbc.REMAINDER; - gbc.insets = new Insets(COMPONENT_SPACE, 0, COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE, 0, COMPONENT_SPACE, COMPONENT_SPACE); panel1.add(mCATokenHeading, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java index 823980d56..6d9bb892d 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java @@ -54,7 +54,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { private boolean mNumberError = false; private JLabel mPortLabel, mSSLPortLabel; - private static final String HELPINDEX = + private static final String HELPINDEX = "install-network-configuration-wizard-help"; private static final String PANELNAME = "NETWORKWIZARD"; private static final int MAX_PORT = 65535; @@ -83,7 +83,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; mWizardInfo = wizardInfo; - if (wizardInfo.isNetworkDone()) + if (wizardInfo.isNetworkDone()) return false; setBorder(makeTitledBorder(PANELNAME)); boolean cloning = mWizardInfo.isCloning(); @@ -100,7 +100,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { } else { mEnable.setSelected(wizardInfo.isEEEnabled()); } - + if (wizardInfo.isRAInstalled()) mEnable.setSelected(true); mAdminSSLPortText.setText(wizardInfo.getAdminPort()); @@ -125,7 +125,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { enableFields(mSSLPortLabel, mGatewaySSLPortText, true, mActiveColor); mEnableEEPorts = true; } - + return true; } @@ -155,13 +155,13 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { return false; } - if (mEnableEEPorts) { + if (mEnableEEPorts) { if (sslEEPort.equals("") || (mEnable.isSelected() && eePort.equals(""))) { - setErrorMessage("BLANKFIELD"); + setErrorMessage("BLANKFIELD"); return false; } } - + boolean cloning = mWizardInfo.isCloning(); String selected_sub = mWizardInfo.getCloneSubsystem(); if (cloning && (selected_sub != null && selected_sub.equals("ca"))) { @@ -177,24 +177,24 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } num = Integer.parseInt(agentPort); if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } if (mEnableEEPorts) { num = Integer.parseInt(sslEEPort); if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } if (mEnable.isSelected()) { num = Integer.parseInt(eePort); if (num < MIN_PORT || num > MAX_PORT) { setErrorMessage("PORTRANGE"); return false; - } + } } } if (cloning && (selected_sub != null && selected_sub.equals("ca"))) @@ -204,14 +204,14 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { return false; } - if (adminPort.equals(agentPort) || agentPort.equals(sslEEPort) || + if (adminPort.equals(agentPort) || agentPort.equals(sslEEPort) || (mEnable.isSelected() && eePort.equals(sslEEPort))) { setErrorMessage("SAMEPORT"); return false; } if (mEnableEEPorts) { - if (agentPort.equals(sslEEPort) || + if (agentPort.equals(sslEEPort) || (mEnable.isSelected() && eePort.equals(sslEEPort))) { setErrorMessage("SAMEPORT"); return false; @@ -309,7 +309,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(adminSSLport, gbc); - + mAdminSSLPortText = makeJTextField(10); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; @@ -335,7 +335,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE,COMPONENT_SPACE); gbc.fill = gbc.NONE; add(agentPort, gbc); - + mAgentSSLPortText = makeJTextField(10); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; @@ -346,7 +346,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); //gbc.gridwidth = gbc.REMAINDER; add(mAgentSSLPortText, gbc); - + JLabel dummy2b = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -432,7 +432,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mAgentDesc, gbc); - + CMSAdminUtil.resetGBC(gbc); mAgentPortLbl = makeJLabel("AGENTPORT"); gbc.anchor = gbc.NORTHEAST; @@ -440,7 +440,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(mAgentPortLbl, gbc); - + CMSAdminUtil.resetGBC(gbc); mPortText = makeJTextField(30); gbc.anchor = gbc.NORTHWEST; @@ -480,7 +480,7 @@ class WINetworkPage extends WizardBasePanel implements IWizardPanel { mWarning = true; String errormsg = mResource.getString(mPanelName+"_WARNING"); JOptionPane.showMessageDialog(mAdminFrame, errormsg, "Warning", - JOptionPane.WARNING_MESSAGE, + JOptionPane.WARNING_MESSAGE, CMSAdminUtil.getImage(CMSAdminResources.IMAGE_WARN_ICON)); } else { enableFields(false, getBackground()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java index d13124de6..d01c55dd0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java @@ -22,7 +22,7 @@ import javax.swing.*; import com.netscape.management.client.util.*; /** - * Subject DN page for RA signing certificate + * Subject DN page for RA signing certificate * * @author Christine Ho * @version $Revision$, $Date$ @@ -78,6 +78,6 @@ class WIOCSPCertDNPage extends WICertDNPage { str = mCText.getText().trim(); wizardInfo.setOCSPCComp(str); } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java index dd58b5f1a..d851ee323 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java @@ -48,7 +48,7 @@ class WIOCSPCertSubmitPage extends WICertSubmitPage implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isOCSPCloningDone()) return false; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_OCSP_SIGNING_CERT); if (!wizardInfo.isOCSPInstalled() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java index a49b428a7..63746e448 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java @@ -39,7 +39,7 @@ import com.netscape.management.client.util.*; */ class WIOCSPKeyPage extends WIKeyPage implements IWizardPanel { private static final String PANELNAME = "INSTALLOCSPKEYWIZARD"; - private static final String OCSPHELPINDEX = + private static final String OCSPHELPINDEX = "install-ocspkey-configuration-wizard-help"; WIOCSPKeyPage(JDialog parent) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java index ec250dcd1..c5f1c5613 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WIOCSPMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLOCSPMESSAGEDIGESTWIZARD"; WIOCSPMessageDigestPage(JDialog parent) { @@ -67,12 +67,12 @@ class WIOCSPMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java index 816554588..4e9ef1fa6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java @@ -49,8 +49,8 @@ class WIPasteCACertPage extends WIPasteCertPage { if (wizardInfo.isCloning() && wizardInfo.isCACloningDone()) return false; - if (wizardInfo.isCACertLocalCA() || !wizardInfo.isInstallCertNow() - || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() + if (wizardInfo.isCACertLocalCA() || !wizardInfo.isInstallCertNow() + || !wizardInfo.isCAInstalled() || wizardInfo.isMigrationEnable() || wizardInfo.isCACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java index 063382f32..7cda3bef7 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java @@ -32,8 +32,8 @@ import com.netscape.management.client.console.*; import com.netscape.management.client.util.*; /** - * This page is to install the certificate in the internal token. The user can - * import the cert from the file, 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, paste the Base 64 encoded blob in the * text area or get the cert from the CMS where the request was sent. * * @author Christine Ho @@ -53,14 +53,14 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { protected String mHelpIndex; protected Color mActiveColor; protected JTextArea introLbl; - + protected JTextField mHostText, mPortText, mRIDText; protected JLabel mHostLbl, mPortLbl, mRIDLbl; protected String mHost, mPort, mRID; protected JLabel mSSLText; protected JCheckBox mSSL; // ssl or not protected JLabel mQueryText; - protected JRadioButton mQueryBtn; + protected JRadioButton mQueryBtn; public static final int MAX_PORT = 65535; public static final int MIN_PORT = 1; @@ -88,7 +88,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { String port = wizardInfo.getCMEEPort(); if (port != null && !port.equals("")) mPortText.setText(port); - + String portType = wizardInfo.getCMEEType(); if (portType != null && portType.equals("http")) mSSL.setSelected(false); @@ -98,7 +98,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { mRIDText.setText(rid); setBorder(makeTitledBorder(mPanelName)); - return true; + return true; } public boolean validatePanel() { @@ -176,7 +176,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { 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 @@ -191,11 +191,11 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { data1.put("importCert", "true"); data1.put("requestId", mRID); */ - + startProgressStatus(); boolean ready = send(mHost, Integer.parseInt(mPort), "/checkRequest", rawData1, wizardInfo); - + endProgressStatus(); if (!ready) { @@ -262,7 +262,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE, COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(introLbl, gbc); - + mFileBtn = makeJRadioButton("FILE", true); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -302,7 +302,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { add(desc, gbc); mBase64Text = new JTextArea(null, null, 6, 10); - JScrollPane scrollPane = new JScrollPane(mBase64Text, + JScrollPane scrollPane = new JScrollPane(mBase64Text, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); scrollPane.setPreferredSize(new Dimension(30, 50)); @@ -425,7 +425,7 @@ class WIPasteCertPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(label, gbc); - + ButtonGroup buttonGrp = new ButtonGroup(); buttonGrp.add(mFileBtn); buttonGrp.add(mBase64Btn); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java index 783d87da7..732227722 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java @@ -50,7 +50,7 @@ class WIPasteOCSPCertPage extends WIPasteCertPage { if (wizardInfo.isCloning() && wizardInfo.isOCSPCloningDone()) return false; - if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isInstallCertNow() + if (wizardInfo.isOCSPCertLocalCA() || !wizardInfo.isInstallCertNow() || !wizardInfo.isOCSPInstalled() || wizardInfo.isOCSPCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java index 584c375d4..2cf556b50 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java @@ -48,7 +48,7 @@ class WIPasteRACertPage extends WIPasteCertPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; - if (wizardInfo.isRACertLocalCA() || !wizardInfo.isInstallCertNow() + if (wizardInfo.isRACertLocalCA() || !wizardInfo.isInstallCertNow() || !wizardInfo.isRAInstalled() || wizardInfo.isRACertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java index 788fab869..ba1c8913c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for RA signing certificate + * Subject DN page for RA signing certificate * * @author Christine Ho * @version $Revision$, $Date$ @@ -81,6 +81,6 @@ class WIRACertDNPage extends WICertDNPage { str = mCText.getText().trim(); wizardInfo.setRACComp(str); } - + } diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java index 85553c5c7..2f38795f2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java @@ -54,11 +54,11 @@ class WIRACertExtensionPage extends WICertExtensionPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; - if (!wizardInfo.isRAInstalled() || + if (!wizardInfo.isRAInstalled() || wizardInfo.isRALocalCertDone() || wizardInfo.isRACertRequestDone() || wizardInfo.isRACertInstalledDone()) return false; - + if (!mModified) { mAKICheckBox.setSelected(true); mExtendedKeyCheckBox.setSelected(true); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java index 771aa51b3..366b4f8e9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java @@ -49,7 +49,7 @@ class WIRACertSubmitPage extends WICertSubmitPage implements IWizardPanel { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning() && wizardInfo.isRACloningDone()) return false; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_RA_SIGNING_CERT); if (!wizardInfo.isRAInstalled() || wizardInfo.isRACertRequestDone() || wizardInfo.isRACertInstalledDone() || diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java index fec7619df..62a0c1a8c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java @@ -38,7 +38,7 @@ class WIRACertValidityPage extends WICertValidityPage { private static final String PANELNAME = "INSTALLRACERTVALIDWIZARD"; private static final String RAHELPINDEX = "install-racert-validity-wizard-help"; private static final String RAKRAHELPINDEX = "install-rakracert-validity-wizard-help"; - + WIRACertValidityPage(JDialog parent) { super(PANELNAME); mParent = parent; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java index 9abb9e0ac..619f40593 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java @@ -38,9 +38,9 @@ import com.netscape.admin.certsrv.config.*; */ class WIRAKeyPage extends WIKeyPage implements IWizardPanel { private static final String PANELNAME = "INSTALLRAKEYWIZARD"; - private static final String RAHELPINDEX = + private static final String RAHELPINDEX = "install-rakey-configuration-wizard-help"; - private static final String RAKRAHELPINDEX = + private static final String RAKRAHELPINDEX = "install-rakrakey-configuration-wizard-help"; WIRAKeyPage(JDialog parent) { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java index ef843ba37..af069d5f2 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WIRAMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLRAMESSAGEDIGESTWIZARD"; WIRAMessageDigestPage(JDialog parent) { @@ -66,12 +66,12 @@ class WIRAMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java index f07de3134..58277732f 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java @@ -39,9 +39,9 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { protected JRadioButton mNo; protected JTextArea mLabel; private static final String PANELNAME = "INSTALLDBAGAIN"; - private static final String HELPINDEX = + private static final String HELPINDEX = "install-internaldb-createdbagain-help"; - + WIRecreateDBPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -65,9 +65,9 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isDBCreated()) { setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } - + return false; } @@ -93,7 +93,7 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { PANELNAME+"_TEXT_HEADING_LABEL")); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mLabel, gbc); @@ -101,7 +101,7 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { mYes = makeJRadioButton("YES", false); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, + gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mYes, gbc); @@ -109,7 +109,7 @@ class WIRecreateDBPage extends WizardBasePanel implements IWizardPanel { mNo = makeJRadioButton("NO", true); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; - gbc.insets = new Insets(0,COMPONENT_SPACE, + gbc.insets = new Insets(0,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mNo, gbc); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java index 890c8ce4b..abfa468a9 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java @@ -71,7 +71,7 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { return false; if (wizardInfo.isRAInstalled() && !wizardInfo.isCAInstalled()) { setBorder(makeTitledBorder(PANELNAME)); - if (wizardInfo.isKRAInstalled()) + if (wizardInfo.isKRAInstalled()) mHelpIndex = RAKRAHELPINDEX; else mHelpIndex = RAHELPINDEX; @@ -116,8 +116,8 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; wizardInfo.setCMHost(mHost); - wizardInfo.setCMPort(mPort); - wizardInfo.setCMTimeout(mTimeout); + wizardInfo.setCMPort(mPort); + wizardInfo.setCMTimeout(mTimeout); if ((wizardInfo.isCAInstalled() || wizardInfo.isRAInstalled()) && !wizardInfo.isKRAInstalled()) { @@ -180,9 +180,9 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { startProgressStatus(); CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONFIGDB"); - + boolean ready = configCertCgi.configCert(data); - + dlg.setVisible(false); endProgressStatus(); @@ -273,7 +273,7 @@ class WIRemoteCASubsystem extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(timeunitLbl, gbc); */ - + JLabel label = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java index 29beb04af..9014a23a0 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java @@ -71,7 +71,7 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { mWizardInfo = wizardInfo; if (wizardInfo.isServicesDone()) return false; - if ((wizardInfo.isCAInstalled() || wizardInfo.isRAInstalled()) + if ((wizardInfo.isCAInstalled() || wizardInfo.isRAInstalled()) && !wizardInfo.isKRAInstalled()) { setBorder(makeTitledBorder(PANELNAME)); if (mYes.isSelected()) @@ -124,8 +124,8 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { public boolean concludePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; wizardInfo.setDRMHost(mHost); - wizardInfo.setDRMPort(mPort); - wizardInfo.setDRMTimeout(mTimeout); + wizardInfo.setDRMPort(mPort); + wizardInfo.setDRMTimeout(mTimeout); ConsoleInfo consoleInfo = wizardInfo.getAdminConsoleInfo(); CMSConfigCert configCertCgi = new CMSConfigCert(); configCertCgi.initialize(wizardInfo); @@ -180,11 +180,11 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { data.put(ConfigConstants.KRA_HOST, wizardInfo.getDRMHost()); data.put(ConfigConstants.KRA_PORT, wizardInfo.getDRMPort()); data.put(ConfigConstants.KRA_TIMEOUT, wizardInfo.getDRMTimeout()); - data.put(ConfigConstants.REMOTE_KRA_ENABLED, + data.put(ConfigConstants.REMOTE_KRA_ENABLED, ConfigConstants.TRUE); wizardInfo.enableRemoteDRM(ConfigConstants.TRUE); - } else { - data.put(ConfigConstants.REMOTE_KRA_ENABLED, + } else { + data.put(ConfigConstants.REMOTE_KRA_ENABLED, ConfigConstants.FALSE); wizardInfo.enableRemoteDRM(ConfigConstants.FALSE); } @@ -196,7 +196,7 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CONFIGDB"); boolean ready = configCertCgi.configCert(data); dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -322,7 +322,7 @@ class WIRemoteKRASubsystem extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE); add(mTimeunitLbl, gbc); */ - + JLabel label = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.WEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java index df9bb1ab0..daf48f5d8 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java @@ -70,7 +70,7 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { enableAgreement(mEnable.isSelected()); } } - + private void enableAgreement(boolean e) { Color c; if (e) { @@ -108,13 +108,13 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { setBorder(makeTitledBorder(PANELNAME)); mAgreementText1.setText("masterToconsumer"); mAgreementText2.setText("consumerTomaster"); - return true; + return true; } return false; } public boolean validatePanel() { - if (!mEnable.isSelected()) + if (!mEnable.isSelected()) return true; String passwd1 = mManagerPwd1.getText().trim(); String passwdAgain1 = mManagerPwdAgain1.getText().trim(); @@ -124,7 +124,7 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { setErrorMessage("EMPTYPASSWORD"); return false; } - + if (!passwdAgain1.equals(passwd1)) { setErrorMessage("NOTSAMEPASSWORD"); return false; @@ -138,12 +138,12 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { String passwd2 = mManagerPwd2.getText().trim(); String passwdAgain2 = mManagerPwdAgain2.getText().trim(); String name2 = mAgreementText2.getText().trim(); - + if (passwd2.equals("") || passwdAgain2.equals("")) { setErrorMessage("EMPTYPASSWORD"); return false; } - + if (!passwdAgain2.equals(passwd2)) { setErrorMessage("NOTSAMEPASSWORD"); return false; @@ -177,7 +177,7 @@ class WIReplAgreementPage extends WizardBasePanel implements IWizardPanel { startProgressStatus(); /* - CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, + CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATEREPLICATIONAGREEMENT"); */ ready = send(rawData, wizardInfo); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java index e3f9c53f3..cd3aa83eb 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java @@ -46,7 +46,7 @@ public class WIRequestResultPage extends WizardBasePanel implements IWizardPanel protected String mHelpIndex = HELPINDEX; protected JTextArea mDesc; protected boolean print2RequestIDs = false; - + protected String mRequestId; WIRequestResultPage(JDialog parent) { @@ -77,7 +77,7 @@ public class WIRequestResultPage extends WizardBasePanel implements IWizardPanel String status = wizardInfo.getX509RequestStatus(); String str = wizardInfo.getX509RequestID(); String error = wizardInfo.getX509RequestError(); - + if (str != null && !str.equals("")) { if (status != null && status.equals(Constants.PR_REQUEST_REJECTED)) { // rejected @@ -92,10 +92,10 @@ public class WIRequestResultPage extends WizardBasePanel implements IWizardPanel } else if (error != null && !error.equals("")) mDesc.setText(error); else - mDesc.setText(mResource.getString(mPanelName+"_TEXT_DESC_LABEL") + + mDesc.setText(mResource.getString(mPanelName+"_TEXT_DESC_LABEL") + mResource.getString(mPanelName+"_TEXT_NOID_LABEL")); - return true; + return true; } public boolean validatePanel() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java index 3b7ba9d00..26b7bf0c1 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java @@ -36,14 +36,14 @@ class WISMTPPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "SMTPWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WISMTPPage() { super(PANELNAME); init(); } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean isLastPage() { diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java index 820c17646..6323127c6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java @@ -41,7 +41,7 @@ import com.netscape.management.client.util.*; * @see com.netscape.admin.certsrv.config.install */ class WISSLMessageDigestPage extends WMessageDigestPage { - + private static final String PANELNAME = "INSTALLSSLMESSAGEDIGESTWIZARD"; WISSLMessageDigestPage(JDialog parent) { @@ -66,12 +66,12 @@ class WISSLMessageDigestPage extends WMessageDigestPage { mCAKeyType = wizardInfo.getCAKeyType(); - return super.initializePanel(info); + return super.initializePanel(info); } public void getUpdateInfo(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - if (mDSAHashTypeBox.isVisible()) + if (mDSAHashTypeBox.isVisible()) wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem()); else wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem()); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java index b6ee85acc..4d10dbcf6 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java @@ -21,7 +21,7 @@ import com.netscape.admin.certsrv.wizard.*; import javax.swing.*; /** - * Subject DN page for SSL server certificate + * Subject DN page for SSL server certificate * * @author Christine Ho * @version $Revision$, $Date$ @@ -64,7 +64,7 @@ class WIServerCertDNPage extends WICertDNPage { CComp = wizardInfo.getRACComp(); } */ - + String OUComp = wizardInfo.getOUComponent(); String OComp = wizardInfo.getOComponent(); String LComp = wizardInfo.getLComponent(); @@ -94,7 +94,7 @@ class WIServerCertDNPage extends WICertDNPage { wizardInfo.setSSLSubjectName(str); populateDN(str); - if (wizardInfo.isSSLCertLocalCA()) + if (wizardInfo.isSSLCertLocalCA()) mHelpIndex = LOCALHELPINDEX; else mHelpIndex = REMOTEHELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java index f958c88a1..23f87205c 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java @@ -55,7 +55,7 @@ class WIServerCertExtensionPage extends WICertExtensionPage { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; if (wizardInfo.isCloning()) return false; - if (wizardInfo.isMigrationEnable() || + if (wizardInfo.isMigrationEnable() || wizardInfo.isSSLLocalCertDone() || wizardInfo.isSSLCertRequestDone() || wizardInfo.isSSLCertInstalledDone()) return false; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java index 417e706a5..4bf8550db 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java @@ -49,14 +49,14 @@ class WIServerCertSubmitPage extends WICertSubmitPage implements IWizardPanel { public boolean initializePanel(WizardInfo info) { InstallWizardInfo wizardInfo = (InstallWizardInfo)info; - wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, + wizardInfo.put(Constants.PR_CERTIFICATE_TYPE, Constants.PR_SERVER_CERT); if (wizardInfo.isCloning()) return false; - if (wizardInfo.isMigrationEnable() || - wizardInfo.isSSLCertRequestDone() || wizardInfo.isSSLCertInstalledDone() || + if (wizardInfo.isMigrationEnable() || + wizardInfo.isSSLCertRequestDone() || wizardInfo.isSSLCertInstalledDone() || !wizardInfo.isCAInstalled()) { wizardInfo.setSSLCertLocalCA(Constants.FALSE); return false; @@ -68,7 +68,7 @@ class WIServerCertSubmitPage extends WICertSubmitPage implements IWizardPanel { if (wizardInfo.isCAInstalled() && wizardInfo.isKRAInstalled()) { if (wizardInfo.isSSLCertLocalCA()) { mHelpIndex = CAKRALOCALHELPINDEX; - } else + } else mHelpIndex = CAKRAREMOTEHELPINDEX; } else if (wizardInfo.isSSLCertLocalCA()) { mHelpIndex = CALOCALHELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java index 047b9d7e8..d4513c156 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java @@ -37,7 +37,7 @@ import com.netscape.admin.certsrv.config.*; class WIServerCertValidityPage extends WICertValidityPage { private static final String PANELNAME = "INSTALLSERVERCERTVALIDWIZARD"; private static final String HELPINDEX = "install-sslcert-validity-wizard-help"; - + WIServerCertValidityPage(JDialog parent) { super(PANELNAME); mHelpIndex = HELPINDEX; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java index c14d0d2b3..dcf93aa83 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java @@ -38,9 +38,9 @@ import com.netscape.admin.certsrv.config.*; */ class WIServerKeyPage extends WIKeyPage implements IWizardPanel { private static final String PANELNAME = "INSTALLSERVERKEYWIZARD"; - private static final String LOCALHELPINDEX = + private static final String LOCALHELPINDEX = "install-serverkeylocal-configuration-wizard-help"; - private static final String REMOTEHELPINDEX = + private static final String REMOTEHELPINDEX = "install-serverkeysub-configuration-wizard-help"; WIServerKeyPage(JDialog parent) { @@ -77,7 +77,7 @@ class WIServerKeyPage extends WIKeyPage implements IWizardPanel { if (mWizardInfo.isSSLCertLocalCA()) mHelpIndex = LOCALHELPINDEX; - else + else mHelpIndex = REMOTEHELPINDEX; enableFields(); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java index fb524e62f..a9a56cc8e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java @@ -50,7 +50,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { "install-services-configuration-wizard-help"; private String mClonedSubsystem = null; - + WIServicesPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -116,19 +116,19 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { mOCSPCheckBox.setSelected(true); } else - mOCSPCheckBox.setEnabled(false); + mOCSPCheckBox.setEnabled(false); } - + Debug.println("WIServicesPage: initializePanel."); - Debug.println("WIServicesPage: mClonedSubsystem " + mClonedSubsystem); + Debug.println("WIServicesPage: mClonedSubsystem " + mClonedSubsystem); if (wizardInfo.isServicesDone()) return false; - setBorder(makeTitledBorder(PANELNAME)); + setBorder(makeTitledBorder(PANELNAME)); String subsystemList = wizardInfo.getSubsystems(); if (subsystemList == null || subsystemList.equals("")) { if (!mRACheckBox.isSelected() && mClonedSubsystem == null) @@ -169,7 +169,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { start = end+1; } while( start < subsystemList.length() ); - return true; + return true; } public boolean validatePanel() { @@ -261,7 +261,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { ConfigConstants.FALSE; wizardInfo.enableRemoteDRM(ConfigConstants.FALSE); startProgressStatus(); - + //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATESUB"); boolean ready = send(rawData, wizardInfo); //dlg.setVisible(false); @@ -341,7 +341,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mServiceLbl, gbc); - + mCACheckBox = makeJRadioButton("CA"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -387,7 +387,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); gbc.gridwidth = gbc.REMAINDER; add(mTKSCheckBox, gbc); - + JLabel dummy = new JLabel(" "); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -407,7 +407,7 @@ class WIServicesPage extends WizardBasePanel implements IWizardPanel { wizardInfo.setInstalledCA(ConfigConstants.FALSE); if (mRACheckBox.isSelected()) wizardInfo.setInstalledRA(ConfigConstants.TRUE); - else + else wizardInfo.setInstalledRA(ConfigConstants.FALSE); if (mKRACheckBox.isSelected()) wizardInfo.setInstalledKRA(ConfigConstants.TRUE); diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java index 49e06ac1e..3241ca98e 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java @@ -69,7 +69,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl protected String mSection = ""; protected String mErrorMsg = ""; private ConsoleInfo _consoleInfo = null; - + WISingleSignonPage(JDialog parent) { super(PANELNAME); mParent = parent; @@ -92,7 +92,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl String tokenList = wizardInfo.getTokensList(); StringTokenizer st1 = new StringTokenizer(tokenList, ":"); - + mTokenBox.removeAllItems(); while (st1.hasMoreElements()) { String t1 = (String)st1.nextElement(); @@ -116,7 +116,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl capassword = ""; ca = false; } - + if (wizardInfo.isRAInstalled()) { tokenname = wizardInfo.getRATokenName(); password = (String)wizardInfo.get("TOKEN:"+tokenname); @@ -153,7 +153,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl sslpassword = password; } setBorder(makeTitledBorder(PANELNAME)); - return true; + return true; } public boolean validatePanel() { @@ -351,25 +351,25 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl rawData = rawData+"&"+tokenname+"="+capassword; tags = tags+":"+tokenname; } - + if (!rapassword.equals("")) { tokenname = wizardInfo.getRATokenName(); rawData = rawData+"&"+tokenname+"="+rapassword; tags = tags+":"+tokenname; } - + if (!krapassword.equals("")) { tokenname = wizardInfo.getKRATokenName(); rawData = rawData+"&"+tokenname+"="+krapassword; tags = tags+":"+tokenname; } - + if (!sslpassword.equals("")) { tokenname = wizardInfo.getSSLTokenName(); rawData = rawData+"&"+tokenname+"="+sslpassword; tags = tags+":"+tokenname; } - + if (mPasswordConf.isSelected()) { rawData = rawData+"&"+ConfigConstants.PR_DELETE_PASSWD_CONF+"="+ ConfigConstants.TRUE; @@ -379,17 +379,17 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl } rawData = rawData+"&"+ConfigConstants.PR_SINGLE_SIGNON_PW_TAGS+"="+tags; //data.put(ConfigConstants.PR_SINGLE_SIGNON, ConfigConstants.FALSE); - + startProgressStatus(); //CMSMessageBox dlg = new CMSMessageBox(mAdminFrame, "CGITASK", "CREATESSON"); - + // boolean ready = send(rawData, wizardInfo); boolean ready = true; if (ready) { rawData = ConfigConstants.TASKID+"="+TaskId.TASK_MISCELLANEOUS; /* - data.put(ConfigConstants.PR_ADMIN_PASSWD, + data.put(ConfigConstants.PR_ADMIN_PASSWD, (String)consoleInfo.get(ConfigConstants.PR_ADMIN_PASSWD)); */ ready = send(rawData, wizardInfo); @@ -402,7 +402,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl } else setErrorMessage(str); //dlg.setVisible(false); - + endProgressStatus(); return false; } @@ -410,7 +410,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl //startServer(wizardInfo); //dlg.setVisible(false); - + endProgressStatus(); if (!ready) { @@ -458,7 +458,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl gbc.weightx = 1.0; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); - add(panel1, gbc); + add(panel1, gbc); */ JTextArea heading = createTextArea(mResource.getString( @@ -494,7 +494,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl gbc.weightx = 1.0; gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, 0); add(dum, gbc); - + JTextArea passwordConfText = createTextArea(mResource.getString( PANELNAME+"_TEXT_PASSWDCONF_LABEL")); CMSAdminUtil.resetGBC(gbc); @@ -506,7 +506,7 @@ class WISingleSignonPage extends WizardBasePanel implements IWizardPanel, CommCl gbc.gridwidth = gbc.REMAINDER; add(passwordConfText, gbc); - mPasswordConf = makeJCheckBox("PASSWDCONF"); + mPasswordConf = makeJCheckBox("PASSWDCONF"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; gbc.weightx = 1.0; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java index b3ecdbf5a..5be9c09af 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java @@ -29,7 +29,7 @@ import com.netscape.admin.certsrv.task.*; import com.netscape.management.client.console.*; /** - * This panel asks for the information of the current internal database. + * This panel asks for the information of the current internal database. * * @author Christine Ho * @version $Revision$, $Date$ @@ -78,7 +78,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { } index++; } - + if (inits.equals(Constants.FALSE)) { mDesc.setText(mResource.getString(mPanelName+"_TEXT_INIT_LABEL")); enableFields(mPasswordAgainLabel, mPasswordAgainText, true, mActiveColor); @@ -92,7 +92,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { mTokenText.setBackground(getBackground()); CMSAdminUtil.repaintComp(mTokenText); - return true; + return true; } public boolean validatePanel() { @@ -204,7 +204,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, 0, COMPONENT_SPACE, COMPONENT_SPACE); add(passwordLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; @@ -222,7 +222,7 @@ class WITokenLogonPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE, COMPONENT_SPACE); add(mPasswordAgainLabel, gbc); - + CMSAdminUtil.resetGBC(gbc); mPasswordAgainText = makeJPasswordField(30); gbc.anchor = gbc.NORTHWEST; diff --git a/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java b/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java index cd19963ff..8f6d449b5 100644 --- a/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java +++ b/base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java @@ -37,7 +37,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { private static final String PANELNAME = "TRUSTDBWIZARD"; private static final String HELPINDEX = "configuration-kra-wizard-change-keyscheme-help"; - + WITrustDBPage() { super(PANELNAME); init(); @@ -48,7 +48,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { } public boolean initializePanel(WizardInfo info) { - return true; + return true; } public boolean validatePanel() { @@ -88,7 +88,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(passwdLbl, gbc); - + mPassword = makeJPasswordField(20); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHWEST; @@ -104,7 +104,7 @@ class WITrustDBPage extends WizardBasePanel implements IWizardPanel { gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, COMPONENT_SPACE,COMPONENT_SPACE); add(dummy, gbc); - + JLabel passwdAgainLbl = makeJLabel("PASSWDAGAIN"); CMSAdminUtil.resetGBC(gbc); gbc.anchor = gbc.NORTHEAST; |