diff options
Diffstat (limited to 'base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java')
-rw-r--r-- | base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java | 42 |
1 files changed, 21 insertions, 21 deletions
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; |