summaryrefslogtreecommitdiffstats
path: root/base/console/src
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-04-05 14:49:11 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-04-09 10:03:25 -0500
commit7c7b9d023cd466c1771068badc020dab36beb553 (patch)
tree178877eb83e25336be7577953945fbdb0b9e1a15 /base/console/src
parentda1e6e2f49f66fd46c8039ff1aa4386309fba8f4 (diff)
downloadpki-7c7b9d023cd466c1771068badc020dab36beb553.tar.gz
pki-7c7b9d023cd466c1771068badc020dab36beb553.tar.xz
pki-7c7b9d023cd466c1771068badc020dab36beb553.zip
Removed whitespaces from Java code.
Whitespaces in Java code have been removed with the following command: find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \; Ticket #134
Diffstat (limited to 'base/console/src')
-rw-r--r--base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSAdmin.java56
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java320
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java92
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java22
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java48
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java62
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSPassword.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java32
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java26
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java50
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/Console.java40
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CustomComboBox.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/EAdminException.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/IRefreshTab.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/IUIMapper.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java30
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java34
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java20
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java82
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java52
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java36
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java36
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java20
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java242
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java30
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java82
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java54
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java20
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java26
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java36
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java82
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java26
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java20
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java26
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java118
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java30
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java48
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java66
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java66
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java56
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java34
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java32
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java50
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java38
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java28
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java22
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java20
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/InstallWizard.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/InstallWizardInfo.java66
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIAdminPage.java28
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIAllCertsInstalledPage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACert1CustomPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACert1Page.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACert2Page.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACertDNPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACertExtensionPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACertPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACertSubmitPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICACertValidityPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICAKeyPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICAMessageDigestPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICAOCSPServicePage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICASerialNumberPage.java42
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICertDNPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICertExtensionPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICertRequestPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICertSetupStatusPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICertSubmitPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICertValidityPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICloneCAKeyCertPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICloneKRAKeyCertPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICloneMasterPage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICloneOCSPKeyCertPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIClonePage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICloneRAKeyCertPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICloneTKSKeyCertPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIConfigWebServerPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WICreateInternalDBPage.java40
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIDBEnrollPage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCACertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayCertPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayKRACertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayOCSPCertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIDisplayRACertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIDisplaySSLCertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIExistingDBPage.java22
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenCAKeyCertReqPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenKRAKeyCertReqPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenKeyCertReqPage.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenOCSPKeyCertReqPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenRAKeyCertReqPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenSSLKeyCertReqPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIGenServerKeyCertPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert1Page.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCert2Page.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInstallCertStatusPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInstallIntroPage.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInstallKRACertStatusPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInstallOCSPCertStatusPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInstallRACertStatusPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBInfoPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInternalDBPage.java26
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIInternalTokenLogonPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIIntroMigrationPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIIntroPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIIntroSingleSignonPage.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertDNPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertExtensionPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertSubmitPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRACertValidityPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRAMessageDigestPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRANumberPage.java38
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme1Page.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRAScheme2Page.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKRAStorageKeyPage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIKeyPage.java28
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WILDAPPublishingPage.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WILoggingPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WILogonAllTokensPage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIManualCertRequestPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIManualKRACertRequestPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIManualOCSPCertRequestPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIManualRACertRequestPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIMasterOrClone.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIMigrationPage.java46
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WINetworkPage.java38
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertDNPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPCertSubmitPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPKeyPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIOCSPMessageDigestPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCACertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIPasteCertPage.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIPasteOCSPCertPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIPasteRACertPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRACertDNPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRACertExtensionPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRACertSubmitPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRACertValidityPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRAKeyPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRAMessageDigestPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRecreateDBPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteCASubsystem.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRemoteKRASubsystem.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIReplAgreementPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIRequestResultPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WISMTPPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WISSLMessageDigestPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertDNPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertExtensionPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertSubmitPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIServerCertValidityPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIServerKeyPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WIServicesPage.java20
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WISingleSignonPage.java32
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WITokenLogonPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/config/install/WITrustDBPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java40
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/IConnection.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java60
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/Request.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/Response.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java34
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java48
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java12
-rw-r--r--base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java18
-rw-r--r--base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CGITask.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java30
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java28
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java44
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java84
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java30
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSStart.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java38
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java22
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/CMSStop.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java10
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java6
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java4
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java8
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java44
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java30
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java24
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java2
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java34
-rw-r--r--base/console/src/com/netscape/admin/certsrv/ug/UserTab.java22
-rw-r--r--base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java16
-rw-r--r--base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java14
-rw-r--r--base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java8
-rw-r--r--base/console/src/com/netscape/certsrv/common/ConfigConstants.java10
-rw-r--r--base/console/src/com/netscape/certsrv/common/Constants.java82
-rw-r--r--base/console/src/com/netscape/certsrv/common/PrefixDef.java4
-rw-r--r--base/console/src/com/netscape/certsrv/common/ScopeDef.java14
-rw-r--r--base/console/src/com/netscape/certsrv/common/TaskId.java4
366 files changed, 2950 insertions, 2950 deletions
diff --git a/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
index 863e42197..1c5882b6f 100644
--- a/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/AttrCellRenderer.java
@@ -48,7 +48,7 @@ public class AttrCellRenderer extends JLabel implements ListCellRenderer {
setHorizontalAlignment(((JLabel)value).getHorizontalAlignment());
} else {
if (value instanceof String) {
- setText((String) value);
+ setText((String) value);
} else {
setText(value.toString());
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java b/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
index 6e88cc276..94bb266d1 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSAdmin.java
@@ -83,7 +83,7 @@ public class CMSAdmin extends AbstractServerObject
if (mActiveFrame == null)
mActiveFrame = UtilConsoleGlobals.getActivatedFrame();
mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName());
- // STATUS_UPDATE_INTERVAL = 1500000;
+ // STATUS_UPDATE_INTERVAL = 1500000;
}
/*==========================================================
@@ -303,7 +303,7 @@ public class CMSAdmin extends AbstractServerObject
}
}
- /**
+ /**
* Enable/Disable start/stop action menu.
*/
private void enableStartStop(IPage viewInstance) {
@@ -348,12 +348,12 @@ public class CMSAdmin extends AbstractServerObject
// moved from WIIntroPage.java
data.put(ConfigConstants.TASKID,TaskId.TASK_GET_DEFAULT_INFO);
data.put(ConfigConstants.OPTYPE, OpDef.OP_READ);
- data.put(ConfigConstants.PR_CERT_INSTANCE_NAME,
+ data.put(ConfigConstants.PR_CERT_INSTANCE_NAME,
mConsoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME));
// #344791 - help server to make up the hostname
- data.put(ConfigConstants.PR_HOST,
- mConsoleInfo.get(ConfigConstants.PR_HOST));
- data.put(ConfigConstants.PR_SERVER_ROOT,
+ data.put(ConfigConstants.PR_HOST,
+ mConsoleInfo.get(ConfigConstants.PR_HOST));
+ data.put(ConfigConstants.PR_SERVER_ROOT,
mConsoleInfo.get(ConfigConstants.PR_SERVER_ROOT));
return data;
}
@@ -392,7 +392,7 @@ public class CMSAdmin extends AbstractServerObject
data.clear();
data = null;
boolean isInfoReady = false;
-
+
if (success) {
InstallWizardInfo wizardInfo =
new InstallWizardInfo(mConsoleInfo);
@@ -404,7 +404,7 @@ public class CMSAdmin extends AbstractServerObject
data = createWizardInfo();
isInfoReady = configCertCgi.configCert(data);
Debug.println("CMSAdmin: isInfoReady = "+isInfoReady);
-
+
if (isInfoReady) {
JFrame frame = new JFrame();
Cursor cursor = new Cursor(Cursor.HAND_CURSOR);
@@ -529,7 +529,7 @@ public class CMSAdmin extends AbstractServerObject
ex.getMessage(), CMSAdminUtil.ERROR_MESSAGE);
return false;
}
-
+
//LOAD UI FRAMEWORK
try {
@@ -592,7 +592,7 @@ public class CMSAdmin extends AbstractServerObject
Debug.println("Check server status");
if (getConsoleInfo().getCurrentDN() == null) {
return STATUS_STARTED;
- } else {
+ } else {
if ( mPort == 0) {
mServerStatus = STATUS_UNKNOWN;
return STATUS_UNKNOWN;
@@ -633,7 +633,7 @@ public class CMSAdmin extends AbstractServerObject
* @return The Certificate Server status.
*/
public boolean getStatusFromAgentPort() {
-
+
if (mPort == 0) {
getInfo(getConsoleInfo().getCurrentDN());
if (mPort == 0) {
@@ -641,7 +641,7 @@ public class CMSAdmin extends AbstractServerObject
return false;
}
}
-
+
//check if ssl port is functional
try {
if ((mServerInfo == null) || (mServerInfo.getPort() == 0)) {
@@ -649,9 +649,9 @@ public class CMSAdmin extends AbstractServerObject
mServerInfo = new CMSServerInfo(mHost, mPort, "", "",
mServerID, mInstallationDate, mServerVersion, mServerRoot, path);
}
-
+
mServerInfo.ping();
-
+
} catch (EAdminException e) {
Debug.println("CMSAdmin: getServerStatus() -"+e.toString());
if (e.getMessageString().equals(CMSAdminResources.SERVER_NORESPONSE) ||
@@ -666,7 +666,7 @@ public class CMSAdmin extends AbstractServerObject
// mServerStatus = STATUS_UNKNOWN;
return false;
}
-
+
Debug.println("CMSAdmin: getServerStatus() -OK");
// mServerStatus = STATUS_STARTED;
return true;
@@ -706,7 +706,7 @@ public class CMSAdmin extends AbstractServerObject
boolean status = task.run( null );
Debug.println("remove run");
Debug.println("Remove server status: "+ status);
- String instance = (String) mConsoleInfo.get("ServerInstance");
+ String instance = (String) mConsoleInfo.get("ServerInstance");
if (null == instance) {
instance = "";
}
@@ -718,7 +718,7 @@ public class CMSAdmin extends AbstractServerObject
String[] attrs = { "*", "numsubordinates" };
String sieDN = mConsoleInfo.getCurrentDN();
Debug.println("removeServer:sieDN:" + sieDN);
-
+
LDAPEntry sieEntry = null;
try {
sieEntry = ldc.read( sieDN, attrs );
@@ -732,7 +732,7 @@ public class CMSAdmin extends AbstractServerObject
args);
_removed = false; // remove failed
*/
- return false;
+ return false;
}
if (sieEntry != null ) {
try {
@@ -762,7 +762,7 @@ public class CMSAdmin extends AbstractServerObject
DSUtil.showInformationDialog(_info.getFrame(), "121",
(String)null) ;
}
-
+
*/
}
// CMSAdminUtil.showMessageDialog(mConsoleInfo.getFrame(), mResource, PREFIX,
@@ -772,9 +772,9 @@ public class CMSAdmin extends AbstractServerObject
- private boolean delete_sieTree (LDAPEntry entry )
+ private boolean delete_sieTree (LDAPEntry entry )
throws LDAPException {
-
+
LDAPConnection ldc = mConsoleInfo.getLDAPConnection();
boolean ret = false;
@@ -785,13 +785,13 @@ public class CMSAdmin extends AbstractServerObject
search_results = ldc.search( dn,
LDAPConnection.SCOPE_ONE,
"(objectClass=*)", attrs, false );
-
+
while ( search_results.hasMoreElements() ) {
/* Get the next child */
LDAPEntry child_entry =
(LDAPEntry)search_results.nextElement();
ret = delete_sieTree( child_entry );
-
+
}
}
ldc.delete(dn);
@@ -817,14 +817,14 @@ public class CMSAdmin extends AbstractServerObject
private boolean remove_serverInstance (String sieDN ) {
-
+
LDAPSearchResults search_results = null;
String baseDN =(String) mConsoleInfo.get("BaseDN");
LDAPConnection ldc = mConsoleInfo.getLDAPConnection();
String[] attrs = { "*", "uniquemember" };
String filter = "(&(objectclass=groupOfUniquenames)(uniquemember=" +
sieDN+"))";
-
+
try {
search_results = ldc.search( baseDN, ldc.SCOPE_SUB,
filter, attrs, false);
@@ -836,7 +836,7 @@ public class CMSAdmin extends AbstractServerObject
while ( search_results.hasMoreElements() ) {
// need to remove the reference to the sieDN from
// this entry.
-
+
entry = (LDAPEntry)search_results.nextElement();
String eDN = (String) entry.getDN();
// Now we need to modify the entry to delete the
@@ -845,7 +845,7 @@ public class CMSAdmin extends AbstractServerObject
}
return true;
}
-
+
private boolean remove_intstanceFromEntry ( LDAPConnection ldc,
String eDN, String sieDN ) {
@@ -853,7 +853,7 @@ public class CMSAdmin extends AbstractServerObject
LDAPAttribute attUmember = new LDAPAttribute("uniquemember", sieDN);
Debug.println("DSAdmin:remove_intstanceFromEntry: Modifying entry:" +
eDN);
- mods.add( LDAPModification.DELETE, attUmember );
+ mods.add( LDAPModification.DELETE, attUmember );
try {
ldc.modify(eDN, mods );
} catch ( LDAPException e ) {
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
index af2ba4c91..7251a9df8 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSAdminResources.java
@@ -86,7 +86,7 @@ public class CMSAdminResources extends ResourceBundle {
public static final String IMAGE_ACLOBJECT = "aclobj.gif";
public static final String IMAGE_ACL = "acl.gif";
public static final String IMAGE_ACLPLUGIN = "aclplugin.gif";
-
+
//dialog icons
public static final String IMAGE_INFO_ICON = "messagel.gif";
public static final String IMAGE_ERROR_ICON = "error.gif";
@@ -137,25 +137,25 @@ public class CMSAdminResources extends ResourceBundle {
public final static String MENU_NEW_EXTENSION = "NEW_EXTENSION";
public final static String MENU_NEW_POLICY = "NEW_POLICY";
public final static String MENU_PERMISSION = "PERMISSION";
- public final static String MENU_CONFIGURE_SERVER = "Configure Server";
- public final static String MENU_CONFIGURE_SERVER_DESC = "Configure the Server";
- public final static String MENU_START_SERVER = "Start Server";
- public final static String MENU_START_SERVER_DESC = "Start the Server";
- public final static String MENU_REMOVE_SERVER = "Remove Server";
- public final static String MENU_REMOVE_SERVER_DESC = "Remove the Server";
+ public final static String MENU_CONFIGURE_SERVER = "Configure Server";
+ public final static String MENU_CONFIGURE_SERVER_DESC = "Configure the Server";
+ public final static String MENU_START_SERVER = "Start Server";
+ public final static String MENU_START_SERVER_DESC = "Start the Server";
+ public final static String MENU_REMOVE_SERVER = "Remove Server";
+ public final static String MENU_REMOVE_SERVER_DESC = "Remove the Server";
public final static String MENU_STOP_SERVER = "Stop Server";
public final static String MENU_STOP_SERVER_DESC = "Stop the Server";
public final static String MENU_RESTART_SERVER = "Restart Server";
public final static String MENU_RESTART_SERVER_DESC = "Restart the Server";
- public final static String PROP_FILE =
+ public final static String PROP_FILE =
"CMSAdminRS";
public CMSAdminResources()
{
mResourceSet = new ThisResourceSet(PROP_FILE);
- mResourceBundle = mResourceSet.getThisBundle(PROP_FILE,
+ mResourceBundle = mResourceSet.getThisBundle(PROP_FILE,
Locale.getDefault());
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java b/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
index 107de427b..1f03c0213 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSAdminUtil.java
@@ -45,30 +45,30 @@ public class CMSAdminUtil {
/*==========================================================
* variables
*==========================================================*/
- public static final int DEFAULT_TEXTFIELD_WIDTH = 30;
+ public static final int DEFAULT_TEXTFIELD_WIDTH = 30;
public static final int COMPONENT_SPACE = SuiLookAndFeel.COMPONENT_SPACE;
- public static final int SEPARATED_COMPONENT_SPACE =
+ public static final int SEPARATED_COMPONENT_SPACE =
SuiLookAndFeel.SEPARATED_COMPONENT_SPACE;
- public static final int DIFFERENT_COMPONENT_SPACE =
+ public static final int DIFFERENT_COMPONENT_SPACE =
SuiLookAndFeel.DIFFERENT_COMPONENT_SPACE;
- public static final int HELP_BUTTON_OFFSET = 9;
-
+ public static final int HELP_BUTTON_OFFSET = 9;
+
public static final int DEFAULT_BUTTON_SIZE = 72;
-
+
final public static Dimension DEFAULT_PANEL_SIZE = new Dimension(350,440);
final public static int DEFAULT_PADDING = SuiLookAndFeel.COMPONENT_SPACE;
private static final int DEFAULT_WIDTH = 40;
final public static Insets DEFAULT_EMPTY_INSETS = new Insets(0,0,0,0);
public static final Insets DEAFULT_END_INSETS = new Insets(COMPONENT_SPACE,
COMPONENT_SPACE,COMPONENT_SPACE,COMPONENT_SPACE);
-
+
public static final int WARNING_MESSAGE = JOptionPane.WARNING_MESSAGE;
public static final int ERROR_MESSAGE = JOptionPane.ERROR_MESSAGE;
public static final int INFORMATION_MESSAGE = JOptionPane.INFORMATION_MESSAGE;
public static final int OK_OPTION = JOptionPane.OK_OPTION;
public static final int NO_OPTION = JOptionPane.NO_OPTION;
public static final int CANCEL_OPTION = JOptionPane.CANCEL_OPTION;
-
+
private static Hashtable mPackageImages = new Hashtable(); //image container
private static final ResourceSet mHelpResource =
new ResourceSet("com.netscape.admin.certsrv.certsrv-help");
@@ -81,7 +81,7 @@ public class CMSAdminUtil {
/*==========================================================
* Utilities methods
*==========================================================*/
-
+
/**
* Utility function to retrieve images from the package image
* class path.
@@ -139,7 +139,7 @@ public class CMSAdminUtil {
component.repaint(1);
}
- public static void enableJTextField(JTextComponent component,
+ public static void enableJTextField(JTextComponent component,
boolean enable, Color color) {
component.setEnabled(enable);
component.setEditable(enable);
@@ -190,7 +190,7 @@ public class CMSAdminUtil {
}
public static void addComponents(JPanel panel, JComponent comp1,
- JComponent comp2, JComponent comp3, JComponent comp4,
+ JComponent comp2, JComponent comp3, JComponent comp4,
GridBagConstraints gbc) {
double weighty = gbc.weighty;
CMSAdminUtil.resetGBC(gbc);
@@ -223,7 +223,7 @@ public class CMSAdminUtil {
* Add a label and a textfield to a panel, assumed to be using
* GridBagLayout.
*/
- public static void addEntryField(JPanel panel, JComponent label,
+ public static void addEntryField(JPanel panel, JComponent label,
JComponent field, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -247,7 +247,7 @@ public class CMSAdminUtil {
* Add 3 components in the same row to a panel, assumed to be using
* GridBagLayout.
*/
- public static void addEntryField(JPanel panel, JComponent field1,
+ public static void addEntryField(JPanel panel, JComponent field1,
JComponent field2, JComponent field3, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -274,12 +274,12 @@ public class CMSAdminUtil {
0,DIFFERENT_COMPONENT_SPACE);
panel.add( field3, gbc );
}
-
+
/**
* Add 4 components in the same row to a panel, assumed to be using
* GridBagLayout.
*/
- public static void addEntryField(JPanel panel, JComponent field1,
+ public static void addEntryField(JPanel panel, JComponent field1,
JComponent field2, JComponent field3, JComponent field4, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -304,7 +304,7 @@ public class CMSAdminUtil {
gbc.anchor = gbc.EAST;
gbc.insets = new Insets(COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0);
panel.add( field3, gbc );
-
+
gbc.gridx++;
gbc.anchor = gbc.WEST;
gbc.fill = gbc.HORIZONTAL;
@@ -460,7 +460,7 @@ public class CMSAdminUtil {
}
return ret;
}
-
+
public static String certRequestWrapText(String s, int width) {
String ret = "";
StringTokenizer tokenizer = new StringTokenizer(s, "\n");
@@ -470,7 +470,7 @@ public class CMSAdminUtil {
String endCert = "";
String content = "";
while(tokenizer.hasMoreTokens()) {
- String sToken = (String)tokenizer.nextToken();
+ String sToken = (String)tokenizer.nextToken();
if (index == 1) {
beginCert = sToken;
} else if (index == numTokens) {
@@ -523,7 +523,7 @@ public class CMSAdminUtil {
/**
* Find out the table width to be used
- *
+ *
* @table JTable object
*/
public static int getTotalColumnWidth( JTable table ) {
@@ -540,14 +540,14 @@ public class CMSAdminUtil {
/*==========================================================
* Component Factory
*==========================================================*/
-
+
//==== BORDER CREATION ====================================
public static Border makeEtchedBorder() {
Border margin = new EmptyBorder(0,0,
SuiLookAndFeel.VERT_WINDOW_INSET,0);
- return new CompoundBorder(BorderFactory.createEtchedBorder(), margin);
+ return new CompoundBorder(BorderFactory.createEtchedBorder(), margin);
}
-
+
public static Border makeTitledBorder(ResourceBundle resource,
String panelName,
String keyword) {
@@ -559,31 +559,31 @@ public class CMSAdminUtil {
}
return new TitledBorder(title);
}
-
- //==== DIALOG CREATION ====================================
-
+
+ //==== DIALOG CREATION ====================================
+
public static void showMessageDialog(ResourceBundle resource,
String panelName,
- String keyword,
+ String keyword,
int messageType ) {
- showMessageDialog(UtilConsoleGlobals.getActivatedFrame(), resource, panelName, keyword, messageType);
+ showMessageDialog(UtilConsoleGlobals.getActivatedFrame(), resource, panelName, keyword, messageType);
}
-
+
public static void showMessageDialog(JFrame frame,
- String title,
- String msg,
+ String title,
+ String msg,
int messageType ) {
Icon icon;
if (messageType != ERROR_MESSAGE)
- icon = getImage(CMSAdminResources.IMAGE_INFO_ICON);
+ icon = getImage(CMSAdminResources.IMAGE_INFO_ICON);
else
icon = getImage(CMSAdminResources.IMAGE_ERROR_ICON);
-
+
JOptionPane.showMessageDialog(
frame,
CMSAdminUtil.wrapText(msg),
- title,
- messageType,
+ title,
+ messageType,
icon);
}
@@ -593,7 +593,7 @@ public class CMSAdminUtil {
public static void showMessageDialog(JFrame frame,
ResourceBundle resource,
String panelName,
- String keyword,
+ String keyword,
int messageType ) {
String msg, title;
try {
@@ -606,32 +606,32 @@ public class CMSAdminUtil {
} catch (MissingResourceException e) {
title = "Missing Title";
}
-
+
Icon icon;
if (messageType != ERROR_MESSAGE)
- icon = getImage(CMSAdminResources.IMAGE_INFO_ICON);
+ icon = getImage(CMSAdminResources.IMAGE_INFO_ICON);
else
icon = getImage(CMSAdminResources.IMAGE_ERROR_ICON);
-
+
JOptionPane.showMessageDialog(
frame,
CMSAdminUtil.wrapText(msg),
- title,
- messageType,
+ title,
+ messageType,
icon);
}
-
- public static void showErrorDialog(ResourceBundle resource,
+
+ public static void showErrorDialog(ResourceBundle resource,
String message,
- int messageType) {
- showErrorDialog(new JFrame(), resource, message, messageType);
+ int messageType) {
+ showErrorDialog(new JFrame(), resource, message, messageType);
}
-
+
/**
* Creating error dialog box for display
*/
public static void showErrorDialog(JFrame frame,
- ResourceBundle resource,
+ ResourceBundle resource,
String message,
int messageType) {
String title;
@@ -643,19 +643,19 @@ public class CMSAdminUtil {
JOptionPane.showMessageDialog(
frame,
CMSAdminUtil.wrapText(message),
- title,
- messageType,
+ title,
+ messageType,
getImage(CMSAdminResources.IMAGE_ERROR_ICON));
}
-
+
public static int showConfirmDialog( ResourceBundle resource,
String panelName,
- String keyword,
- int messageType )
+ String keyword,
+ int messageType )
{
- return showConfirmDialog(new JFrame(), resource, panelName, keyword, messageType);
+ return showConfirmDialog(new JFrame(), resource, panelName, keyword, messageType);
}
-
+
public static int showConfirmDialog( ResourceBundle resource,
String panelName,
String keyword, String[] params,
@@ -667,12 +667,12 @@ public class CMSAdminUtil {
/**
* Creating confirm dialog box for display
- */
+ */
public static int showConfirmDialog( JFrame frame,
ResourceBundle resource,
String panelName,
- String keyword,
- int messageType )
+ String keyword,
+ int messageType )
{
String msg, title;
try {
@@ -685,15 +685,15 @@ public class CMSAdminUtil {
} catch (MissingResourceException e) {
title = "Missing Title";
}
-
+
return JOptionPane.showConfirmDialog(
frame,
CMSAdminUtil.wrapText(msg), title,
JOptionPane.YES_NO_OPTION,
messageType,
getImage(CMSAdminResources.IMAGE_WARN_ICON));
- }
-
+ }
+
public static int showConfirmDialog(JFrame frame, ResourceBundle resource,
String panelName, String keyword, String[] params, int messageType )
{
@@ -722,26 +722,26 @@ public class CMSAdminUtil {
messageType,
getImage(CMSAdminResources.IMAGE_WARN_ICON));
}
-
+
//==== LABEL CREATION ================================
-
+
/**
* Factory Method to create LABEL using specified params
*/
- public static JLabel makeJLabel(ResourceBundle resource,
- String panelName,
+ public static JLabel makeJLabel(ResourceBundle resource,
+ String panelName,
String keyword,
Icon icon)
{
return makeJLabel(resource, panelName, keyword, icon, -1);
}
-
-
+
+
/**
* Factory Method to create LABEL using specified params
*/
- public static JLabel makeJLabel(ResourceBundle resource,
- String panelName,
+ public static JLabel makeJLabel(ResourceBundle resource,
+ String panelName,
String keyword,
Icon icon,
int alignment)
@@ -759,32 +759,32 @@ public class CMSAdminUtil {
if (title != null)
label.setText(title);
if (alignment != -1)
- label.setHorizontalAlignment(alignment);
+ label.setHorizontalAlignment(alignment);
//setToolTip(resource, panelName, "LABEL_"+keyword, label);
-
+
return label;
- }
-
-
+ }
+
+
//==== TEXTFIELD CREATION ================================
-
+
/**
* Factory Method to create TextFiled using specified params
*/
- public static JTextField makeJTextField(Document d,
- String s,
+ public static JTextField makeJTextField(Document d,
+ String s,
int len,
Object listener) {
-
- JTextField pf = new JTextField(DEFAULT_TEXTFIELD_WIDTH){
+
+ JTextField pf = new JTextField(DEFAULT_TEXTFIELD_WIDTH){
public void setEnabled( boolean enabled ) {
super.setEnabled( enabled );
//super.setEditable(enabled);
super.setBackground( enabled ? Color.white: SystemColor.window);
- }
- };
- pf.setEnabled( true );
-
+ }
+ };
+ pf.setEnabled( true );
+
if (d != null)
pf.setDocument(d);
if (s != null)
@@ -794,17 +794,17 @@ public class CMSAdminUtil {
pf.addActionListener((ActionListener)listener);
//detect text changes
- pf.getDocument().addDocumentListener((DocumentListener)listener);
+ pf.getDocument().addDocumentListener((DocumentListener)listener);
return pf;
- }
-
+ }
+
//==== PASSWORD FIELD CREATION ================================
-
+
/**
* Factory Method to create Password Filed using specified params
*/
- public static JPasswordField makeJPasswordField(Document d,
- String s,
+ public static JPasswordField makeJPasswordField(Document d,
+ String s,
int len,
Object listener) {
JPasswordField pf = new JPasswordField(DEFAULT_TEXTFIELD_WIDTH) {
@@ -813,8 +813,8 @@ public class CMSAdminUtil {
super.setEditable(enabled);
setBackground( enabled ? Color.white: SystemColor.window);
this.repaint();
- }
- };
+ }
+ };
pf.setEnabled( true );
if (d != null)
pf.setDocument(d);
@@ -825,13 +825,13 @@ public class CMSAdminUtil {
pf.addActionListener((ActionListener)listener);
//detect text changes
- pf.getDocument().addDocumentListener((DocumentListener)listener);
+ pf.getDocument().addDocumentListener((DocumentListener)listener);
return pf;
- }
-
-
+ }
+
+
//==== LIST CREATION ================================
-
+
/**
* Factory Method to create a list box mode specified with specific
* visible row count. Special cell renderer is used to display each cell.
@@ -845,14 +845,14 @@ public class CMSAdminUtil {
listbox.setSelectedIndex(0);
return listbox;
}
-
+
//===== CHECKBOX CREATION =======================
-
+
/**
* Factory Method to create CheckBox using specified params
*/
- public static JCheckBox makeJCheckBox(ResourceBundle resource,
- String panelName,
+ public static JCheckBox makeJCheckBox(ResourceBundle resource,
+ String panelName,
String keyword,
Icon icon,
boolean select,
@@ -864,7 +864,7 @@ public class CMSAdminUtil {
} catch (MissingResourceException e) {
label = "Missing Label";
}
-
+
JCheckBox button = new JCheckBox();
if (label != null)
button.setText(label);
@@ -873,17 +873,17 @@ public class CMSAdminUtil {
button.setSelected(select);
button.addActionListener(listener);
//setToolTip(resource, panelName, "CHECKBOX_"+keyword, button);
-
+
return button;
- }
-
+ }
+
//===== RADIO BUTTON CREATION =======================
-
+
/**
* Factory Method to create Radio Button using specified params
*/
- public static JRadioButton makeJRadioButton(ResourceBundle resource,
- String panelName,
+ public static JRadioButton makeJRadioButton(ResourceBundle resource,
+ String panelName,
String keyword,
Icon icon,
boolean select,
@@ -895,7 +895,7 @@ public class CMSAdminUtil {
} catch (MissingResourceException e) {
label = "Missing Label";
}
-
+
JRadioButton button = new JRadioButton();
if (label != null)
button.setText(label);
@@ -904,17 +904,17 @@ public class CMSAdminUtil {
button.setSelected(select);
button.addActionListener(listener);
//setToolTip(resource, panelName, "RADIOBUTTON_"+keyword, button);
-
+
return button;
- }
-
+ }
+
//===== BUTTON CREATION =======================
-
+
/**
* Factory Method to create Button using specified params
*/
- public static JButton makeJButton(ResourceBundle resource,
- String panelName,
+ public static JButton makeJButton(ResourceBundle resource,
+ String panelName,
String keyword,
Icon icon,
ActionListener listener)
@@ -925,7 +925,7 @@ public class CMSAdminUtil {
} catch (MissingResourceException e) {
label = "Missing Label";
}
-
+
JButton button = new JButton();
if (label != null)
button.setText(label);
@@ -933,10 +933,10 @@ public class CMSAdminUtil {
button.setIcon(icon);
button.addActionListener(listener);
//setToolTip(resource, panelName, "BUTTON_"+keyword, button);
-
+
return button;
- }
-
+ }
+
/**
* Create a panel with horizontally arranged, equally sized buttons
* The buttons are aligned to the right in the panel (if it is
@@ -947,15 +947,15 @@ public class CMSAdminUtil {
* @param isConfig don't pat button
* @return A panel containing the buttons
*/
-
+
public static JPanel makeJButtonPanel( JButton[] buttons) {
return makeJButtonPanel(buttons, false, false);
}
-
+
public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp) {
return makeJButtonPanel(buttons, isHelp, false);
- }
-
+ }
+
public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp, boolean isConfig) {
JButtonFactory.resize( buttons );
JPanel buttonPanel = new JPanel();
@@ -973,30 +973,30 @@ public class CMSAdminUtil {
gbc.gridwidth = gbc.REMAINDER;
if (isHelp)
buttonPanel.add( Box.createHorizontalStrut(HELP_BUTTON_OFFSET));
- else
+ else
buttonPanel.add( Box.createHorizontalStrut(SuiLookAndFeel.COMPONENT_SPACE) );
}
buttonPanel.add( buttons[i], gbc );
- if ( i < buttons.length-2 )
+ if ( i < buttons.length-2 )
buttonPanel.add( Box.createHorizontalStrut(SuiLookAndFeel.COMPONENT_SPACE) );
}
-
+
JPanel p = new JPanel();
p.setLayout( new BorderLayout() );
p.add( "Center", buttonPanel );
-
+
if(!isConfig) {
p.add( "South",
- Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE) );
+ Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE) );
p.add( "East",
- Box.createHorizontalStrut(DIFFERENT_COMPONENT_SPACE) );
+ Box.createHorizontalStrut(DIFFERENT_COMPONENT_SPACE) );
} else {
p.add( "South",
- Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE-COMPONENT_SPACE) );
+ Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE-COMPONENT_SPACE) );
}
p.add( "North",
Box.createVerticalStrut(DIFFERENT_COMPONENT_SPACE) );
-
+
return p;
}
@@ -1018,25 +1018,25 @@ public class CMSAdminUtil {
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
gbc.insets = new Insets(0, DIFFERENT_COMPONENT_SPACE, 0,0);
-
+
for( int i = 0; i < buttons.length; i++ ) {
if ( i == buttons.length-1 )
gbc.gridheight = gbc.REMAINDER;
buttonPanel.add( buttons[i], gbc );
gbc.insets = new Insets(COMPONENT_SPACE, DIFFERENT_COMPONENT_SPACE,
0, 0);
- }
-
+ }
+
JPanel p = new JPanel();
p.setLayout( new BorderLayout() );
- p.add( "Center", buttonPanel );
- return p;
+ p.add( "Center", buttonPanel );
+ return p;
}
-
+
//===== COMBOBOX CREATION =======================
-
- public static JComboBox makeJComboBox(ResourceBundle resource,
- String panelName,
+
+ public static JComboBox makeJComboBox(ResourceBundle resource,
+ String panelName,
String keyword)
{
String value = null;
@@ -1056,33 +1056,33 @@ public class CMSAdminUtil {
++ii;
} catch (MissingResourceException e) {
val = null;
- }
+ }
} while (val != null);
-
+
if (value != null)
jcb.setSelectedItem(value);
return jcb;
}
-
-
+
+
//===== TOOL TIP CREATION =======================
-
+
/**
* Set tool tip on compoenent using resources passed in
*/
- public static void setToolTip(ResourceBundle resource,
- String panelName,
- String compKeyword,
- JComponent w)
+ public static void setToolTip(ResourceBundle resource,
+ String panelName,
+ String compKeyword,
+ JComponent w)
{
try {
String ttip = resource.getString(panelName+"_"+compKeyword+"_TTIP");
w.setToolTipText(ttip);
} catch (MissingResourceException e) {
//DON'T HAVE TOOT TIP
- }
+ }
}
-
+
public static String[] randomize(String [] t) {
String[] s = new String[t.length];
System.arraycopy(t,0,s,0,t.length);
@@ -1117,7 +1117,7 @@ public class CMSAdminUtil {
}
}
}
- }
+ }
public static void bubbleSort(String[] str, String[] data) {
for (int i = 0; i < str.length-1; i++) {
@@ -1166,21 +1166,21 @@ public class CMSAdminUtil {
}
//get localized string using the format
- public static String getLocalizedString(ResourceBundle resource,
- String keyword,
+ public static String getLocalizedString(ResourceBundle resource,
+ String keyword,
Object param) {
return MessageFormatter.getLocalizedString(resource.getClass().getName(),
- keyword, param);
- }
-
+ keyword, param);
+ }
+
//get localized string using the format
- public static String getLocalizedString(ResourceBundle resource,
- String keyword,
+ public static String getLocalizedString(ResourceBundle resource,
+ String keyword,
Object [] params) {
return MessageFormatter.getLocalizedString(resource.getClass().getName(),
- keyword, params);
+ keyword, params);
}
-
+
public static String getPureString(String data) {
StringBuffer input = new StringBuffer(data);
StringBuffer buff = new StringBuffer();
@@ -1203,7 +1203,7 @@ public class CMSAdminUtil {
static RemoteImage getSystemImage( String imagePath ) {
return new RemoteImage( imagePath );
}
-
+
public static JTextArea createTextArea(String str, Color color) {
JTextArea desc = new JTextArea(str);
desc.setBackground(color);
@@ -1211,7 +1211,7 @@ public class CMSAdminUtil {
desc.setCaretColor(color);
desc.setLineWrap(true);
desc.setWrapStyleWord(true);
-
+
return desc;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
index cb1909f22..1a0670d69 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSBaseMenuInfo.java
@@ -103,7 +103,7 @@ public class CMSBaseMenuInfo implements IMenuInfo {
Vector items = (Vector) mCategoryIDMenuItems.elementAt(i);
items.addElement(item); //XXX check exist already ??
}
-
+
/**
* Add menu item separator
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java b/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
index 3430a74d9..b151893c7 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSBasePanel.java
@@ -33,25 +33,25 @@ import java.awt.event.*;
* @author Jack Pan-Chen
* @version $Revision$, $Date$
*/
-public class CMSBasePanel extends JPanel
+public class CMSBasePanel extends JPanel
implements ActionListener, DocumentListener,
ItemListener, ListSelectionListener
{
/*==========================================================
* variables
*==========================================================*/
- public static Insets DEFAULT_CENTER_INSETS = new Insets(0,0,0,0);
+ public static Insets DEFAULT_CENTER_INSETS = new Insets(0,0,0,0);
public static Insets EMPTY_INSETS = new Insets(0,0,0,0);
public static final int COMPONENT_SPACE = SuiLookAndFeel.COMPONENT_SPACE;
- public static final int SEPARATED_COMPONENT_SPACE =
+ public static final int SEPARATED_COMPONENT_SPACE =
SuiLookAndFeel.SEPARATED_COMPONENT_SPACE;
- public static final int DIFFERENT_COMPONENT_SPACE =
+ public static final int DIFFERENT_COMPONENT_SPACE =
SuiLookAndFeel.DIFFERENT_COMPONENT_SPACE;
-
+
protected static final int WARNING_MESSAGE = JOptionPane.WARNING_MESSAGE;
protected static final int ERROR_MESSAGE = JOptionPane.ERROR_MESSAGE;
protected static final int INFORMATION_MESSAGE = JOptionPane.INFORMATION_MESSAGE;
-
+
protected String mPanelName; // panel name (UPPERCASE IDENTIFIER)
protected ResourceBundle mResource; // resource boundle
public static int mNonWaitCursor = -1;
@@ -71,23 +71,23 @@ public class CMSBasePanel extends JPanel
mPanelName = panelName;
mResource = rb;
}
-
+
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* Set Panel name
* @param name panel name
*/
public void setPanelName(String name) {
- mPanelName = name;
+ mPanelName = name;
}
-
+
/*==========================================================
* EVNET HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
}
@@ -95,10 +95,10 @@ public class CMSBasePanel extends JPanel
//== DocumentListener ==
public void insertUpdate(DocumentEvent e) {
}
-
+
public void removeUpdate(DocumentEvent e){
}
-
+
public void changedUpdate(DocumentEvent e){
}
@@ -109,48 +109,48 @@ public class CMSBasePanel extends JPanel
//== ListSelectionListener ==
public void valueChanged(ListSelectionEvent e){
}
-
+
/*==========================================================
* protected methods
*==========================================================*/
-
+
//create string using formated resource string
//the string format
protected String getLocalizedString(String keyword, Object param) {
return CMSAdminUtil.getLocalizedString(mResource, keyword, param);
}
-
+
protected String getLocalizedString(String keyword, Object [] params) {
return CMSAdminUtil.getLocalizedString(mResource, keyword, params);
- }
-
-
+ }
+
+
//=== DIALOG MESSAGE =====================
-
+
protected void showMessageDialog(String keyword, int messageType ) {
CMSAdminUtil.showMessageDialog(mResource, mPanelName, keyword, messageType);
}
-
+
protected void showMessageDialog(String keyword) {
showMessageDialog(keyword, ERROR_MESSAGE);
}
-
+
protected int showConfirmDialog(String keyword, int messageType ) {
return CMSAdminUtil.showConfirmDialog(mResource, mPanelName, keyword, messageType);
- }
-
+ }
+
protected int showConfirmDialog(String keyword, String[] params, int messageType ) {
return CMSAdminUtil.showConfirmDialog(mResource, mPanelName, keyword, params, messageType);
- }
-
+ }
+
protected int showConfirmDialog(String keyword) {
return showConfirmDialog(keyword, WARNING_MESSAGE);
}
-
+
protected int showConfirmDialog(String keyword, String[] params) {
return showConfirmDialog(keyword, params, WARNING_MESSAGE);
}
-
+
/**
* Display Error Message dialog
*
@@ -159,7 +159,7 @@ public class CMSBasePanel extends JPanel
protected void showErrorDialog(String message) {
CMSAdminUtil.showErrorDialog(mResource, message, ERROR_MESSAGE);
}
-
+
//=== TITLED BORDER ======================
protected Border makeTitledBorder(String keyword) {
String label;
@@ -181,7 +181,7 @@ public class CMSBasePanel extends JPanel
*/
return new CompoundBorder(border, margin);
}
-
+
//=== LABEL CREATION ====================
protected JLabel makeJLabel(Icon i, String s, int a) {
JLabel label = new JLabel();
@@ -201,7 +201,7 @@ public class CMSBasePanel extends JPanel
protected JLabel makeJLabel(String keyword) {
return makeJLabel(keyword, (Icon) null, -1);
}
-
+
protected JLabel makeJLabel(String keyword, Icon i, int a) {
return CMSAdminUtil.makeJLabel(mResource, mPanelName, keyword, i, a);
}
@@ -210,7 +210,7 @@ public class CMSBasePanel extends JPanel
protected JTextField makeJTextField(Document d, String s, int len) {
return CMSAdminUtil.makeJTextField(d, s,len, this);
}
-
+
protected JTextField makeJTextField() {
return makeJTextField(null, null, -1);
}
@@ -271,15 +271,15 @@ public class CMSBasePanel extends JPanel
protected JButton makeJButton(String keyword) {
return makeJButton(keyword, (Icon)null);
}
-
+
protected JButton makeJButton(String keyword, ActionListener listener) {
return makeJButton(keyword, (Icon)null, listener);
}
-
+
protected JButton makeJButton(String keyword, Icon i) {
return makeJButton(keyword, i, this);
- }
-
+ }
+
protected JButton makeJButton(String keyword, Icon i, ActionListener listener) {
return CMSAdminUtil.makeJButton(mResource, mPanelName, keyword, i, listener);
}
@@ -312,7 +312,7 @@ public class CMSBasePanel extends JPanel
protected JCheckBox makeJCheckBox(String keyword) {
return makeJCheckBox(keyword, (Icon)null, false);
}
-
+
protected JCheckBox makeJCheckBox(String keyword, boolean b) {
return makeJCheckBox(keyword, (Icon)null, b);
}
@@ -356,9 +356,9 @@ public class CMSBasePanel extends JPanel
++ii;
} catch (MissingResourceException e) {
val = null;
- }
+ }
} while (val != null);
-
+
if (value != null)
jcb.setSelectedItem(value);
return jcb;
@@ -366,11 +366,11 @@ public class CMSBasePanel extends JPanel
//==== LIST CREATION ============================
-
+
protected JList makeJList(DefaultListModel listModel, int visibleCount) {
return CMSAdminUtil.makeJList(listModel, visibleCount);
}
-
+
//===== RADIO BUTTON CREATION =======================
protected JRadioButton makeJRadioButton(Icon i, String s, boolean b) {
JRadioButton rb = new JRadioButton();
@@ -407,7 +407,7 @@ public class CMSBasePanel extends JPanel
protected JRadioButton makeJRadioButton(String keyword, Icon i, boolean b) {
return CMSAdminUtil.makeJRadioButton(mResource, mPanelName, keyword, i, b, this);
}
-
+
/**
* Create a panel with horizontally arranged, equally sized buttons
* The buttons are aligned to the right in the panel (if it is
@@ -420,7 +420,7 @@ public class CMSBasePanel extends JPanel
public static JPanel makeJButtonPanel( JButton[] buttons ) {
return CMSAdminUtil.makeJButtonPanel(buttons);
}
-
+
public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp) {
return CMSAdminUtil.makeJButtonPanel(buttons, isHelp);
}
@@ -428,7 +428,7 @@ public class CMSBasePanel extends JPanel
public static JPanel makeJButtonPanel( JButton[] buttons, boolean isHelp, boolean isConfig) {
return CMSAdminUtil.makeJButtonPanel(buttons, isHelp, isConfig);
}
-
+
protected void startProgressStatus() {
if (mNonWaitCursor == -1) {
mCursor = mParent.getCursor();
@@ -455,6 +455,6 @@ public class CMSBasePanel extends JPanel
* private methods
*==========================================================*/
private void setToolTip(String compKeyword, JComponent w) {
- CMSAdminUtil.setToolTip(mResource, mPanelName, compKeyword, w);
+ CMSAdminUtil.setToolTip(mResource, mPanelName, compKeyword, w);
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java b/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
index b7ec04e3a..2c8e65427 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSBaseResourceModel.java
@@ -49,7 +49,7 @@ public class CMSBaseResourceModel extends ResourceModel {
*==========================================================*/
private CMSResourcePage mPage; // physical page representation
- protected ConsoleInfo mConsoleInfo; // console info
+ protected ConsoleInfo mConsoleInfo; // console info
protected CMSServerInfo mServerInfo; // server info
protected IResourceObject[] mSelection; // selected objects
protected Vector mSelectionListeners; // listener list
@@ -85,9 +85,9 @@ public class CMSBaseResourceModel extends ResourceModel {
* @param page CMSResourcePage instance
*/
public void setResourcePage(CMSResourcePage page) {
- mPage = page;
+ mPage = page;
}
-
+
public CMSResourcePage getResourcePage() {
return mPage;
}
@@ -215,24 +215,24 @@ public class CMSBaseResourceModel extends ResourceModel {
* for setting up the subtrees.
*/
public void addSubSystemNode(CMSResourceObject node) {
- ((CMSResourceObject)getRoot()).add(node);
+ ((CMSResourceObject)getRoot()).add(node);
}
-
+
/**
* Register the nick name of the resource object, so other sub system
* can look up and retrieve the corresponding resource object.
*/
public void registerNickName(String nickName, CMSResourceObject node) {
- mNickNameRegistry.put(nickName, node);
+ mNickNameRegistry.put(nickName, node);
}
-
+
/**
* Retrieve the resource obejct associated with this nickname
*/
public CMSResourceObject getByNickName(String nickName) {
return (CMSResourceObject) mNickNameRegistry.get(nickName);
}
-
+
/**
* Start the zipping status bar
*/
@@ -245,12 +245,12 @@ public class CMSBaseResourceModel extends ResourceModel {
*/
public void progressStop() {
mPage.progressStop();
- }
-
+ }
+
/*==========================================================
* priotected methods
*==========================================================*/
-
+
protected void init() {
CMSResourceObject root = new CMSResourceObject();
root.setName(mResource.getString(CMSAdminResources.CERT_SERVER_NAME)+":" + mServerInfo.getPort());
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
index f967d28e0..8bd20e4e8 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSCAUILoader.java
@@ -57,29 +57,29 @@ public class CMSCAUILoader implements ISubSystemUILoader {
public void register() {
//register subsystem UI
try {
-
+
//task tab
IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,"");
-
+
//config tab
CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION");
CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
model.setResourcePage(page);
populateConfigContent(model);
-
+
/*repos tab
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONTENT");
model = (CMSBaseResourceModel) page.getModel();
populateRepositoryContent(model);
populateRepositoryMenu(page);
*/
-
+
/*acl tab
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST");
model = (CMSBaseResourceModel) page.getModel();
populateACLContent(model);
*/
-
+
}catch(Exception e) {
Debug.println("CMSCAUILoader: register() config - "+e.toString());
}
@@ -113,7 +113,7 @@ public class CMSCAUILoader implements ISubSystemUILoader {
jobsnode.setAllowsChildren(true);
CMSResourceObject cnode = new CMSResourceObject("JOBS");
-
+
tabPane1 = new CMSUGTabPanel(model, cnode);
tabPane1.addTab(new JobsInstanceTab(model));
tabPane1.addTab(new JobsImplTab(model));
@@ -134,7 +134,7 @@ public class CMSCAUILoader implements ISubSystemUILoader {
list.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_FOLDER));
list.setAllowsChildren(true);
list.setCustomPanel(tabPane);
-
+
//policies sub node
//CMSResourceObject node2;
node = new CMSResourceObject("POLICIES");
@@ -176,7 +176,7 @@ public class CMSCAUILoader implements ISubSystemUILoader {
notificationNode.setAllowsChildren(false);
list.add(notificationNode);
-
+
/* servlet sub node - XXX NOT FOR B1
Servlet Instance Tab code is under config/servlet. It has
been 'cvs removed'. It needs porting to new UI.
@@ -203,7 +203,7 @@ public class CMSCAUILoader implements ISubSystemUILoader {
node.setAllowsChildren(false);
list.add(node);
*/
-
+
/* crl extensions sub node
node = new CMSResourceObject("CRLEXTENSIONS");
CMSUGTabPanel crlExtTabPane = new CMSUGTabPanel(model, node);
@@ -269,7 +269,7 @@ public class CMSCAUILoader implements ISubSystemUILoader {
node.setAllowsChildren(false);
list.add(node);
*/
-
+
//ldap publishing
node = new CMSResourceObject("PUBLISHING");
tabPane = new CMSTabPanel(model, node);
@@ -286,9 +286,9 @@ public class CMSCAUILoader implements ISubSystemUILoader {
// allow mappers
node = new CMSResourceObject("MAPPERS");
CMSUGTabPanel ugtabPane = new CMSUGTabPanel(model, node);
- ugtabPane.addTab(new MapperInstanceTab(model,
+ ugtabPane.addTab(new MapperInstanceTab(model,
DestDef.DEST_CA_PUBLISHER_ADMIN));
- ugtabPane.addTab(new MapperImplTab(model,
+ ugtabPane.addTab(new MapperImplTab(model,
DestDef.DEST_CA_PUBLISHER_ADMIN));
node.setCustomPanel(ugtabPane);
node.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULEOBJECT));
@@ -298,9 +298,9 @@ public class CMSCAUILoader implements ISubSystemUILoader {
// allow LDAP publisher and mapper plugins
node = new CMSResourceObject("PUBLISHERS");
ugtabPane = new CMSUGTabPanel(model, node);
- ugtabPane.addTab(new PublisherInstanceTab(model,
+ ugtabPane.addTab(new PublisherInstanceTab(model,
DestDef.DEST_CA_PUBLISHER_ADMIN));
- ugtabPane.addTab(new PublisherImplTab(model,
+ ugtabPane.addTab(new PublisherImplTab(model,
DestDef.DEST_CA_PUBLISHER_ADMIN));
node.setCustomPanel(ugtabPane);
node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULEOBJECT));
@@ -310,24 +310,24 @@ public class CMSCAUILoader implements ISubSystemUILoader {
// allow rules
node = new CMSResourceObject("RULES");
ugtabPane = new CMSUGTabPanel(model, node);
- ugtabPane.addTab(new RuleInstanceTab(model,
+ ugtabPane.addTab(new RuleInstanceTab(model,
DestDef.DEST_CA_PUBLISHER_ADMIN));
// XXX just support one publishing rule type
- // ugtabPane.addTab(new RuleImplTab(model,
+ // ugtabPane.addTab(new RuleImplTab(model,
// DestDef.DEST_CA_PUBLISHER_ADMIN));
node.setCustomPanel(ugtabPane);
node.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULEOBJECT));
node.setAllowsChildren(false);
publishingNode.add(node);
-
+
model.addSubSystemNode(list);
}
-
+
/*
protected void populateRepositoryContent(CMSBaseResourceModel model) {
CMSResourceObject list, node;
-
+
//ca repositories node
list = new CMSResourceObject("CAREPOSITORIES");
list.setCustomPanel(new CMSBlankPanel(model));
@@ -347,15 +347,15 @@ public class CMSCAUILoader implements ISubSystemUILoader {
}
protected void populateRepositoryMenu(CMSResourcePage page) {
- CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
+ CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
CMSBaseMenuInfo menuInfo = (CMSBaseMenuInfo)page.getMenuInfo();
try {
menuInfo.registerMenuItem(CMSBaseMenuInfo.MENU_FILE,
CMSBaseMenuInfo.MENU_NEWCERT,
- new CertRequestAction(model.getConsoleInfo(),model.getServerInfo()));
+ new CertRequestAction(model.getConsoleInfo(),model.getServerInfo()));
} catch(Exception e) {
- Debug.println("menuinfo register()"+e.toString());
- }
+ Debug.println("menuinfo register()"+e.toString());
+ }
}
*/
protected void populateACLContent(CMSBaseResourceModel model) {
@@ -366,7 +366,7 @@ public class CMSCAUILoader implements ISubSystemUILoader {
node.setCustomPanel(new CMSBlankPanel(model));
node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT));
node.setAllowsChildren(false);
- list.add(node);
+ list.add(node);
*/
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
index 785514ac2..4688e52af 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSCCMUILoader.java
@@ -53,21 +53,21 @@ public class CMSCCMUILoader implements ISubSystemUILoader {
public void register() {
//register subsystem UI
try {
-
+
//task tab
IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,"");
-
+
//config tab
CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION");
CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
populateConfigContent(model);
-
+
/*acl tab
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST");
model = (CMSBaseResourceModel) page.getModel();
populateACLContent(model);
*/
-
+
}catch(Exception e) {
Debug.println("CMSCCMUILoader: register() config - "+e.toString());
}
@@ -80,7 +80,7 @@ public class CMSCCMUILoader implements ISubSystemUILoader {
protected void populateConfigContent(CMSBaseResourceModel model) {
CMSResourceObject node;
CMSTabPanel tabPane;
-
+
//ccm node
node = new CMSResourceObject("CCMCONFIG");
tabPane = new CMSTabPanel(model, node);
@@ -89,7 +89,7 @@ public class CMSCCMUILoader implements ISubSystemUILoader {
node.setCustomPanel(tabPane);
node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_FOLDER));
node.setAllowsChildren(true);
-
+
model.addSubSystemNode(node);
}
@@ -101,7 +101,7 @@ public class CMSCCMUILoader implements ISubSystemUILoader {
node.setCustomPanel(new CMSBlankPanel(model));
node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT));
node.setAllowsChildren(false);
- list.add(node);
+ list.add(node);
}
*/
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java b/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
index 15bc29665..b83af283e 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSContentTableModel.java
@@ -48,14 +48,14 @@ public class CMSContentTableModel extends CMSTableModel {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* Returns the number of rows in the table
* @return number of rows
*/
public int getRowCount() {
return mObjectContainer.size();
- }
+ }
/**
* Add data row and data object associated with this row
@@ -66,13 +66,13 @@ public class CMSContentTableModel extends CMSTableModel {
super.addRow(values);
mObjectContainer.addElement(obj);
}
-
+
/**
* Remove row at the specified index position
* @param index row index to be removed
*/
- public void removeRow(int index)
- throws ArrayIndexOutOfBoundsException
+ public void removeRow(int index)
+ throws ArrayIndexOutOfBoundsException
{
Debug.println("CMSContentDataModel: removeRow() - start");
mObjectContainer.removeElementAt(index);
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
index 9c3ae6e01..4b2ddb95f 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSEAUILoader.java
@@ -54,27 +54,27 @@ public class CMSEAUILoader implements ISubSystemUILoader {
public void register() {
//register subsystem UI
try {
-
+
//task tab
IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,"");
-
+
//config tab
CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION");
CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
populateConfigContent(model);
-
+
/*repos tab
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONTENT");
model = (CMSBaseResourceModel) page.getModel();
populateRepositoryContent(model);
*/
-
+
/*acl tab
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST");
model = (CMSBaseResourceModel) page.getModel();
populateACLContent(model);
*/
-
+
}catch(Exception e) {
Debug.println("CMSEAUILoader: register() config - "+e.toString());
}
@@ -98,11 +98,11 @@ public class CMSEAUILoader implements ISubSystemUILoader {
model.addSubSystemNode(list);
}
-
+
/*
protected void populateRepositoryContent(CMSBaseResourceModel model) {
CMSResourceObject list, node;
-
+
//ca repositories node
list = new CMSResourceObject("EAREPOSITORIES");
list.setCustomPanel(new CMSBlankPanel(model));
@@ -129,7 +129,7 @@ public class CMSEAUILoader implements ISubSystemUILoader {
node.setCustomPanel(new CMSBlankPanel(model));
node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT));
node.setAllowsChildren(false);
- list.add(node);
+ list.add(node);
}
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
index cb232c527..49fbb5524 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSKernelUILoader.java
@@ -42,42 +42,42 @@ import javax.swing.*;
* @date 03/30/97
*/
public class CMSKernelUILoader implements ISubSystemUILoader {
-
+
protected static final int ERROR_MESSAGE = JOptionPane.ERROR_MESSAGE;
/*==========================================================
* variables
*==========================================================*/
private CMSUIFramework mUIFramework; //parent framework
-
+
/*==========================================================
* constructors
*==========================================================*/
public CMSKernelUILoader(CMSUIFramework framework) {
mUIFramework = framework;
}
-
+
/*==========================================================
* public methods
*==========================================================*/
public void register() {
-
+
//register subsystem UI
try {
//task tab - this holds icons such as start server, stop server, etc
IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,"");
}catch(Exception e) {
Debug.println("CMSKernelUILoader: register() config tab - "+e.toString());
- }
+ }
CMSResourcePage page;
- CMSBaseResourceModel model;
-
- try {
+ CMSBaseResourceModel model;
+
+ try {
//configuration tab - (holds main UI tree)
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION");
model = (CMSBaseResourceModel) page.getModel();
populateConfigContent(model);
populateConfigMenu(page);
-
+
} catch(Exception e) {
Debug.println("CMSKernelUILoader: register() config tab - "+e.toString());
}
@@ -91,31 +91,31 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
Debug.println("CMSKernelUILoader: register() status - "+e.toString());
}
}
-
+
/*==========================================================
* protected methods
- *==========================================================*/
+ *==========================================================*/
/**
* This method creates the configuration tree
*/
-
+
protected void populateConfigContent(CMSBaseResourceModel model) {
-
+
CMSResourceObject root = (CMSResourceObject) model.getRoot();
CMSTabPanel tabPane = new CMSTabPanel(model, root);
tabPane.addTab(new CMSLDAPSettingPanel(tabPane));
tabPane.addTab(new CMSSMTPPanel(tabPane));
tabPane.addTab(new CMSSelfTestsPanel(tabPane));
- // The log panel would only really be useful if we were able to
- // enable or disable debug without restarting. If we can do this,
+ // The log panel would only really be useful if we were able to
+ // enable or disable debug without restarting. If we can do this,
// then we can enable this tab.
//
// tabPane.addTab(new GeneralLogPanel(tabPane));
root.setCustomPanel(tabPane);
-
+
CMSResourceObject usernode = new CMSResourceObject("USERGROUPS");
CMSUGTabPanel tabPane1 = new CMSUGTabPanel(model, usernode);
@@ -125,7 +125,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
usernode.setAllowsChildren(false);
usernode.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_UGOBJECT));
model.addSubSystemNode(usernode);
-
+
// This ACL configuration may be revived in a future version
CMSResourceObject aclnode = new CMSResourceObject("ACL");
CMSUGTabPanel aclTabPane = new CMSUGTabPanel(model, aclnode);
@@ -136,7 +136,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
CMSAdminResources.IMAGE_ACLOBJECT));
aclnode.setAllowsChildren(false);
model.addSubSystemNode(aclnode);
-
+
// Authentication subsystem
/*
CMSResourceObject authnode = new CMSResourceObject("AUTH");
@@ -160,7 +160,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
jobsnode.setAllowsChildren(true);
CMSResourceObject cnode = new CMSResourceObject("JOBS");
-
+
tabPane1 = new CMSUGTabPanel(model, cnode);
tabPane1.addTab(new JobsInstanceTab(model));
tabPane1.addTab(new JobsImplTab(model));
@@ -190,10 +190,10 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
tabPane3.addTab(new UserCertsTab(model, DestDef.DEST_SERVER_ADMIN));
NameValuePairs response;
/*
- try
+ try
{
AdminConnection connection = model.getServerInfo().getAdmin();
-
+
response = connection.search(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_SUBSYSTEM, new NameValuePairs());
Debug.println(response.toString());
@@ -210,7 +210,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
encryptionnode.setAllowsChildren(false);
model.addSubSystemNode(encryptionnode);
}
-
+
/**
* Modifies the window menu (File, Edit, View, etc) to add some
@@ -224,16 +224,16 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
// CMSBaseMenuInfo.MENU_PKCS11,
// new PKCS11ManagementAction(model.getConsoleInfo()));
// reference Bug 613851 Manage PKCS#11 shows a blank window.
- menuInfo.addMenuItemSeparator(CMSBaseMenuInfo.MENU_FILE);
+ menuInfo.addMenuItemSeparator(CMSBaseMenuInfo.MENU_FILE);
menuInfo.addMenuItemSeparator(CMSBaseMenuInfo.MENU_VIEW);
menuInfo.registerMenuItem(CMSBaseMenuInfo.MENU_VIEW,
CMSBaseMenuInfo.MENU_REFRESH,
new RefreshTabPane(model));
} catch(Exception e) {
- Debug.println("menuinfo register()"+e.toString());
+ Debug.println("menuinfo register()"+e.toString());
}
}
-
+
/**
* creates the tree view seen in the left panel when the user selects
@@ -248,13 +248,13 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
protected void populateStatusContent(CMSResourcePage page) {
CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
CMSResourceObject root = (CMSResourceObject) model.getRoot();
-
+
//set general stat panel
root.setCustomPanel(new StatusPanel(model));
-
+
CMSResourceObject list, node;
CMSTabPanel tabPane;
-
+
//log content
list = new CMSResourceObject("LOG");
list.setCustomPanel(new CMSBlankPanel(model));
@@ -266,7 +266,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
model.addSubSystemNode(list);
}
-
+
protected void populateStatusMenu(CMSResourcePage page) {
CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
CMSBaseMenuInfo menuInfo = (CMSBaseMenuInfo)page.getMenuInfo();
@@ -279,7 +279,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
Debug.println("menuinfo register()"+e.toString());
}
}
-
+
/**
* retrieve log instance listing from the server
* side and populate the index
@@ -297,7 +297,7 @@ public class CMSKernelUILoader implements ISubSystemUILoader {
new NameValuePairs());
} catch (EAdminException e) {
//display error dialog
- CMSAdminUtil.showErrorDialog(model.getFrame(),
+ CMSAdminUtil.showErrorDialog(model.getFrame(),
ResourceBundle.getBundle(
CMSAdminResources.class.getName()
), e.getMessage(), ERROR_MESSAGE);
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java b/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
index 2eef61cb2..33094d041 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSMessageBox.java
@@ -35,7 +35,7 @@ public class CMSMessageBox extends JDialog
setSize( width, 100 );
setResizable( false );
setLocationRelativeTo(parent);
-
+
message = new Label( messageString, Label.CENTER );
getContentPane().add( message, BorderLayout.CENTER );
setVisible(true);
@@ -45,12 +45,12 @@ public class CMSMessageBox extends JDialog
super(parent, "Status", false);
int width = 300;
mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName());
- String messageString = mResource.getString(panelName+"_DIALOG_PROGRESS_"+keyword);
-
+ String messageString = mResource.getString(panelName+"_DIALOG_PROGRESS_"+keyword);
+
setSize( width, 100 );
setResizable( false );
setLocationRelativeTo(parent);
-
+
message = new Label( messageString, Label.CENTER );
getContentPane().add( message, BorderLayout.CENTER );
setVisible(true);
@@ -59,7 +59,7 @@ public class CMSMessageBox extends JDialog
public CMSMessageBox(Frame parent)
{
super(parent);
-
+
// This code is automatically generated by Visual Cafe when you add
// components to the visual environment. It instantiates and initializes
// the components. To modify the code, only use code syntax that matches
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
index 3c8d5dba0..92a374285 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSOCSPUILoader.java
@@ -55,15 +55,15 @@ public class CMSOCSPUILoader implements ISubSystemUILoader {
public void register() {
//register subsystem UI
try {
-
+
//task tab
IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,"");
-
+
//config tab
CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION");
CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
populateConfigContent(model);
-
+
}catch(Exception e) {
Debug.println("CMSCAUILoader: register() config - "+e.toString());
}
@@ -75,7 +75,7 @@ public class CMSOCSPUILoader implements ISubSystemUILoader {
protected void populateConfigContent(CMSBaseResourceModel model) {
CMSResourceObject list, node;
CMSTabPanel tabPane;
-
+
//ca node
list = new CMSResourceObject("OCSPCONFIG");
tabPane = new CMSTabPanel(model, list);
@@ -93,8 +93,8 @@ public class CMSOCSPUILoader implements ISubSystemUILoader {
;
node.setAllowsChildren(false);
list.add(node);
-
+
model.addSubSystemNode(list);
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java b/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
index 0abd28f29..f01967a91 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSPageFeeder.java
@@ -40,7 +40,7 @@ public class CMSPageFeeder extends FrameworkInitializer {
*==========================================================*/
public static String RESOURCE_TAB_TYPE = "RESOURCE_TAB_TYPE";
public static String TASK_TAB_TYPE = "TASK_TAB_TYPE";
-
+
private static String PREFIX = "CMSPAGEFEEDER_";
private ConsoleInfo mConsoleInfo; // global information
@@ -51,7 +51,7 @@ public class CMSPageFeeder extends FrameworkInitializer {
//private ResourcePage mResourcePage; // resource page
//private ResourcePage mContentPage; // content page
//private ResourcePage mUGPage; // identity and roles page
-
+
private ResourceBundle mResource; // resource boundle
/*==========================================================
@@ -70,7 +70,7 @@ public class CMSPageFeeder extends FrameworkInitializer {
mServerInfo = serverInfo;
mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName());
mPages = new Hashtable();
-
+
setFrameTitle(mResource.getString(PREFIX+"SERVERNAME"));
setMinimizedImage(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_CERTICON_MEDIUM).getImage());
setBannerImage(CMSAdminUtil.getThemeImage(CMSAdminResources.IMAGE_BRANDING).getImage());
@@ -99,13 +99,13 @@ public class CMSPageFeeder extends FrameworkInitializer {
return task;
*/
}
-
+
if (!type.trim().equals(RESOURCE_TAB_TYPE)) {
throw new EAdminException(mResource.getString(PREFIX+"RESOURCE_TAB_NOT_FOUND"), true);
}
-
+
if (mPages.containsKey(name.trim())) {
- return (IPage) mPages.get(name.trim());
+ return (IPage) mPages.get(name.trim());
} else {
CMSResourcePage page = new CMSResourcePage(new CMSBaseResourceModel(mConsoleInfo,mServerInfo));
String title;
@@ -133,8 +133,8 @@ public class CMSPageFeeder extends FrameworkInitializer {
((CMSResourcePage)page).getTree().expandRow(0);
}
}
-
-
+
+
/*==========================================================
* private methods
*==========================================================*/
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSPassword.java b/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
index 4fbca9011..483efaf35 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
@@ -218,7 +218,7 @@ public class CMSPassword extends JDialog
}
if (evt.getSource().equals(mHelp)) {
CMSAdminUtil.help(HELPINDEX);
- return;
+ return;
}
}
@@ -259,7 +259,7 @@ public class CMSPassword extends JDialog
null, this);
mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP",
null, this);
-
+
//JButton[] buttons = { mOK, mCancel, mHelp};
JButton[] buttons = { mOK, mCancel};
JButtonFactory.resize( buttons );
@@ -276,7 +276,7 @@ public class CMSPassword extends JDialog
getRootPane().setDefaultButton(mOK);
}
}
-
+
/**
* Inner class which handles key events for JTextField components.
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java b/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
index b2103a34e..9ba836db4 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSRAUILoader.java
@@ -54,27 +54,27 @@ public class CMSRAUILoader implements ISubSystemUILoader {
public void register() {
//register subsystem UI
try {
-
+
//task tab
IPage task = mUIFramework.getPage(CMSPageFeeder.TASK_TAB_TYPE,"");
-
+
//config tab
CMSResourcePage page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONFIGURATION");
CMSBaseResourceModel model = (CMSBaseResourceModel) page.getModel();
populateConfigContent(model);
-
+
/*repos tab
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"CONTENT");
model = (CMSBaseResourceModel) page.getModel();
populateRepositoryContent(model);
*/
-
+
/*acl tab
page = (CMSResourcePage) mUIFramework.getPage(CMSPageFeeder.RESOURCE_TAB_TYPE,"ACCESSCONTROLLIST");
model = (CMSBaseResourceModel) page.getModel();
- populateACLContent(model);
+ populateACLContent(model);
*/
-
+
}catch(Exception e) {
Debug.println("CMSRAUILoader: register() config - "+e.toString());
}
@@ -128,7 +128,7 @@ public class CMSRAUILoader implements ISubSystemUILoader {
list.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_FOLDER));
list.setAllowsChildren(true);
list.setCustomPanel(tabPane);
-
+
//policies sub node
CMSResourceObject node2;
node = new CMSResourceObject("POLICIES");
@@ -167,14 +167,14 @@ public class CMSRAUILoader implements ISubSystemUILoader {
notificationNode.setAllowsChildren(false);
list.add(notificationNode);
-
+
/* servlet sub node - XXX NOT FOR B1
CMSResourceObject node3;
node3 = new CMSResourceObject("SERVLET");
CMSUGTabPanel tabPane3 = new CMSUGTabPanel(model, node3);
- tabPane3.addTab(new ServletInstanceTab(model,
+ tabPane3.addTab(new ServletInstanceTab(model,
DestDef.DEST_RA_SERVLET_ADMIN));
- tabPane3.addTab(new ServletImplTab(model,
+ tabPane3.addTab(new ServletImplTab(model,
DestDef.DEST_RA_SERVLET_ADMIN));
node3.setCustomPanel(tabPane3);
node3.setIcon(CMSAdminUtil.getImage(CMSAdminResources.IMAGE_SERVLETOBJECT));
@@ -192,7 +192,7 @@ public class CMSRAUILoader implements ISubSystemUILoader {
node.setAllowsChildren(false);
list.add(node);
*/
-
+
/*backup restore sub node
node = new CMSResourceObject("BACKUP");
tabPane = new CMSTabPanel(model, node);
@@ -203,7 +203,7 @@ public class CMSRAUILoader implements ISubSystemUILoader {
node.setAllowsChildren(false);
list.add(node);
*/
-
+
//ldap publishing
//node = new CMSResourceObject("PUBLISHING");
//tabPane = new CMSTabPanel(model, node);
@@ -224,14 +224,14 @@ public class CMSRAUILoader implements ISubSystemUILoader {
node.setAllowsChildren(false);
list.add(node);
*/
-
+
model.addSubSystemNode(list);
}
-
+
/*
protected void populateRepositoryContent(CMSBaseResourceModel model) {
CMSResourceObject list, node;
-
+
//ra repositories node
list = new CMSResourceObject("RAREPOSITORIES");
list.setCustomPanel(new CMSBlankPanel(model));
@@ -259,7 +259,7 @@ public class CMSRAUILoader implements ISubSystemUILoader {
node.setCustomPanel(new CMSBlankPanel(model));
node.setIcon( CMSAdminUtil.getImage(CMSAdminResources.IMAGE_DOCUMENT));
node.setAllowsChildren(false);
- list.add(node);
+ list.add(node);
}
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java b/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
index f0f5d38b0..355664fbe 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSResourceObject.java
@@ -40,7 +40,7 @@ public class CMSResourceObject extends ResourceObject {
private JPanel mRightPane;
private String mNickName;
protected ResourceBundle mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName());
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -89,9 +89,9 @@ public class CMSResourceObject extends ResourceObject {
* Returns the internal nickname for this resource object
*/
public String getNickName() {
- return mNickName;
+ return mNickName;
}
-
+
/**
* Returns the AWT Component that is displayed in the right hand pane
* of the resource page.
@@ -110,7 +110,7 @@ public class CMSResourceObject extends ResourceObject {
public void setCustomPanel(JPanel panel) {
mRightPane = panel;
}
-
+
protected MenuItemText getMenuItemText(String keyword) {
ResourceBundle mResource = ResourceBundle.getBundle(
CMSAdminResources.class.getName());
@@ -121,6 +121,6 @@ public class CMSResourceObject extends ResourceObject {
if (desc == null)
desc = " ";
return new MenuItemText( keyword, name, desc);
- }
+ }
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java b/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
index 9ad03515d..3eb97bd1b 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSResourcePage.java
@@ -36,11 +36,11 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
* variables
*==========================================================*/
protected IMenuInfo mMenuInfo; // menu information delegation
-
+
/*==========================================================
* constructors
*==========================================================*/
-
+
/**
* Return ResourcePage using the data model specified.
*/
@@ -55,7 +55,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* Need to overwrite this one to clone
* DSResourcePage instead of ResourcePage
@@ -76,7 +76,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
public JTree getTree() {
return (JTree)_tree;
}
-
+
/**
* Implements TreeSelectionListener. Called when an object is selected
* in the resource tree. Informs IResourceModelListeners of this event.
@@ -89,12 +89,12 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
setCustomPanel(_model.getCustomPanel(this, selection[0]));
}
_model.actionObjectSelected(this, selection, getPreviousSelection());
-
+
//the selected node not necessary the original selection
//in case of not allow to change
_previousSelection = getSelection();
}
-
+
/**
* Called internally when page is unselected
*/
@@ -102,7 +102,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
super.pageUnselected(framework);
//check if the data is not saved
}
-
+
/**
* Initializes page. Called after construction or after clonePage().
* The reference to IFramework allows this page to set menu items, status
@@ -111,11 +111,11 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
*/
public void initialize(IFramework framework) {
//Debug.println("CMSResourcePage - initialize() "+mMenuInfo);
- super.initialize(framework);
+ super.initialize(framework);
if (mMenuInfo != null)
addMenuItems(mMenuInfo , _menuInfoAction);
}
-
+
/**
* Set and replace the existing menuInfo delegation object
*/
@@ -123,7 +123,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
//Debug.println("CMSResourcePage - setMenuInfo() "+menuInfo);
mMenuInfo = menuInfo;
}
-
+
/**
* Retrieve IMenuInfo object
*/
@@ -133,7 +133,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
}
return mMenuInfo;
}
-
+
/**
* Start the zipping status bar
*/
@@ -148,7 +148,7 @@ public class CMSResourcePage extends ResourcePage implements Cloneable {
public void progressStop() {
//XXX COMEBACK AFTER UPGRADE
_statusItemProgress.stop();
- }
-
+ }
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java b/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
index d2d64b3fc..9c3a702a7 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSServerInfo.java
@@ -34,10 +34,10 @@ import com.netscape.admin.certsrv.connection.*;
* @version $Revision$, $Date$
*/
public class CMSServerInfo implements IConnectionListener {
-
+
/*==========================================================
* variables
- *==========================================================*/
+ *==========================================================*/
private static final String PREFIX = "SERVER";
private AdminConnection mAdmin = null; // srever entry point
private String mHost = null; // server host
@@ -48,7 +48,7 @@ public class CMSServerInfo implements IConnectionListener {
private String mUserid = null; // user id
private String mInstallDate = null; // server install date
private String mPassword = null; // user password
- private String mPath = null;
+ private String mPath = null;
private Vector mSubsystem = new Vector();
/*==========================================================
@@ -56,8 +56,8 @@ public class CMSServerInfo implements IConnectionListener {
*==========================================================*/
public CMSServerInfo(String host, int port, String userid, String password,
String serverid, String installDate, String version,
- String serverRoot, String path)
- throws EAdminException
+ String serverRoot, String path)
+ throws EAdminException
{
mHost = host;
@@ -69,20 +69,20 @@ public class CMSServerInfo implements IConnectionListener {
mInstallDate = installDate;
mServerRoot = serverRoot;
mPath = path;
-
+
Debug.println("CMSServerInfo: host "+mHost+" port "+mPort+
" userid "+mUserid+" serverRoot "+mServerRoot+" serverid "+mServerId);
mAdmin = new AdminConnection(
- new BasicAuthenticator(mUserid, mPassword),
+ new BasicAuthenticator(mUserid, mPassword),
new SSLConnectionFactory(SSLConnectionFactory.JSS_CONNECTION),
true /* KeepAlive */, mHost, mPort, mPath);
- mAdmin.setConnectionListener(this);
+ mAdmin.setConnectionListener(this);
}
/*==========================================================
* public methods
*==========================================================*/
-
+
public void restartCallback() {
JFrame frame = UtilConsoleGlobals.getActivatedFrame();
if (frame != null) {
@@ -94,24 +94,24 @@ public class CMSServerInfo implements IConnectionListener {
}
public void ping() throws EAdminException {
-
+
// Need to do authentication here
NameValuePairs config = new NameValuePairs();
config.put(Constants.PR_PING, "");
-
+
NameValuePairs response;
-
+
response = mAdmin.read(DestDef.DEST_AUTH_ADMIN,
ScopeDef.SC_AUTH,
Constants.RS_ID_CONFIG,
config);
-
+
if (!response.get(Constants.PR_PING).equalsIgnoreCase(Constants.TRUE)) {
Debug.println("Ping failed -> Server off");
throw new EAdminException("PING_FAILED",false);
}
}
-
+
public void authenticate() throws EAdminException {
mAdmin.auth(DestDef.DEST_AUTH_ADMIN, ScopeDef.SC_AUTH);
}
@@ -131,27 +131,27 @@ public class CMSServerInfo implements IConnectionListener {
public int getPort() {
return mPort;
}
-
+
public String getUserId() {
- return mUserid;
+ return mUserid;
}
-
+
public String getServerId() {
- return mServerId;
+ return mServerId;
}
public String getServerRoot() {
- return mServerRoot;
+ return mServerRoot;
}
public String getServerVersion() {
return mServerVersion;
}
-
+
public String getInstallDate() {
- return mInstallDate;
+ return mInstallDate;
}
-
+
public Object clone() {
try {
return new CMSServerInfo(mHost, mPort, mUserid, mPassword,
@@ -160,13 +160,13 @@ public class CMSServerInfo implements IConnectionListener {
return null;
}
}
-
+
public Vector getInstalledSubsystems() {
return mSubsystem;
}
-
+
public void setInstalledSubsystems(Vector subsystem) {
mSubsystem = subsystem;
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
index c3451609d..e4a55bc91 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSTaskModel.java
@@ -45,12 +45,12 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo {
* variables
*==========================================================*/
private static String PREFIX = "CMSTASKMODEL_NODE_";
-
+
private static final String PREFERENCES_TASK_TAB = "TaskTab";
private static final String PREFERENCES_TASK_LIST = "TaskList";
-
+
static public String MENU_KEYCERT = CMSAdminResources.MENU_KEYCERT;
- static public String MENU_KEYCERT_MANAGEMENT =
+ static public String MENU_KEYCERT_MANAGEMENT =
CMSAdminResources.MENU_KEYCERT_MANAGEMENT;
static public String MENU_PKCS11 = CMSAdminResources.MENU_PKCS11;
static public String REF_TASKMODEL = "CMSTASKMODEL";
@@ -63,7 +63,7 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo {
/*==========================================================
* constructors
*==========================================================*/
-
+
public CMSTaskModel(ConsoleInfo ci, CMSServerInfo serverInfo) {
mServerInfo = serverInfo;
mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName());
@@ -74,14 +74,14 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* getServerInfo()
*/
public CMSServerInfo getServerInfo() {
return mServerInfo;
}
-
+
/**
* Returns supported menu categories
*/
@@ -106,8 +106,8 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo {
return null;
}
- public void actionObjectSelected(IPage viewInstance,
- ITaskObject selection,
+ public void actionObjectSelected(IPage viewInstance,
+ ITaskObject selection,
ITaskObject previousSelection) {
super.actionObjectSelected(viewInstance, selection, previousSelection);
mSelection = selection;
@@ -140,7 +140,7 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo {
desc = " ";
return new MenuItemText( keyword, name, desc);
}
-
+
private void init() {
TaskObject root = new TaskObject( "root", mConsoleInfo );
root.setAllowsChildren(true);
@@ -244,8 +244,8 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo {
} catch ( LDAPException e ) {
Debug.println( "CMSTaskModel.findTasks: " + e.toString() );
}
- }
-
+ }
+
//get task orders
private String findTaskOrder( String base ) {
String order = null;
@@ -283,6 +283,6 @@ public class CMSTaskModel extends TaskModel implements IMenuInfo {
ex );
}
return order;
- }
+ }
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java b/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
index 5999ab833..e808a7409 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSTaskObject.java
@@ -50,7 +50,7 @@ public class CMSTaskObject extends TaskObject
mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName());
}
- public CMSTaskObject(CMSServerInfo serverInfo, String name,
+ public CMSTaskObject(CMSServerInfo serverInfo, String name,
ConsoleInfo info) {
super(name, info);
mServerInfo = serverInfo;
@@ -67,5 +67,5 @@ public class CMSTaskObject extends TaskObject
public CMSServerInfo getServerInfo() {
return mServerInfo;
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java b/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
index 13028b003..2a4eb11bc 100644
--- a/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
+++ b/base/console/src/com/netscape/admin/certsrv/CMSUIFramework.java
@@ -49,7 +49,7 @@ public class CMSUIFramework {
/*==========================================================
* constructors
*==========================================================*/
- public CMSUIFramework(ConsoleInfo info, CMSServerInfo serverInfo)
+ public CMSUIFramework(ConsoleInfo info, CMSServerInfo serverInfo)
throws EAdminException
{
mConsoleInfo = info;
@@ -70,22 +70,22 @@ public class CMSUIFramework {
public void setSubSystemLocator(ISubSystemLocator locator) {
mSubSystemLocator = locator;
}
-
+
public IPage getPage(String type, String name) throws EAdminException {
return mPageFeeder.getPage(type, name);
}
-
+
public Framework getFramework() {
- return mFramework;
+ return mFramework;
}
-
+
public boolean isNTEnv() throws EAdminException {
Debug.println("CMSUIFramework - isNTEnv()");
NameValuePairs response;
AdminConnection conn = mServerInfo.getAdmin();
response = conn.search(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_PLATFORM, new NameValuePairs());
- if (response == null)
+ if (response == null)
throw new EAdminException("PROTOCOL_ERROR",false);
if (response.get(Constants.PR_NT).equals(Constants.TRUE))
return true;
@@ -99,12 +99,12 @@ public class CMSUIFramework {
//initialize the kernel UI
CMSKernelUILoader kernelUI = new CMSKernelUILoader(this);
kernelUI.register();
-
+
//load subsystem information. if no locator specified use default
if (mSubSystemLocator == null)
mSubSystemLocator = new DefaultSubSystemLocator();
SubSystemInfo[] subsystems = mSubSystemLocator.getInstalledSubSystem();
-
+
//delegate UI loading to each subsystem loader
UILoaderRegistry registry = new UILoaderRegistry(this);
Vector subsystemList = new Vector();
@@ -114,14 +114,14 @@ public class CMSUIFramework {
ISubSystemUILoader loader = registry.getUILoader(subsystems[i].mType);
loader.register();
} catch (Exception e) {
- Debug.println("Error loading subsystem UI - "+e.toString());
+ Debug.println("Error loading subsystem UI - "+e.toString());
}
}
-
+
//set subsystem setting
mServerInfo.setInstalledSubsystems(subsystemList);
}
-
+
}
//=====================================================================
@@ -134,7 +134,7 @@ class UILoaderRegistry {
private final String PREFIX = "UILOADERREGISTRY_";
private Hashtable mContent = new Hashtable();
private ResourceBundle mResource; // resource boundle
-
+
public UILoaderRegistry(CMSUIFramework uiFramework) {
mResource = ResourceBundle.getBundle(CMSAdminResources.class.getName());
mContent.put(Constants.PR_CA_INSTANCE,new CMSCAUILoader(uiFramework));
@@ -143,7 +143,7 @@ class UILoaderRegistry {
mContent.put(Constants.PR_OCSP_INSTANCE,new CMSOCSPUILoader(uiFramework));
//mContent.put("ccm",new CMSCCMUILoader(uiFramework));
}
-
+
public ISubSystemUILoader getUILoader(String type) throws EAdminException {
if (!mContent.containsKey(type)) {
Debug.println("Error Loading Subsystem UI Loader");
@@ -159,7 +159,7 @@ class UILoaderRegistry {
* Info container for the sub system
*/
class SubSystemInfo {
- String mType;
+ String mType;
String mNickName;
}
@@ -173,7 +173,7 @@ interface ISubSystemLocator {
//XXX DUMMY that just returned with all components
//XXX installed on the srever side
class DefaultSubSystemLocator implements ISubSystemLocator {
-
+
public SubSystemInfo[] getInstalledSubSystem() throws EAdminException {
SubSystemInfo[] subsystems = new SubSystemInfo[4];
for (int i=0; i< subsystems.length; i++)
@@ -185,7 +185,7 @@ class DefaultSubSystemLocator implements ISubSystemLocator {
//subsystems[3].mType="ccm";
if (true)
return subsystems;
- //this should never be called
+ //this should never be called
throw new EAdminException("DefaultSubSystemLocator - error loading",true);
}
}
@@ -196,11 +196,11 @@ class DefaultSubSystemLocator implements ISubSystemLocator {
*/
class HTTPSSubSystemLocator implements ISubSystemLocator {
private AdminConnection mConnection;
-
+
public HTTPSSubSystemLocator(AdminConnection conn) {
mConnection = conn;
}
-
+
public SubSystemInfo[] getInstalledSubSystem() throws EAdminException {
NameValuePairs input = getSubSystem();
Debug.println("getInstalledSubSystem() - "+input.toString());
@@ -216,7 +216,7 @@ class HTTPSSubSystemLocator implements ISubSystemLocator {
}
return subsystems;
}
-
+
private NameValuePairs getSubSystem() throws EAdminException {
Debug.println("CMSUIFramework - getSubSystem() - started");
NameValuePairs response;
@@ -224,12 +224,12 @@ class HTTPSSubSystemLocator implements ISubSystemLocator {
ScopeDef.SC_SUBSYSTEM,
new NameValuePairs());
if (response == null) {
- throw new EAdminException("PROTOCOL_ERROR",false);
+ throw new EAdminException("PROTOCOL_ERROR",false);
}
Debug.println("CMSUIFramework - getSubSystem() - completed");
return response;
}
-
+
}
/*
diff --git a/base/console/src/com/netscape/admin/certsrv/Console.java b/base/console/src/com/netscape/admin/certsrv/Console.java
index c9684583a..ca0bfcb2e 100644
--- a/base/console/src/com/netscape/admin/certsrv/Console.java
+++ b/base/console/src/com/netscape/admin/certsrv/Console.java
@@ -327,21 +327,21 @@ public class Console implements CommClient {
* Called by createPerInstanceUI().
*/
private String serverIDtoDN(String id) {
-
+
LDAPConnection ldc = _info.getLDAPConnection();
Vector instances = new Vector();
-
+
try {
LDAPSearchResults res = ldc.search(
- "o=netscapeRoot",
+ "o=netscapeRoot",
LDAPConnection.SCOPE_SUB,
"(nsServerID=" + id + ")",
new String[]{"dn"}, false);
-
+
while (res.hasMoreElements()) {
LDAPEntry hostEntry = res.next();
instances.addElement(hostEntry.getDN());
- }
+ }
if (instances.size() == 0) {
System.err.println("Server instance " + id + " does not exist.");
@@ -351,11 +351,11 @@ public class Console implements CommClient {
id = (String) instances.elementAt(0);
}
else {
-
+
if (_splashScreen != null) {
_splashScreen.setVisible(false);
}
-
+
int idx = -1;
while (idx == -1) {
System.out.println("\nThere are multiple instances of server \"" + id + "\":\n");
@@ -374,7 +374,7 @@ public class Console implements CommClient {
}
catch (Exception ignore) {}
}
-
+
if (idx >=1 && idx <= instances.size()) {
idx = idx - 1;
}
@@ -398,11 +398,11 @@ public class Console implements CommClient {
}
protected void createPerInstanceUI(String host) {
-
+
if (!DN.isDN(host)) {
host = serverIDtoDN(host);
}
-
+
LDAPConnection ldc = _info.getLDAPConnection();
String configDN = "cn=configuration," + host;
try {
@@ -499,7 +499,7 @@ public class Console implements CommClient {
common_init(language);
String userid = uid;
String password = passwd;
-
+
if (userid == null) {
userid = _preferences.getString(PREFERENCE_UID);
}
@@ -508,10 +508,10 @@ public class Console implements CommClient {
if(lastUsedURL != null) {
recentURLs.addElement(lastUsedURL);
if(adminURL == null) {
- adminURL = lastUsedURL;
+ adminURL = lastUsedURL;
}
}
-
+
if(adminURL == null) {
adminURL = localAdminURL;
}
@@ -621,7 +621,7 @@ public class Console implements CommClient {
if (rememberUserid) {
_preferences.set(PREFERENCE_UID, userid);
_preferences.set(PREFERENCE_URL, adminURL);
-
+
String recentlyUsedURL;
int count = 1;
Enumeration urlEnum = recentURLs.elements();
@@ -630,7 +630,7 @@ public class Console implements CommClient {
if(!recentlyUsedURL.equals(adminURL))
_preferences.set(PREFERENCE_URL+Integer.toString(count++), recentlyUsedURL);
}
-
+
for(; count < MAX_RECENT_URLS; count++) {
_preferences.remove(PREFERENCE_URL+Integer.toString(count));
}
@@ -659,7 +659,7 @@ public class Console implements CommClient {
_splashScreen.dispose();
com.netscape.management.client.console.SplashScreen.removeInstance();
_splashScreen = null;
-
+
break;
}
}
@@ -1531,7 +1531,7 @@ public class Console implements CommClient {
static public void main(String argv[]) {
GetOpt opt = new GetOpt("h:a:A:f:l:u:w:s:D:x:", argv);
-
+
if (opt.hasOption('f')) {
String outFile = opt.getOptionParam('f');
try {
@@ -1573,7 +1573,7 @@ public class Console implements CommClient {
Debug.println(0,
"Management-Console/" +
- _resource.getString("console","displayVersion") +
+ _resource.getString("console","displayVersion") +
" B" + VersionInfo.getBuildNumber());
if (opt.hasOption('x')) {
@@ -1614,7 +1614,7 @@ public class Console implements CommClient {
System.exit(0);
}
- // bug 353403: -a option intended for end-user to
+ // bug 353403: -a option intended for end-user to
// specify default admin url. This option overrides
// -A option.
String sAdminURL = null;
@@ -1782,7 +1782,7 @@ class TeeStream extends PrintStream {
/**
* An internal class used to wrap the parameters of an
* authentication request.
- *
+ *
* @author David Tompkins, 12/13/97
*/
class Response {
diff --git a/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
index c76c36006..b8014ce52 100644
--- a/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
+++ b/base/console/src/com/netscape/admin/certsrv/CustomComboBox.java
@@ -41,14 +41,14 @@ public class CustomComboBox extends JComboBox {
}
class CustomCellRenderer extends JLabel implements ListCellRenderer {
-
+
final static Color selectedCellBackground = new Color(0,0,128);
final static Color selectedCellForeground = Color.white;
final static Color defaultCellBackground = Color.white;
final static Color defaultCellForeground = Color.black;
final static String SELECTION_TITLE = CustomComboBoxModel.SELECTION_TITLE;
final static String SELECTION_ICON = CustomComboBoxModel.SELECTION_ICON;
-
+
CustomComboBox combobox;
public CustomCellRenderer(CustomComboBox x) {
@@ -72,7 +72,7 @@ class CustomCellRenderer extends JLabel implements ListCellRenderer {
setBackground(defaultCellBackground);
setForeground(defaultCellForeground);
}
-
+
return this;
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java b/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
index c97beeb5b..bcbc17feb 100644
--- a/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/CustomComboBoxModel.java
@@ -34,10 +34,10 @@ import javax.swing.event.*;
* @see CustomComboBox
*/
class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel {
-
+
/*==========================================================
* constructors
- *==========================================================*/
+ *==========================================================*/
public CustomComboBoxModel() {
_cache = new Vector();
_index = new Vector();
@@ -46,7 +46,7 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* set selected item
* DO NOT USE!!!
@@ -86,7 +86,7 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel {
return null;
}
}
-
+
/**
* set default icon
* @param icon new icon to be used
@@ -107,8 +107,8 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel {
newItem.put(SELECTION_DATA, data);
_cache.addElement(newItem);
_index.addElement(title.toUpperCase());
- }
-
+ }
+
/**
* Add new list entry into model
* @param icon new icon associated
@@ -121,7 +121,7 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel {
_cache.addElement(newItem);
_index.addElement(title.toUpperCase());
}
-
+
/**
* Add new list entry into model.
* Default icon used
@@ -134,14 +134,14 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel {
_cache.addElement(newItem);
_index.addElement(title.toUpperCase());
}
-
+
/**
* Remove all entries from the model
*/
public void removeAll() {
_cache.removeAllElements();
}
-
+
/**
* Remove specific entry from the model
* @param key key string associated with the entry
@@ -153,15 +153,15 @@ class CustomComboBoxModel extends AbstractListModel implements ComboBoxModel {
_index.removeElementAt(x);
}
}
-
+
/*==========================================================
* variables
*==========================================================*/
-
+
public static final String SELECTION_TITLE = "title";
public static final String SELECTION_ICON = "icon";
public static final String SELECTION_DATA = "data";
-
+
private Object _currentValue;
private Vector _cache;
private Vector _index;
diff --git a/base/console/src/com/netscape/admin/certsrv/EAdminException.java b/base/console/src/com/netscape/admin/certsrv/EAdminException.java
index acb5ab6ce..558cc71bb 100644
--- a/base/console/src/com/netscape/admin/certsrv/EAdminException.java
+++ b/base/console/src/com/netscape/admin/certsrv/EAdminException.java
@@ -131,7 +131,7 @@ public class EAdminException extends Exception {
return super.getMessage();
}
}
-
+
/**
* Returns the message or message tag unconvrted
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java b/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
index b26b9f9f9..2412c32ea 100644
--- a/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/GenericCellEditor.java
@@ -42,7 +42,7 @@ public class GenericCellEditor implements TableCellEditor, Serializable {
protected JComponent editorComponent;
protected JTextField mTextField = new JTextField();
protected JPasswordField mPasswordField = new JPasswordField();
-
+
protected EditorDelegate delegate = new EditorDelegate();
protected int clickCounts = 2;
@@ -58,7 +58,7 @@ public class GenericCellEditor implements TableCellEditor, Serializable {
Vector v = (Vector)(((CMSContentTableModel)model).getObjectValueAt(row));
delegate.setValue(value, v);
-
+
return editorComponent;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
index 34d69e37e..0045a31a7 100644
--- a/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/GenericCellRenderer.java
@@ -49,7 +49,7 @@ public class GenericCellRenderer
static Color HIGHLIGHTCOLOR = new Color(0, 0, 128);
static Color WHITECOLOR = Color.white;
static Color BLACKCOLOR = Color.black;
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -78,11 +78,11 @@ public class GenericCellRenderer
int row, int column) {
TableModel model = table.getModel();
if(value == null) {
-
- value = model.getValueAt(row, column);
+
+ value = model.getValueAt(row, column);
}
Vector v = (Vector)(((CMSContentTableModel)model).getObjectValueAt(row));
- this.value.setValue(value, v);
+ this.value.setValue(value, v);
component.setBackground(isSelected ? HIGHLIGHTCOLOR : WHITECOLOR);
component.setForeground(isSelected ? WHITECOLOR : BLACKCOLOR);
return component;
@@ -102,7 +102,7 @@ public class GenericCellRenderer
mLabel.setFont(temp.getFont());
}
component = mLabel;
-
+
StringBuffer buf = new StringBuffer();
for(int i=0; i< ((String)x).length(); i++)
buf.append("*");
@@ -129,7 +129,7 @@ public class GenericCellRenderer
} else if (type.equals(Constants.COMBOTYPE)) {
String[] items = (String[])v.elementAt(1);
- if (mComboBox == null)
+ if (mComboBox == null)
mComboBox = new JComboBox(items);
else {
mComboBox.removeAllItems();
@@ -146,7 +146,7 @@ public class GenericCellRenderer
mComboBox.setSelectedItem(str);
}
}
-
+
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java b/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
index 1a855ef22..e3ee2edf0 100644
--- a/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/IDisplayPanel.java
@@ -33,11 +33,11 @@ public interface IDisplayPanel {
/**
* Set the data associated with this ui
*/
- public boolean setDisplayPanelContent(IAttributeContent content);
-
+ public boolean setDisplayPanelContent(IAttributeContent content);
+
/**
* Retrieve the error message to be displayed to the user
*/
- public String getErrorMessage();
+ public String getErrorMessage();
} \ No newline at end of file
diff --git a/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
index c69bedc4c..649932482 100644
--- a/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/IRefreshTab.java
@@ -19,7 +19,7 @@ package com.netscape.admin.certsrv;
/**
* The interface for refreshing the tab.
- *
+ *
* @author Christine Ho
* @version $Revision$, $Date$
*
@@ -28,7 +28,7 @@ package com.netscape.admin.certsrv;
* @see com.netscape.admin.certsrv.CMSBaseResourceModel
*/
public interface IRefreshTab {
-
+
/**
* fresh the panel. The panel should IGNOR all
* modification made, retrieve the old value
@@ -36,6 +36,6 @@ public interface IRefreshTab {
* components on this panel.
*/
public void refresh();
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java b/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
index bc657b0db..6777e9fa0 100644
--- a/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/IRefreshTabPanel.java
@@ -27,12 +27,12 @@ package com.netscape.admin.certsrv;
* @see com.netscape.admin.certsrv.CMSBaseResourceModel
*/
public interface IRefreshTabPanel {
-
+
/**
- * Get Selected Tab from Tab panel
+ * Get Selected Tab from Tab panel
*/
public CMSBasePanel getSelectedTab();
-
-
+
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/IUIMapper.java b/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
index e24e38664..adbf8ab31 100644
--- a/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
+++ b/base/console/src/com/netscape/admin/certsrv/IUIMapper.java
@@ -53,37 +53,37 @@ public interface IUIMapper {
* @return description or null if none
*/
public String getDesc();
-
+
/**
* Is this UI provide edit panel
*/
- public boolean isEditable();
-
+ public boolean isEditable();
+
/**
* Is this UI Provide display panel
*/
- public boolean isDisplayable();
-
+ public boolean isDisplayable();
+
/**
* Is this UI provide search filter panel
*/
- public boolean isFilterable();
-
+ public boolean isFilterable();
+
/**
* retrieve Editor Panel
* isEditable() will be called before this operation is
* used.
*/
- public IEditorPanel getEditorPanel();
-
+ public IEditorPanel getEditorPanel();
+
/**
* retrieve Display Panel
*/
- public IDisplayPanel getDisplayPanel();
-
+ public IDisplayPanel getDisplayPanel();
+
/**
* Retrieve Filter Panel
*/
- public IFilterPanel getFilterPanel();
+ public IFilterPanel getFilterPanel();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java b/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
index ea41f6b45..e3682c248 100644
--- a/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
+++ b/base/console/src/com/netscape/admin/certsrv/LabelCellRenderer.java
@@ -42,7 +42,7 @@ public class LabelCellRenderer
public final static Color HIGHLIGHTCOLOR = new Color(0, 0, 128);
public final static Color WHITECOLOR = Color.white;
public final static Color BLACKCOLOR = Color.black;
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -77,9 +77,9 @@ public class LabelCellRenderer
int row, int column) {
if(value == null) {
- value = table.getModel().getValueAt(row, column);
+ value = table.getModel().getValueAt(row, column);
}
- this.value.setValue(value);
+ this.value.setValue(value);
component.setBackground(isSelected ? HIGHLIGHTCOLOR : WHITECOLOR);
component.setForeground(isSelected ? WHITECOLOR : BLACKCOLOR);
return component;
@@ -108,7 +108,7 @@ public class LabelCellRenderer
((JLabel)component).setToolTipText(((JLabel)x).getToolTipText());
}
}
-
+
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java b/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
index 531a0b5fc..368db2509 100644
--- a/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
+++ b/base/console/src/com/netscape/admin/certsrv/UIMapperRegistry.java
@@ -53,10 +53,10 @@ public class UIMapperRegistry {
* @param mapperClassName fully qualified class name implementing UI
*/
/* XXX WE DON'T NEED THIS
- public static void registerCertAttrUI(String className, String oid,
- String attrName, String mapperClassName)
+ public static void registerCertAttrUI(String className, String oid,
+ String attrName, String mapperClassName)
throws ClassNotFoundException, CertificateException
- {
+ {
Class extClass, mapClass;
extClass = Class.forName(className);
mapClass = Class.forName(mapperClassName);
@@ -64,7 +64,7 @@ public class UIMapperRegistry {
registerCertAttrUI(attrName,mapperClassName);
}
*/
-
+
/**
* internal register new cert attr
*
@@ -74,14 +74,14 @@ public class UIMapperRegistry {
*/
public static void registerCertAttrUI(String attrName, String mapperClassName) {
mAttrContent.put(attrName, mapperClassName);
- }
-
+ }
+
/**
* Retrieve all certificate attribute name
*/
public static Enumeration getCertAttrNames() {
return mAttrContent.keys();
- }
+ }
/**
* Retrieve all extension UI Mappers
@@ -95,7 +95,7 @@ public class UIMapperRegistry {
*
* @param certAttrClassName certificate attribute name
*/
- public static IUIMapper getCertAttrUI(String certAttrClassName)
+ public static IUIMapper getCertAttrUI(String certAttrClassName)
throws InstantiationException, IllegalAccessException, ClassNotFoundException
{
String mapperClassName = (String) mAttrContent.get(certAttrClassName);
@@ -116,6 +116,6 @@ public class UIMapperRegistry {
registry.addExtensionMapping
*/
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
index e6085f820..c1a4a9807 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
@@ -110,7 +110,7 @@ public class ACIDialog extends JDialog
CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
msg ,CMSAdminUtil.ERROR_MESSAGE);
return;
- }
+ }
} else if (evt.getSource().equals(mHelp)) {
CMSAdminUtil.help(mHelpToken);
}
@@ -168,7 +168,7 @@ public class ACIDialog extends JDialog
mAllowBtn.setSelected(true);
} else if (aci.startsWith("deny")) {
mDenyBtn.setSelected(true);
- }
+ }
int startIndex = aci.indexOf("(");
int endIndex = aci.indexOf(")");
if ((startIndex > 0) && (endIndex > 0)) {
@@ -197,7 +197,7 @@ public class ACIDialog extends JDialog
String result = "";
if (!mAllowBtn.isSelected() && !mDenyBtn.isSelected())
return "";
- if (mAllowBtn.isSelected())
+ if (mAllowBtn.isSelected())
result = result+"allow"+" (";
else if (mDenyBtn.isSelected())
result = result+"deny"+" (";
@@ -259,7 +259,7 @@ public class ACIDialog extends JDialog
}
}
}
-
+
return false;
}
@@ -356,7 +356,7 @@ public class ACIDialog extends JDialog
private JPanel makeListPane() {
JPanel listPanel = new JPanel();
-
+
GridBagConstraints gbc = new GridBagConstraints();
GridBagLayout gb = new GridBagLayout();
listPanel.setLayout(gb);
@@ -439,7 +439,7 @@ public class ACIDialog extends JDialog
gb.setConstraints(opsLabel, gbc);
mainPanel.add(opsLabel);
opsLabel.addMouseListener(this);
- opsLabel.setName("rights");
+ opsLabel.setName("rights");
mList = CMSAdminUtil.makeJList(mDataModel, 3);
mScrollPane = new JScrollPane(mList,
@@ -474,7 +474,7 @@ public class ACIDialog extends JDialog
*/
CMSAdminUtil.resetGBC(gbc);
- JLabel attrLabel = CMSAdminUtil.makeJLabel(mResource, PREFIX,
+ JLabel attrLabel = CMSAdminUtil.makeJLabel(mResource, PREFIX,
"SYNTAX", null);
gbc.anchor = gbc.NORTHWEST;
gbc.gridwidth = gbc.REMAINDER;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
index b3bcb72e1..cf3ae7dcd 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
@@ -61,7 +61,7 @@ public class ACLEditDialog extends JDialog
this(admin, parent, null, null);
}
- public ACLEditDialog(AdminConnection admin, JFrame parent,
+ public ACLEditDialog(AdminConnection admin, JFrame parent,
String name, String desc) {
super(parent,true);
mParentFrame = parent;
@@ -91,12 +91,12 @@ public class ACLEditDialog extends JDialog
} else if (evt.getSource().equals(mDelete)) {
int index = mList.getSelectedIndex();
if (index >= 0) {
- int i = CMSAdminUtil.showConfirmDialog(mParentFrame,
+ int i = CMSAdminUtil.showConfirmDialog(mParentFrame,
mResource, PREFIX, "DELETE", CMSAdminUtil.WARNING_MESSAGE);
if (i == JOptionPane.YES_OPTION) {
mDataModel.removeElementAt(index);
Debug.println("Deleted");
- if (mDataModel.size() > 0)
+ if (mDataModel.size() > 0)
mList.setSelectedIndex(0);
}
}
@@ -106,12 +106,12 @@ public class ACLEditDialog extends JDialog
if (mResourceName.equals("")) {
String msg = mResource.getString(
PREFIX+"_DIALOG_EMPTYRESOURCEID_MESSAGE");
- CMSAdminUtil.showErrorDialog(mParentFrame,
- mResource, msg, CMSAdminUtil.ERROR_MESSAGE);
+ CMSAdminUtil.showErrorDialog(mParentFrame,
+ mResource, msg, CMSAdminUtil.ERROR_MESSAGE);
return;
}
}
-
+
String rights = mRightsText.getText().trim();
NameValuePairs pairs = new NameValuePairs();
@@ -160,11 +160,11 @@ public class ACLEditDialog extends JDialog
}
} else if (evt.getSource().equals(mAdd)) {
String rights = mRightsText.getText().trim();
- if (rights.equals("")) {
+ if (rights.equals("")) {
String msg = mResource.getString(
PREFIX+"_DIALOG_EMPTYRIGHTS_MESSAGE");
- CMSAdminUtil.showErrorDialog(mParentFrame,
- mResource, msg, CMSAdminUtil.ERROR_MESSAGE);
+ CMSAdminUtil.showErrorDialog(mParentFrame,
+ mResource, msg, CMSAdminUtil.ERROR_MESSAGE);
return;
}
mOperations = rights;
@@ -254,7 +254,7 @@ public class ACLEditDialog extends JDialog
0,CMSAdminUtil.DIFFERENT_COMPONENT_SPACE);
gb.setConstraints(helpPanel, gbc);
center.add(helpPanel);
-
+
//action panel
JPanel action = makeActionPane();
CMSAdminUtil.resetGBC(gbc);
@@ -277,7 +277,7 @@ public class ACLEditDialog extends JDialog
mDelete.setEnabled(true);
mEdit.setEnabled(true);
}
-
+
return;
}
@@ -312,7 +312,7 @@ public class ACLEditDialog extends JDialog
//up, down buttons required
//actionlister to this object
mAdd = CMSAdminUtil.makeJButton(mResource, PREFIX, "ADD", null, this);
- mDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE",
+ mDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE",
null, this);
mEdit = CMSAdminUtil.makeJButton(mResource, PREFIX, "EDIT", null, this);
JButton[] buttons = {mAdd, mDelete, mEdit};
@@ -344,7 +344,7 @@ public class ACLEditDialog extends JDialog
mHelpArea.setWrapStyleWord(true);
mHelpArea.setBackground(helpPanel.getBackground());
mHelpArea.setEditable(false);
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
gbc.gridwidth = gbc.REMAINDER;
@@ -410,7 +410,7 @@ public class ACLEditDialog extends JDialog
mainPanel.add(rightsLbl);
rightsLbl.setName("rights");
rightsLbl.addMouseListener(this);
-
+
CMSAdminUtil.resetGBC(gbc);
mRightsText = new JTextField(30);
gbc.anchor = gbc.WEST;
@@ -493,7 +493,7 @@ public class ACLEditDialog extends JDialog
return mainPanel;
}
- private void enableTextField(JTextField textFld, boolean enabled,
+ private void enableTextField(JTextField textFld, boolean enabled,
Color color) {
textFld.setEnabled(enabled);
textFld.setEditable(enabled);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
index 4693224b1..71735f455 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
@@ -39,7 +39,7 @@ public class ACLImplTab extends CMSBaseUGTab {
private AdminConnection mConnection;
private JTable mTable;
private JScrollPane mScrollPane;
- protected ACLImplDataModel mDataModel;
+ protected ACLImplDataModel mDataModel;
protected EvaluatorRegisterDialog mEditor=null;
protected JButton mRefresh, mAdd, mDelete, mHelp;
private static final String HELPINDEX =
diff --git a/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java b/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
index 90b617cbd..a227a8d49 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/AutoRecoveryModel.java
@@ -37,8 +37,8 @@ public class AutoRecoveryModel extends CMSTableModel
*==========================================================*/
public static final String COL1 = "NUMBER";
public static final String COL2 = "UID";
- public static final String COL3 = "PASSWORD";
-
+ public static final String COL3 = "PASSWORD";
+
private static String[] mColumns = {COL1, COL2, COL3};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
index 18590747a..4cbc2edbb 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
@@ -33,7 +33,7 @@ import com.netscape.admin.certsrv.keycert.*;
/**
* CA certs Tab
*
- * @author Christine Ho
+ * @author Christine Ho
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config
*/
@@ -47,12 +47,12 @@ public class CACertsTab extends CMSBaseUGTab {
private AdminConnection mConnection;
private String mDestination;
private ConsoleInfo mConsoleInfo;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected ListCertsModel mDataModel; //table model
protected CertViewDialog mEditor=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mEdit, mHelp;
private final static String HELPINDEX = "configuration-log-plugin-help";
@@ -162,17 +162,17 @@ public class CACertsTab extends CMSBaseUGTab {
String[] params = new String[2];
if (trust.equals("U")) {
params[0] = "untrusted";
- params[1] = "trust";
+ params[1] = "trust";
i = showConfirmDialog("TRUST", params);
} else {
params[0] = "trusted";
- params[1] = "untrust";
+ params[1] = "untrust";
i = showConfirmDialog("TRUST", params);
}
if (i == JOptionPane.YES_OPTION) {
nvps.put("trustbit", params[1]);
- mConnection.modify(DestDef.DEST_SERVER_ADMIN,
+ mConnection.modify(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_ROOTCERT_TRUSTBIT,
Constants.RS_ID_CONFIG, nvps);
}
@@ -189,7 +189,7 @@ public class CACertsTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -198,8 +198,8 @@ public class CACertsTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -284,7 +284,7 @@ public class CACertsTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -293,28 +293,28 @@ public class CACertsTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
- response = mConnection.search(mDestination, ScopeDef.SC_ROOTCERTSLIST,
+ response = mConnection.search(mDestination, ScopeDef.SC_ROOTCERTSLIST,
new NameValuePairs());
} catch (EAdminException e) {
//display error dialog
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
index 8f1fc1f20..377e6287d 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAccessLogPanel.java
@@ -25,7 +25,7 @@ import java.awt.event.*;
/**
* Access Log Setting Tab to be displayed at the right hand side
- *
+ *
* @author Christine Ho
* @version $Revision$, $Date$
*/
@@ -46,7 +46,7 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
mHelpToken = HELPINDEX;
mIsNT = isNT;
}
-
+
/*==========================================================
* public methods
*==========================================================*/
@@ -88,7 +88,7 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
} catch (EAdminException e) {
showErrorDialog(e.toString());
mModel.progressStop();
- }
+ }
setValues();
mModel.progressStop();
clearDirtyFlag();
@@ -97,14 +97,14 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
private void parseVals(NameValuePairs nvp) {
if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
- Constants.TRUE))
+ Constants.TRUE))
activateLog.setSelected(true);
else
activateLog.setSelected(false);
mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL));
mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE);
mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE);
- int val =
+ int val =
Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL));
mFrequency = getRollOverIndex(val);
}
@@ -148,7 +148,7 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
NameValuePairs nvp = new NameValuePairs();
mModel.progressStart();
- if (activateLog.isSelected())
+ if (activateLog.isSelected())
nvp.put(Constants.PR_LOG_ENABLED, Constants.TRUE);
else
nvp.put(Constants.PR_LOG_ENABLED, Constants.FALSE);
@@ -183,13 +183,13 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
showErrorDialog(e.toString());
mModel.progressStop();
return false;
- }
+ }
clearDirtyFlag();
mModel.progressStop();
return true;
}
-
+
/**
* Implementation for reset values
* @return true if save successful; otherwise, false.
@@ -201,8 +201,8 @@ public class CMSAccessLogPanel extends CMSBaseLogPanel {
/*==========================================================
* EVENT HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
index 067b954e8..384cbc6cc 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAuditLogPanel.java
@@ -46,7 +46,7 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel {
mHelpToken = HELPINDEX;
mIsNT = isNT;
}
-
+
/*==========================================================
* public methods
*==========================================================*/
@@ -97,14 +97,14 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel {
private void parseVals(NameValuePairs nvp) {
if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
- Constants.TRUE))
+ Constants.TRUE))
activateLog.setSelected(true);
else
activateLog.setSelected(false);
mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL));
mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE);
mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE);
- int val =
+ int val =
Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL));
mFrequency = getRollOverIndex(val);
}
@@ -184,12 +184,12 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel {
mModel.progressStop();
return false;
}
-
+
mModel.progressStop();
clearDirtyFlag();
return true;
}
-
+
/**
* Implementation for reset values
* @return true if save successful; otherwise, false.
@@ -201,8 +201,8 @@ public class CMSAuditLogPanel extends CMSBaseLogPanel {
/*==========================================================
* EVENT HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java b/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
index ef55470c6..b29a579b4 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSAutoRecovery.java
@@ -74,7 +74,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
int col = mTable.getEditingColumn();
int row = mTable.getEditingRow();
if ((col>-1)&&(row>-1)) {
- String str = ((JTextComponent)component).getText();
+ String str = ((JTextComponent)component).getText();
mTable.setValueAt(str, row, col);
}
}
@@ -86,11 +86,11 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
CMSAdminUtil.showMessageDialog(mParentFrame, mResource,
PREFIX, "EMPTYFIELD", CMSAdminUtil.ERROR_MESSAGE);
return;
- } else {
+ } else {
NameValuePairs nvps = new NameValuePairs();
nvps.put(Constants.PR_RECOVERY_AGENT, val);
nvps.put(Constants.PR_AUTO_RECOVERY_ON, Constants.TRUE);
-
+
try {
mAdmin.modify(DestDef.DEST_KRA_ADMIN,
ScopeDef.SC_AUTO_RECOVERY, Constants.RS_ID_CONFIG, nvps);
@@ -98,7 +98,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
ex.getMessage(), CMSAdminUtil.ERROR_MESSAGE);
}
- }
+ }
mEnable.setText(mDisableLabel);
mEnable.setToolTipText(mDisableTip);
mEnable.repaint();
@@ -108,7 +108,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
cleanup();
this.dispose();
}
-
+
}
//Set the first column's cellrender as label cell
@@ -151,7 +151,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
GridBagLayout gbm = new GridBagLayout();
getContentPane().setLayout(gbm);
GridBagConstraints gbc = new GridBagConstraints();
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel heading = CMSAdminUtil.makeJLabel(mResource, PREFIX,
"HEADING", null);
@@ -214,7 +214,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
}
private void createTable() {
-
+
NameValuePairs nvps = new NameValuePairs();
nvps.put(Constants.PR_RECOVERY_M, "");
@@ -227,7 +227,7 @@ public class CMSAutoRecovery extends JDialog implements ActionListener,
} catch (EAdminException e) {
//showErrorDialog(e.toString());
}
-
+
mDataModel = new AutoRecoveryModel();
Vector[] data = new Vector[numUsers];
for (int i=0; i<data.length; i++) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
index 87562829b..37d10879c 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
@@ -76,7 +76,7 @@ public class CMSBaseConfigDialog extends JDialog
/* true if creating a new instance
* false if editing an old one
*/
- protected boolean mNewInstance=false; //
+ protected boolean mNewInstance=false; //
private ExtendedPluginInfoSet mEPIs = null;
protected CMSBaseResourceModel mModel = null;
@@ -140,7 +140,7 @@ public class CMSBaseConfigDialog extends JDialog
/**
* retrieve the extended plugin information for this plugin
- * from the server. The servlet must implement the scope
+ * from the server. The servlet must implement the scope
* 'extendedPluginInfo' and the plugin must implement the
* IExtendedPluginInfo interface, or else the display
* will revert back to simple name-value pairs.
@@ -148,12 +148,12 @@ public class CMSBaseConfigDialog extends JDialog
ExtendedPluginInfoSet getExtendedPluginInfo(String implname,
NameValuePairs oldstyle) {
-
+
NameValuePairs data = new NameValuePairs();
String query = mImplType+":"+implname;//implName:pluginName
NameValuePairs response=null;
- if (mImplType.equals("policy") &&
+ if (mImplType.equals("policy") &&
(mRuleName != null) && !mRuleName.trim().equals("")) {
query = query + ":" + mRuleName;
}
@@ -174,7 +174,7 @@ public class CMSBaseConfigDialog extends JDialog
/* if the servlet or rule wasn't capable of handling the new style
* of interface, just return the names from the name/value pairs that
- * were passed in
+ * were passed in
* otherwise, for each parameter name, fetch the associated
* parameter type from the extendedPluginInfo that the server
* returned
@@ -191,10 +191,10 @@ public class CMSBaseConfigDialog extends JDialog
String ht = response.get("HELP_TOKEN");
- if (ht != null) epis.setHelpToken(ht);
+ if (ht != null) epis.setHelpToken(ht);
String hs = response.get("HELP_TEXT");
- if (hs != null) epis.setHelpSummary(hs);
+ if (hs != null) epis.setHelpSummary(hs);
return epis;
}
@@ -265,7 +265,7 @@ public class CMSBaseConfigDialog extends JDialog
0, // bottom
5); // right
p.add(l,gbc);
-
+
/* if there was no text extendedplugininfo for this parameter
* just make it a text box
@@ -283,7 +283,7 @@ public class CMSBaseConfigDialog extends JDialog
*/
comp.addFocusListener(this);
- gbc.weightx = 0.7;
+ gbc.weightx = 0.7;
gbc.fill = gbc.HORIZONTAL;
gbc.gridwidth = gbc.RELATIVE;
gbc.anchor = gbc.WEST;
@@ -298,17 +298,17 @@ public class CMSBaseConfigDialog extends JDialog
* keep it from hiting the edge of the panel
*/
JLabel j = new JLabel("");
- gbc.weightx = 0.1;
+ gbc.weightx = 0.1;
gbc.fill = gbc.HORIZONTAL;
gbc.gridwidth = gbc.REMAINDER;
gbc.anchor = gbc.WEST;
gbc.insets = new Insets(
CMSAdminUtil.COMPONENT_SPACE, //top
0, //left
- 0, //bottom
+ 0, //bottom
CMSAdminUtil.COMPONENT_SPACE); // right
p.add(j,gbc);
-
+
}
}
@@ -352,9 +352,9 @@ public class CMSBaseConfigDialog extends JDialog
return mIsOK;
}
-
+
public String getRuleName() {
- return mRuleName;
+ return mRuleName;
}
/*==========================================================
@@ -384,7 +384,7 @@ public class CMSBaseConfigDialog extends JDialog
mHelpLabel.setText(text);
mHelpLabel.repaint();
-
+
}
/** need to supply this method for focuslistener, but we
@@ -392,7 +392,7 @@ public class CMSBaseConfigDialog extends JDialog
*/
public void focusLost(FocusEvent f) {
}
-
+
/*
* mouselistener events - for JLabel
@@ -451,14 +451,14 @@ public class CMSBaseConfigDialog extends JDialog
public void actionPerformed(ActionEvent evt) {
if (evt.getSource().equals(mOK)) {
-
+
/* if this is a new instance of a rule, (as opposed to editing an old one) */
if (mNewInstance) {
mRuleName = mPluginName.getText();
/* make sure they set the name of the rule, otherwise, show an error message */
if (mRuleName.trim().equals("")) {
CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
- mResource.getString("INSTANCECONFIGDIALOG_DIALOG_NOINSTANCENAME_MESSAGE"),
+ mResource.getString("INSTANCECONFIGDIALOG_DIALOG_NOINSTANCENAME_MESSAGE"),
CMSAdminUtil.ERROR_MESSAGE);
return;
}
@@ -466,7 +466,7 @@ public class CMSBaseConfigDialog extends JDialog
else {
mRuleName = mPluginLabel.getText();
}
-
+
Debug.println(4,"User pressed okay on instance config dialog");
Enumeration e = mEPIs.keys();
NameValuePairs nvp = new NameValuePairs();
@@ -481,7 +481,7 @@ public class CMSBaseConfigDialog extends JDialog
nvp.put("PASSWORD_CACHE_ADD", value + ";" + password);
}
}
-
+
nvp.put(paramName, value);
}
nvp.put(PolicyRuleDataModel.RULE_NAME, mRuleName);
@@ -509,7 +509,7 @@ public class CMSBaseConfigDialog extends JDialog
ex.toString(),CMSAdminUtil.ERROR_MESSAGE);
}
}
-
+
if (evt.getSource().equals(mCancel)) {
this.dispose();
}
@@ -591,19 +591,19 @@ public class CMSBaseConfigDialog extends JDialog
/* mPluginName and mPluginLabel occupy the same space in the UI, but
* only one of them is visible at a time. showDialog() determines which
- * is visible. If this is a new component, mPluginName is visible, and is a
+ * is visible. If this is a new component, mPluginName is visible, and is a
* a text field, so the user can enter the name of the new instance.
* Otherwise, it's just a label, showing the existing name.
*/
// 'Policy Rule ID' here
CMSAdminUtil.resetGBC(gbc);
- mRulenameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX,
+ mRulenameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX,
"RULENAME", null);
mRulenameCaption.addMouseListener(this);
mPluginLabel = new JLabel();
mPluginLabel.setVisible(false);
mPluginName = new JTextField();
-
+
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
gbc.gridwidth = 1;
@@ -621,10 +621,10 @@ public class CMSBaseConfigDialog extends JDialog
0,CMSAdminUtil.COMPONENT_SPACE);
mListPanel.add( mPluginName, gbc );
mListPanel.add( mPluginLabel, gbc );
-
+
// 'Policy Plugin ID' here
CMSAdminUtil.resetGBC(gbc);
- mImplnameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX,
+ mImplnameCaption = CMSAdminUtil.makeJLabel(mResource, PREFIX,
"IMPLNAME", null);
mImplnameCaption.addMouseListener(this);
@@ -648,7 +648,7 @@ public class CMSBaseConfigDialog extends JDialog
mScrollPane = new JScrollPane(mParamPanel);
mScrollPane.setBorder(CMSAdminUtil.makeEtchedBorder());
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.fill = gbc.BOTH;
gbc.anchor = gbc.WEST;
@@ -691,14 +691,14 @@ public class CMSBaseConfigDialog extends JDialog
return mListPanel;
}
-}
+}
class ExtendedPluginInfoSet extends Hashtable {
/**
* Add a value for this config parameter.
- * the format of 'syntax' is specified in
+ * the format of 'syntax' is specified in
* @see com.netscape.certsrv.base.IExtendedPluginInfo
*/
public void add(String param, String syntax, boolean oldstyle) {
@@ -725,7 +725,7 @@ class ExtendedPluginInfoSet extends Hashtable {
helptext = rest; // ADDED to fix bug #383969
/*
semicolon = rest.indexOf(';');
- if (semicolon == -1) { // no more semicolons
+ if (semicolon == -1) { // no more semicolons
helptext = rest;
}
else {
@@ -786,7 +786,7 @@ class ExtendedPluginInfoCheckBox extends JCheckBox
implements ExtendedPluginInfoComponent
{
private ExtendedPluginInfo mEpi;
-
+
public ExtendedPluginInfoCheckBox(ExtendedPluginInfo epi, boolean b)
{
super("",b);
@@ -805,14 +805,14 @@ implements ExtendedPluginInfoComponent
return "false";
}
}
-
+
}
class ExtendedPluginInfoComboBox extends JComboBox
implements ExtendedPluginInfoComponent
{
private ExtendedPluginInfo mEpi;
-
+
public ExtendedPluginInfoComboBox(ExtendedPluginInfo epi, Vector v)
{
super(v);
@@ -832,7 +832,7 @@ class ExtendedPluginInfoTextField extends JTextField
implements ExtendedPluginInfoComponent
{
private ExtendedPluginInfo mEpi;
-
+
public ExtendedPluginInfoTextField(ExtendedPluginInfo epi, String s)
{
super(s);
@@ -852,7 +852,7 @@ class ExtendedPluginInfoPasswordField extends JPasswordField
implements ExtendedPluginInfoComponent
{
private ExtendedPluginInfo mEpi;
-
+
public ExtendedPluginInfoPasswordField(ExtendedPluginInfo epi, String s)
{
super(s);
@@ -872,7 +872,7 @@ class ExtendedPluginInfoNumberField extends JTextField
implements ExtendedPluginInfoComponent
{
private ExtendedPluginInfo mEpi;
-
+
public ExtendedPluginInfoNumberField(ExtendedPluginInfo epi, String s)
{
super(s);
@@ -893,7 +893,7 @@ implements ExtendedPluginInfoComponent
static class NumberDocument extends PlainDocument {
- public void insertString(int offs, String str, AttributeSet a)
+ public void insertString(int offs, String str, AttributeSet a)
throws BadLocationException {
if (str == null) {
@@ -902,9 +902,9 @@ implements ExtendedPluginInfoComponent
char[] chars = str.toCharArray();
int j=0;
-
+
for (int i = 0; i < chars.length; i++) {
- if ( (chars[i]<'0' || chars[i]>'9')
+ if ( (chars[i]<'0' || chars[i]>'9')
&& (chars[i] != '.')
&& (chars[i] != '-') ) {
}
@@ -929,7 +929,7 @@ implements ExtendedPluginInfoComponent
*/
class ExtendedPluginInfo {
-
+
public static final int TYPE_STRING = 0;
public static final int TYPE_BOOLEAN = 1;
public static final int TYPE_NUMBER = 2;
@@ -1015,7 +1015,7 @@ class ExtendedPluginInfo {
public int getType() {
return mType;
}
-
+
public void setRequired(boolean b) {
mRequired = b;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
index 89dce60c7..415dfe238 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigPanel.java
@@ -35,11 +35,11 @@ import java.awt.event.*;
* @version $Revision$, $Date$
*/
public abstract class CMSBaseConfigPanel extends CMSBasePanel {
-
+
/*==========================================================
* variables
*==========================================================*/
-
+
private String mTitle; // panel title actually shows
protected boolean mDirty = false; // panel dirty flag
protected boolean mInit = false; // true if this panel is initialized
@@ -59,32 +59,32 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel {
mTitle = title;
} catch (MissingResourceException e) {
mTitle = "Missing Title";
- }
+ }
}
-
+
public CMSBaseConfigPanel() {
- super("");
+ super("");
mTitle = "Missing Title";
}
-
+
/*==========================================================
* abstract methods
*==========================================================*/
-
+
//Actual Instanciation of the panels
public abstract void init();
-
+
//Implementation for saving panel information
public abstract boolean applyCallback();
-
+
//Implementation for reset values
public abstract boolean resetCallback();
-
-
+
+
/*==========================================================
* public methods
*==========================================================*/
-
+
//Implementation for calling help
public void helpCallback() {
CMSAdminUtil.help(mHelpToken);
@@ -96,15 +96,15 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel {
*/
public String getTitle() {
return mTitle;
- }
-
+ }
+
/**
* set the title of the tab
*/
public void setTitle(String title) {
mTitle = title;
- }
-
+ }
+
/**
* see if the contents of the panel have been changed but not applied
* @return true if dirty; otherwise,false.
@@ -112,7 +112,7 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel {
public boolean isDirty() {
return mDirty;
}
-
+
/**
* Called by the Tab parent to initialize the panel
*/
@@ -124,11 +124,11 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel {
mInit = true;
}
}
-
+
/*==========================================================
* EVNET HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
if (mInit)
@@ -160,21 +160,21 @@ public abstract class CMSBaseConfigPanel extends CMSBasePanel {
if (mInit)
this.setDirtyFlag();
}
-
+
/*==========================================================
* protected methods
*==========================================================*/
-
- //=== Dirty Flag =========================
-
+
+ //=== Dirty Flag =========================
+
//set dirty flag
protected void setDirtyFlag() {
mDirty = true;
}
-
+
//clear dirty flag
protected void clearDirtyFlag() {
mDirty = false;
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
index dbba4a763..a1767f213 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLDAPPanel.java
@@ -44,7 +44,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
private JCheckBox mEnablePublishing;
private JCheckBox mEnableQueue;
private Color mActiveColor;
- private JLabel mHostLabel, mPortLabel, mBindAsLabel, mVersionLabel;
+ private JLabel mHostLabel, mPortLabel, mBindAsLabel, mVersionLabel;
protected JLabel mPasswordLabel;
protected AdminConnection mAdmin;
protected CMSBaseResourceModel mModel;
@@ -70,7 +70,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
this(panelName, parent, true);
mPanelName = panelName;
}
-
+
public CMSBaseLDAPPanel(String panelName, CMSTabPanel parent, boolean flag) {
super(panelName, parent);
mServletName = getServletName(panelName);
@@ -87,7 +87,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
GridBagLayout gb = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
mCenterPanel.setLayout(gb);
-
+
mEnablePublishing = makeJCheckBox("ENABLEPUBLISHING");
mEnablePublishing.setSelected(true);
CMSAdminUtil.resetGBC(gbc);
@@ -95,7 +95,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
gbc.fill = gbc.NONE;
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
- gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
+ gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
DIFFERENT_COMPONENT_SPACE,
0,
DIFFERENT_COMPONENT_SPACE);
@@ -111,7 +111,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
gbc.fill = gbc.NONE;
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
- gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
+ gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
DIFFERENT_COMPONENT_SPACE,
0,
DIFFERENT_COMPONENT_SPACE);
@@ -127,7 +127,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
gbc.fill = gbc.NONE;
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
- gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
+ gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
DIFFERENT_COMPONENT_SPACE,
0,
DIFFERENT_COMPONENT_SPACE);
@@ -135,7 +135,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
mEnable.addItemListener(this);
if (mLDAPPublishing)
mCenterPanel.add(mEnable);
-
+
//add the destination panel
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
@@ -150,7 +150,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
serverInfo.setLayout(gb1);
if (mLDAPPublishing)
serverInfo.setBorder(makeTitledBorder("DESTINATION"));
-
+
// add host name label and text field
CMSAdminUtil.resetGBC(gbc);
mHostLabel = makeJLabel("HOST");
@@ -213,7 +213,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
JLabel dummy = new JLabel(" ");
CMSAdminUtil.addEntryField(serverInfo, mVersionLabel, mVersionBox,
dummy, gbc);
-
+
// add cert nickname
CMSAdminUtil.resetGBC(gbc);
mCertLabel = makeJLabel("CERTLIST");
@@ -268,9 +268,9 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
}
protected String getServletName(String panelName) {
- if (panelName.equals("LDAPSETTING"))
+ if (panelName.equals("LDAPSETTING"))
return DestDef.DEST_SERVER_ADMIN;
- else if (panelName.equals("CALDAPSETTING"))
+ else if (panelName.equals("CALDAPSETTING"))
return DestDef.DEST_CA_PUBLISHER_ADMIN;
return DestDef.DEST_RA_PUBLISHER_ADMIN;
}
@@ -331,7 +331,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
for (int index=0; tokenizer.hasMoreTokens(); index++) {
String str = (String)tokenizer.nextToken();
if (str.startsWith(SERVER_CERT_NICKNAME))
- serverCertIndex = index;
+ serverCertIndex = index;
mCertBox.addItem(str);
}
} else if (name.equals(Constants.PR_LDAP_CLIENT_CERT)) {
@@ -341,7 +341,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
}
}
- if (version.equals(""))
+ if (version.equals(""))
mVersionBox.setSelectedIndex(1);
else
mVersionBox.setSelectedItem(version);
@@ -462,7 +462,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
private void repaintComp(JComponent component) {
component.invalidate();
component.validate();
- component.repaint(1);
+ component.repaint(1);
}
public void actionPerformed(ActionEvent e) {
@@ -570,7 +570,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
showMessageDialog("EMPTYPASSWD");
return false;
}
-
+
nvps.put(Constants.PR_DIRECTORY_MANAGER_PWD, passwd);
} else {
nvps.put(Constants.PR_LDAP_CLIENT_CERT,
@@ -632,7 +632,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
}
}
*/
-
+
}
mModel.progressStart();
@@ -649,7 +649,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
UtilConsoleGlobals.getActivatedFrame(),
CMSAdminUtil.wrapText(report,80),
"Configuration Successful",
- JOptionPane.INFORMATION_MESSAGE,
+ JOptionPane.INFORMATION_MESSAGE,
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_INFO_ICON));
clearDirtyFlag();
} else {
@@ -657,7 +657,7 @@ public abstract class CMSBaseLDAPPanel extends CMSBaseTab implements ItemListene
UtilConsoleGlobals.getActivatedFrame(),
CMSAdminUtil.wrapText(report,80),
"Configuration Error", JOptionPane.YES_NO_OPTION,
- JOptionPane.ERROR_MESSAGE,
+ JOptionPane.ERROR_MESSAGE,
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON));
if (i == JOptionPane.YES_OPTION) {
mAdmin.modify(mServletName, ScopeDef.SC_LDAP,
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
index c0437cbc4..c4cd26ffb 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseLogPanel.java
@@ -67,7 +67,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab {
super(panelName, parent);
mModel = parent.getResourceModel();
}
-
+
/*==========================================================
* public methods
*==========================================================*/
@@ -115,7 +115,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab {
gbc.fill = gbc.NONE;
gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0, COMPONENT_SPACE);
logInfo.add(logFQC, gbc);
-
+
mlogFQC = makeJComboBox("LOGFQC");
gbc.anchor = gbc.WEST;
logInfo.add(mlogFQC, gbc);
@@ -125,7 +125,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab {
gbc.fill = gbc.HORIZONTAL;
gbc.weightx = 1.0;
logInfo.add(dummyFQC, gbc);
-
+
// Log File Maximum Size
CMSAdminUtil.resetGBC(gbc);
JLabel logMaxSiz = makeJLabel("LOGMAXSIZ");
@@ -142,7 +142,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab {
gbc.fill = gbc.HORIZONTAL;
logInfo.add(mlogMaxSizText, gbc);
mActiveColor = mlogMaxSizText.getBackground();
-
+
mMaxLabel = makeJLabel("SIZEUNIT");
gbc.weightx = 0.0;
gbc.fill = gbc.NONE;
@@ -314,7 +314,7 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab {
mlogFQC.setSelectedIndex(mFrequency);
mlogMaxSizText.setText(mlogMaxSizTextData);
mlogBufSizText.setText(mlogBufSizTextData);
- mLogLevel.setSelectedIndex(mLevel);
+ mLogLevel.setSelectedIndex(mLevel);
if (mIsNT) {
if (mActivateNTLog.isSelected()) {
@@ -353,8 +353,8 @@ public abstract class CMSBaseLogPanel extends CMSBaseTab {
/*==========================================================
* EVENT HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
index c3c707f68..6d9e445f3 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBaseTab.java
@@ -34,7 +34,7 @@ import com.netscape.management.client.util.*;
* @author Jack Pan-Chen
* @version $Revision$, $Date$
*/
-public abstract class CMSBaseTab extends CMSBaseConfigPanel
+public abstract class CMSBaseTab extends CMSBaseConfigPanel
implements IRefreshTab {
/*==========================================================
@@ -66,28 +66,28 @@ public abstract class CMSBaseTab extends CMSBaseConfigPanel
super.clearDirtyFlag();
mParent.clearDirtyTab(this);
}
-
+
//=== OVERWRITE DIALOG MESSAGE =====================
-
+
protected void showMessageDialog(String keyword, int messageType ) {
CMSAdminUtil.showMessageDialog(mParent.mModel.getFrame(), mResource, mPanelName, keyword, messageType);
}
-
+
protected void showMessageDialog(String keyword) {
showMessageDialog(keyword, ERROR_MESSAGE);
}
-
+
protected int showConfirmDialog(String keyword, int messageType ) {
return CMSAdminUtil.showConfirmDialog(mParent.mModel.getFrame(), mResource, mPanelName, keyword, messageType);
- }
-
+ }
+
protected int showConfirmDialog(String keyword) {
return showConfirmDialog(keyword, WARNING_MESSAGE);
}
-
+
protected void showErrorDialog(String message) {
CMSAdminUtil.showErrorDialog(mParent.mModel.getFrame(), mResource, message, ERROR_MESSAGE);
- }
+ }
public void refresh() {
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
index b3f357564..819446e9a 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSBlankPanel.java
@@ -41,7 +41,7 @@ public class CMSBlankPanel extends CMSBaseTab {
public CMSBlankPanel(ResourceModel model) {
super(PANEL_NAME, null);
}
-
+
public CMSBlankPanel(ResourceModel model, CMSTabPanel parent, String name) {
super(PANEL_NAME, parent);
setTitle(name);
@@ -50,13 +50,13 @@ public class CMSBlankPanel extends CMSBaseTab {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* Actual Instanciation of the UI components
- */
+ */
public void init() {
}
-
+
/**
* Implementation for saving panel information
* @return true if save successful; otherwise, false.
@@ -64,7 +64,7 @@ public class CMSBlankPanel extends CMSBaseTab {
public boolean applyCallback() {
return true;
}
-
+
/**
* Implementation for reset values
* @return true if save successful; otherwise, false.
@@ -72,7 +72,7 @@ public class CMSBlankPanel extends CMSBaseTab {
public boolean resetCallback() {
return true;
}
-
+
/**
* Implementation for calling help
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
index 76aa59511..9e898ed05 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCACertSettingPanel.java
@@ -38,7 +38,7 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
private static String PANEL_NAME = "CACERTSETTING";
private PanelMapperConfigDialog mDialog = null;
private CMSTabPanel mParent;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-ca-ldappublish-cacert-help";
/*==========================================================
@@ -53,17 +53,17 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* Actual UI construction
*/
public void init() {
super.init();
-
+
//XXX B1 - disable the publisher configuration
mPublisher.setEnabled(false);
//XXX B1 - disable the publisher configuration
-
+
refresh();
}
@@ -105,17 +105,17 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
refresh();
return true;
}
-
+
/*==========================================================
* EVNET HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(mMapper)) {
Debug.println("Edit Mapper Config");
mDialog = new PanelMapperConfigDialog(_model.getFrame(), _admin);
- mDialog.showDialog(_mapper.getText(),
+ mDialog.showDialog(_mapper.getText(),
DestDef.DEST_CA_ADMIN, ScopeDef.SC_CACERT);
if (!mDialog.isOK())
return;
@@ -124,24 +124,24 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
//Debug.println("Edit Publisher Config");
}
}
-
+
/*==========================================================
* private methods
*==========================================================*/
-
+
/* get config parameters associated with each mapper
private NameValueParis getConfig() throws EAdminException {
-
+
NameValuePairs response = _admin.read(DestDef.DEST_CA_ADMIN,
- ScopeDef.SC_CAMAPPER, _mapper.getText()],
+ ScopeDef.SC_CAMAPPER, _mapper.getText()],
new NameValuePairs());
return response;
}
*/
-
- /*send configuration to server
+
+ /*send configuration to server
private void sendConfig(NameValuePairs response) {
-
+
response.add(Constants.PR_MAPPER, MAPPER[_mapper.getSelectedIndex()]);
_model.progressStart();
try {
@@ -153,10 +153,10 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
return false;
}
_model.progressStop();
-
+
}
*/
-
+
private void populate(NameValuePairs nvps) {
for (String name : nvps.keySet()) {
String value = nvps.get(name);
@@ -166,6 +166,6 @@ public class CMSCACertSettingPanel extends CMSCertSettingPanel {
_publisher.setText(value);
}
}
- }
+ }
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
index 1af02a881..35f891530 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCAConnectorPanel.java
@@ -162,7 +162,7 @@ public class CMSCAConnectorPanel extends CMSBaseTab
ScopeDef.SC_CONNECTOR, name, nvps);
NameValuePairs subsystems = mAdmin.search(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_SUBSYSTEM, new NameValuePairs());
-
+
boolean colocated = false;
if (name.equals("Data Recovery Manager Connector")) {
String val = values.get("id");
@@ -171,7 +171,7 @@ public class CMSCAConnectorPanel extends CMSBaseTab
}
ConnectorEditor editor = new ConnectorEditor(mAdmin,
- mModel.getFrame(), name, DestDef.DEST_CA_ADMIN,
+ mModel.getFrame(), name, DestDef.DEST_CA_ADMIN,
mModel.getServerInfo().getServerId(), colocated);
editor.showDialog(values);
} catch (EAdminException ex) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
index 6f809316a..bee66d6ee 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCAGeneralPanel.java
@@ -95,7 +95,7 @@ public class CMSCAGeneralPanel extends CMSBaseTab implements ItemListener {
//gbc.weighty = 1.0;
gb.setConstraints(adminPanel, gbc);
// mCenterPanel.add(adminPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
gbc.gridwidth = gbc.REMAINDER;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
index 735818834..a06aac901 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCALDAPPanel.java
@@ -28,7 +28,7 @@ import com.netscape.management.client.util.*;
public class CMSCALDAPPanel extends CMSBaseLDAPPanel {
private static String PANEL_NAME = "CALDAPSETTING";
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-ca-ldappublish-destination-help";
public CMSCALDAPPanel(CMSTabPanel parent) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
index 51da9c58c..1e1516f2b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLCachePanel.java
@@ -32,10 +32,10 @@ import java.awt.event.*;
* @version $Revision$, $Date$
*/
public class CMSCRLCachePanel extends CMSBaseTab {
-
+
/*==========================================================
* variables
- *==========================================================*/
+ *==========================================================*/
private static String PANEL_NAME = "CRLCACHE";
private JCheckBox mEnableCache;
@@ -83,11 +83,11 @@ public class CMSCRLCachePanel extends CMSBaseTab {
public void init() {
Debug.println("CRLCachePanel: init()");
_admin = _model.getServerInfo().getAdmin();
-
+
GridBagLayout gb = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
mCenterPanel.setLayout(gb);
-
+
//cache panel
JPanel cachePanel = new JPanel();
@@ -333,7 +333,7 @@ public class CMSCRLCachePanel extends CMSBaseTab {
public boolean resetCallback() {
refresh();
return true;
- }
+ }
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(mEnableCache)) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
index 3257b90a0..4486bd80b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLFormatPanel.java
@@ -33,10 +33,10 @@ import java.util.StringTokenizer;
* @version $Revision$, $Date$
*/
public class CMSCRLFormatPanel extends CMSBaseTab {
-
+
/*==========================================================
* variables
- *==========================================================*/
+ *==========================================================*/
private static String PANEL_NAME = "CRLFORMAT";
private JCheckBox mEnableExtensions;
private JCheckBox mEnableExpired;
@@ -203,7 +203,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
gbc.gridwidth = 1;
gbc.insets = new Insets(COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0);
contentsPanel.add(mProfileCertsOnly, gbc);
-
+
mProfiles = makeJTextField(20);
gbc.anchor = gbc.WEST;
gbc.gridx++;
@@ -329,7 +329,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
nvps.put(Constants.PR_EXTENSIONS, Constants.TRUE);
else
nvps.put(Constants.PR_EXTENSIONS, Constants.FALSE);
-
+
if (mEnableExpired.isSelected())
nvps.put(Constants.PR_INCLUDE_EXPIREDCERTS, Constants.TRUE);
else
@@ -344,7 +344,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
nvps.put(Constants.PR_CA_CERTS_ONLY, Constants.TRUE);
else
nvps.put(Constants.PR_CA_CERTS_ONLY, Constants.FALSE);
-
+
if (mProfileCertsOnly.isSelected())
nvps.put(Constants.PR_PROFILE_CERTS_ONLY, Constants.TRUE);
else
@@ -401,7 +401,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
public boolean resetCallback() {
refresh();
return true;
- }
+ }
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(mProfileCertsOnly)) {
@@ -432,7 +432,7 @@ public class CMSCRLFormatPanel extends CMSBaseTab {
* Override the initialize method only for this panel.
* We need to refresh in case the CRLDistributionPointExtension
* has modified the caCertsOnly property for us.
- **/
+ **/
public void initialize() {
Debug.println("CMSCRLFormatPanel: intialize()");
if (!mInit) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
index 553211eb8..eb4118555 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLIPPanel.java
@@ -196,7 +196,7 @@ public class CMSCRLIPPanel extends CMSBaseTab
mNames);
editor.showDialog(new NameValuePairs());
String name = editor.getCRLName();
- CMSResourceObject node = (CMSResourceObject)(mParent.getResourceObject());
+ CMSResourceObject node = (CMSResourceObject)(mParent.getResourceObject());
CMSResourceObject crlsNode = node;
node = new CMSResourceObject();
node.setName(name);
@@ -238,11 +238,11 @@ public class CMSCRLIPPanel extends CMSBaseTab
if (mNames.contains(name))
mNames.remove(name);
mDataModel.removeElementAt(index);
- if (mDataModel.size() > 0)
+ if (mDataModel.size() > 0)
mList.setSelectedIndex(0);
}
- CMSResourceObject node =
- (CMSResourceObject)(mParent.getResourceObject());
+ CMSResourceObject node =
+ (CMSResourceObject)(mParent.getResourceObject());
Enumeration allchildren = node.children();
while (allchildren.hasMoreElements()) {
CMSResourceObject child = (CMSResourceObject)(allchildren.nextElement());
@@ -301,11 +301,11 @@ public class CMSCRLIPPanel extends CMSBaseTab
String enable = nvps.get(name + "." + Constants.PR_ENABLED);
if (enable != null && enable.equalsIgnoreCase(Constants.TRUE)) {
- mDataModel.addElement(new JLabel(name,
+ mDataModel.addElement(new JLabel(name,
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
} else {
- mDataModel.addElement(new JLabel(name,
+ mDataModel.addElement(new JLabel(name,
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
JLabel.LEFT));
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
index d420686e3..b55022921 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCRLSettingPanel.java
@@ -36,10 +36,10 @@ import java.util.Vector;
* @version $Revision$, $Date$
*/
public class CMSCRLSettingPanel extends CMSBaseTab {
-
+
/*==========================================================
* variables
- *==========================================================*/
+ *==========================================================*/
private static String PANEL_NAME = "CRLSETTING";
private JCheckBox mEnableCRL;
@@ -107,7 +107,7 @@ public class CMSCRLSettingPanel extends CMSBaseTab {
gbc.weightx = 1.0;
gbc.weighty = 0.0;
gb.setConstraints(schemaPanel, gbc);
- mCenterPanel.add(schemaPanel);
+ mCenterPanel.add(schemaPanel);
GridBagLayout gb4 = new GridBagLayout();
schemaPanel.setLayout(gb4);
@@ -190,8 +190,8 @@ public class CMSCRLSettingPanel extends CMSBaseTab {
gbc.weightx = 1.0;
gbc.weighty = 1.0;
gb.setConstraints(freqPanel, gbc);
- mCenterPanel.add(freqPanel);
-
+ mCenterPanel.add(freqPanel);
+
//add components
GridBagLayout gb2 = new GridBagLayout();
freqPanel.setLayout(gb2);
@@ -218,7 +218,7 @@ public class CMSCRLSettingPanel extends CMSBaseTab {
gbc.gridwidth = 1;
gbc.insets = new Insets(COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0);
freqPanel.add(mDaily, gbc);
-
+
mDailyAt = makeJTextField(30);
gbc.anchor = gbc.WEST;
gbc.gridx++;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
index 975ba97da..7cb8ad90a 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCertSettingPanel.java
@@ -44,7 +44,7 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab {
/*==========================================================
* constructors
*==========================================================*/
-
+
public CMSCertSettingPanel(String panelName, CMSTabPanel parent) {
super(panelName, parent);
_model = parent.getResourceModel();
@@ -53,7 +53,7 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* Actual UI construction
*/
@@ -63,7 +63,7 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab {
GridBagConstraints gbc = new GridBagConstraints();
CMSAdminUtil.resetGBC(gbc);
mCenterPanel.setLayout(gb);
-
+
JPanel mapPanel = new JPanel();
GridBagLayout gb2 = new GridBagLayout();
mapPanel.setLayout(gb2);
@@ -74,13 +74,13 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab {
gbc.weightx = 1.0;
gb.setConstraints(mapPanel, gbc);
mCenterPanel.add(mapPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel mapperLabel = makeJLabel("MAPPER");
_mapper = new JLabel("");
mMapper = makeJButton("MAPPER");
addEntryField(mapPanel, mapperLabel, _mapper, mMapper , gbc);
-
+
JPanel certSetting = new JPanel();
GridBagLayout gb1 = new GridBagLayout();
certSetting.setLayout(gb1);
@@ -100,11 +100,11 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab {
mPublisher = makeJButton("PUBLISHER");
addEntryField(certSetting, publisherLabel, _publisher, mPublisher, gbc);
}
-
+
/*==========================================================
* protected methods
*==========================================================*/
-
+
protected int getIndex(String value, String[] source) {
for (int i=0; i<source.length; i++) {
if (value.equals(source[i]))
@@ -112,13 +112,13 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab {
}
return -1;
}
-
+
/**
* Add 3 components in the same row to a panel, assumed to be using
* GridBagLayout. Customized for the LDAP certificate mappings/publishing
* UI.
*/
- protected void addEntryField(JPanel panel, JComponent field1,
+ protected void addEntryField(JPanel panel, JComponent field1,
JComponent field2, JComponent field3, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -145,6 +145,6 @@ public abstract class CMSCertSettingPanel extends CMSBaseTab {
0,DIFFERENT_COMPONENT_SPACE);
panel.add( field3, gbc );
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
index 69e208be5..a477bc5c4 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferenceDialog.java
@@ -24,7 +24,7 @@ import java.awt.*;
/**
* Allows user to select the SSL cipher preferences.
- *
+ *
* @author Christine Ho
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config
@@ -41,17 +41,17 @@ public class CMSCipherPreferenceDialog extends AbstractDialog {
private static final ResourceSet mHelpResource =
new ResourceSet("com.netscape.admin.certsrv.certsrv-help");
Help help;
-
+
public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic) {
this(parent, isDomestic, false);
}
- public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic,
+ public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic,
boolean hasFortezza) {
this(parent, isDomestic, hasFortezza, SSL2|SSL3);
}
- public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic,
+ public CMSCipherPreferenceDialog(JFrame parent, boolean isDomestic,
boolean hasFortezza, int SSLVersion) {
super(parent, "", true, OK | CANCEL | HELP);
@@ -103,10 +103,10 @@ public class CMSCipherPreferenceDialog extends AbstractDialog {
switch(sslVersion) {
case SSL2:
cipher = ssl2CipherPref.getCipherList();
- break;
+ break;
case SSL3:
cipher = ssl3CipherPref.getCipherList();
- break;
+ break;
default:
break;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
index 88faf2a71..a36f4bb32 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSCipherPreferencePane.java
@@ -16,7 +16,7 @@
// All rights reserved.
// --- END COPYRIGHT BLOCK ---
package com.netscape.admin.certsrv.config;
-
+
import com.netscape.admin.certsrv.security.*;
import java.awt.event.*;
import java.awt.*;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
index 2d35133df..45ecbdd42 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSEAGeneralPanel.java
@@ -75,13 +75,13 @@ public class CMSEAGeneralPanel extends CMSBaseTab implements ItemListener {
gbc.weighty = 1.0;
gb.setConstraints(agentsPanel, gbc);
mCenterPanel.add(agentsPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel numberLabel = makeJLabel("NUMBER");
mNumberOfAgentsText = makeJTextField(30);
CMSAdminUtil.addEntryField(agentsPanel, numberLabel, mNumberOfAgentsText, gbc);
-
+
refresh();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
index 913974eaf..06b0cba4d 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSEncryptionPanel.java
@@ -31,7 +31,7 @@ import com.netscape.admin.certsrv.keycert.*;
import com.netscape.admin.certsrv.managecert.*;
/**
- * Encryption panel used for setup server encryption options.
+ * Encryption panel used for setup server encryption options.
* This is a wrapper class that emulates the CMSBaseTab API
* calls.
*
@@ -51,10 +51,10 @@ public class CMSEncryptionPanel extends CMSBaseTab {
private JPanel mEncryptPane;
private JComboBox mSelection, mTokenList, mCertList;
private Hashtable mCertMapping; //maps the function list items to tags
- private String mSelectedItem, mSelectedToken, mSelectedCert;
- private JButton mWizard, mCipherPref, mSetup;
+ private String mSelectedItem, mSelectedToken, mSelectedCert;
+ private JButton mWizard, mCipherPref, mSetup;
private Hashtable mTokenCertList; //container for tokens and certs (Vector)
- private boolean mIsDomestic = false;
+ private boolean mIsDomestic = false;
private boolean mHasFortezza = false;
private Vector mCipherPrefStore;
private CMSCipherPreferenceDialog mCipherDialog;
@@ -63,7 +63,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
private boolean mWarningOn = false;
private static final String HELPINDEX =
"configuration-system-encryption-help";
-
+
/**=========================================================
* constructors
* @param parent the parent panel
@@ -79,7 +79,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
mCipherPrefStore = new Vector();
mHelpToken = HELPINDEX;
}
-
+
/*==========================================================
* public methods
*==========================================================*/
@@ -93,19 +93,19 @@ public class CMSEncryptionPanel extends CMSBaseTab {
GridBagConstraints gbc = new GridBagConstraints();
CMSAdminUtil.resetGBC(gbc);
mCenterPanel.setLayout(gb);
-
+
//certificate settings
JPanel top = new JPanel();
GridBagLayout gb2 = new GridBagLayout();
top.setLayout(gb2);
top.setBorder( new CompoundBorder(
BorderFactory.createTitledBorder(
- mResource.getString("ENCRYPTION_BORDER_CERT_LABEL")),
+ mResource.getString("ENCRYPTION_BORDER_CERT_LABEL")),
new EmptyBorder(-3,
0,
DIFFERENT_COMPONENT_SPACE - 3,
0)));
-
+
//add selection combobox
JLabel label1 = makeJLabel("SELECT");
mSelection = new JComboBox();
@@ -116,10 +116,10 @@ public class CMSEncryptionPanel extends CMSBaseTab {
mSelectedItem = (String) mSelection.getSelectedItem();
} else {
//disable if nothing there
- mSelection.setEnabled(false);
+ mSelection.setEnabled(false);
}
mSelection.addItemListener(this);
-
+
//add encryption panel
mEncryptPane = createCertEntry();
//mEncryptPane = new InnerEncryptionPane(mConsoleInfo);
@@ -134,13 +134,13 @@ public class CMSEncryptionPanel extends CMSBaseTab {
COMPONENT_SPACE,0,COMPONENT_SPACE);
gb2.setConstraints(mEncryptPane, gbc);
top.add(mEncryptPane);
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
gb.setConstraints(top, gbc);
mCenterPanel.add(top);
-
+
mWizard = makeJButton("WIZARD");
mCipherPref = makeJButton("CIPHERPREF");
mSetup = makeJButton("SETUP");
@@ -150,20 +150,20 @@ public class CMSEncryptionPanel extends CMSBaseTab {
//addButtonEntryField(mCenterPanel, mSetup, mWizard, mCipherPref, gbc);
addButtonEntryField(mCenterPanel, mSetup, mWizard, gbc);
//addButtonEntryField(mCenterPanel, mCipherPref, gbc);
-
+
/* retrieve data from server and
* feed data into mEncryptionPane for display ...
*/
refresh();
}
-
+
/**
* Implementation for saving panel information
* @return true if save successful; otherwise, false.
*/
public boolean applyCallback() {
if (mWarningOn) {
- String errorMsg =
+ String errorMsg =
mResource.getString(mPanelName+"_LABEL_WARNING_LABEL");
JOptionPane.showMessageDialog(new JFrame(), errorMsg, "Warning",
JOptionPane.WARNING_MESSAGE,
@@ -174,22 +174,22 @@ public class CMSEncryptionPanel extends CMSBaseTab {
//save current changes if modified
saveChanges((String) mSelection.getSelectedItem());
-
+
//construct NVP parameters
NameValuePairs nvp = new NameValuePairs();
for (Enumeration e = mCertMapping.keys() ; e.hasMoreElements() ;) {
- CipherEntryData data =
+ CipherEntryData data =
(CipherEntryData)mCertMapping.get(e.nextElement());
nvp.put(data.getTagName(), data.getTokenName() + "," + data.getCertName());
}
-
+
if (updateCertMap(nvp)) {
mWarningOn = false;
clearDirtyFlag();
return true;
}
-
- return false;
+
+ return false;
}
/**
@@ -208,7 +208,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
* refresh the panel and update data
*/
public void refresh() {
-
+
//call server to get the encryption settings
NameValuePairs response;
try {
@@ -219,14 +219,14 @@ public class CMSEncryptionPanel extends CMSBaseTab {
e.getMessage(), CMSAdminUtil.ERROR_MESSAGE);
return;
}
-
+
//setup the data and UI
updateFlag = true;
cleanup();
setupDataContainer(response);
setupComboSelection();
updateFlag = false;
-
+
clearDirtyFlag();
}
@@ -246,47 +246,47 @@ public class CMSEncryptionPanel extends CMSBaseTab {
}
*/
if (e.getSource().equals(mSetup)) {
- ManageCertDialog manageDialog =
+ ManageCertDialog manageDialog =
new ManageCertDialog(mParent.getResourceModel().getFrame());
manageDialog.showDialog(mParent.getResourceModel().getServerInfo().getAdmin());
}
if (e.getSource().equals(mWizard)) {
Debug.println("Wizard");
-
- //XXX launch OUR OWN wizard
+
+ //XXX launch OUR OWN wizard
CertSetupWizardInfo info = new
CertSetupWizardInfo(mConnection, mConsoleInfo);
CertSetupWizard wizard = new CertSetupWizard(mParent.getResourceModel(), info);
// mParent.getResourceModel().getFrame(), info);
//KeyCertWizard wizard = new KeyCertWizard(mConnection);
-
+
//XXX we should update the settings to reflect the changes
-
-
+
+
return;
- }
+ }
if (e.getSource().equals(mCipherPref)) {
Debug.println("Wizard");
-
+
if (mCipherDialog == null) {
mCipherDialog = new CMSCipherPreferenceDialog(mParent.mModel.getFrame(),
- mIsDomestic,
- mHasFortezza,
+ mIsDomestic,
+ mHasFortezza,
CMSCipherPreferenceDialog.SSL2|CMSCipherPreferenceDialog.SSL3);
-
+
}
-
+
refresh();
setupCipherDialog(mCipherDialog);
-
+
mCipherDialog.show();
-
+
if (!mCipherDialog.isModified())
return;
-
+
//Save the cipher settings
StringBuffer buf = new StringBuffer();
-
+
if (mCipherDialog.isSSLEnabled(mCipherDialog.SSL2)) {
String[] v2 = mCipherDialog.getSSLPreference(mCipherDialog.SSL2);
for (int i=0; i< v2.length; i++) {
@@ -297,30 +297,30 @@ public class CMSEncryptionPanel extends CMSBaseTab {
}
}
}
-
+
if (mCipherDialog.isSSLEnabled(mCipherDialog.SSL3)) {
String[] v3 = mCipherDialog.getSSLPreference(mCipherDialog.SSL3);
for (int i=0; i< v3.length; i++) {
if (mCipherDialog.isCipherEnabled(v3[i])) {
- if (buf.length()>0)
+ if (buf.length()>0)
buf.append(",");
buf.append(v3[i]);
}
}
}
-
+
updateCipherPref(buf.toString());
-
+
//save the new settings
mCipherDialog.setSaved(true);
-
+
return;
}
}
-
+
//== ItemListener ==
public void itemStateChanged(ItemEvent e){
-
+
if (e.getSource().equals(mSelection)) {
if (e.getStateChange() == e.SELECTED) {
if (!mSelectionIgnore) {
@@ -349,35 +349,35 @@ public class CMSEncryptionPanel extends CMSBaseTab {
}
mWarningOn = true;
}
-
+
/*==========================================================
* Private Methods
*==========================================================*/
-
+
//save the mappings if changes made
private void saveChanges(String entry) {
if ( (!mSelectedToken.equals((String)mTokenList.getSelectedItem())) ||
(!mSelectedCert.equals((String)mCertList.getSelectedItem())) ) {
-
+
CipherEntryData data = (CipherEntryData) mCertMapping.get(entry);
data.setData((String)mTokenList.getSelectedItem(),
(String)mCertList.getSelectedItem());
}
}
- //cleanup the
+ //cleanup the
private void cleanup() {
mTokenCertList.clear();
mCipherPrefStore.removeAllElements();
mTokenList.removeAllItems();
mCertList.removeAllItems();
}
-
+
//setup the cipher dialog
private void setupCipherDialog(CMSCipherPreferenceDialog dialog) {
Debug.println("setupCipherDialog");
dialog.setSSLEnabled(dialog.SSL3,true);
-
+
//set selected/unselected ciphers
String[] v2 = dialog.getSSLPreference(dialog.SSL2);
@@ -410,26 +410,26 @@ public class CMSEncryptionPanel extends CMSBaseTab {
dialog.setCipherEnabled(v3[i], false);
}
}
-
+
mCipherDialog.setSaved(true);
}
-
+
//initialize the data containers
private void setupDataContainer(NameValuePairs response) {
-
+
//setup security version flag
String version = response.get(Constants.PR_CIPHER_VERSION);
if ( (version != null) && (version.equals(
Constants.PR_CIPHER_VERSION_DOMESTIC)) ) {
- mIsDomestic = true;
+ mIsDomestic = true;
}
-
+
//setup fortezza flag
String fortezza = response.get(Constants.PR_CIPHER_FORTEZZA);
if ( (fortezza != null) && (fortezza.equalsIgnoreCase("TRUE")) ){
- mHasFortezza = true;
+ mHasFortezza = true;
}
-
+
//setup cipher preference settings
String cipherpref = response.get(Constants.PR_CIPHER_PREF);
//Debug.println("cipher preference: "+cipherpref);
@@ -441,9 +441,9 @@ public class CMSEncryptionPanel extends CMSBaseTab {
mCipherPrefStore.addElement(pref);
}
} else {
- Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no cert pref list");
+ Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no cert pref list");
}
-
+
//setup the cipher entry data - loop through table and retrieve
//the current mappings
mSelectionIgnore = true;
@@ -457,7 +457,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
String token = tokenizer.nextToken().trim();
String cert = tokenizer.nextToken().trim();
data.setData(token, cert);
- } catch(Exception ex) {
+ } catch(Exception ex) {
Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no token/cert not complete");
}
} else {
@@ -468,7 +468,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
}
}
mSelectionIgnore = false;
-
+
//setup the token-cert list data table
String tokenlist = response.get(Constants.PR_TOKEN_LIST);
if ( (tokenlist != null) && (!tokenlist.trim().equals("")) ) {
@@ -476,7 +476,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
while (tokenizer.hasMoreTokens()) {
String token = tokenizer.nextToken().trim();
Debug.println("Token: "+token);
-
+
//get the certificate associated with this token
String certList = response.get(Constants.PR_TOKEN_PREFIX + token);
Vector certVector = new Vector();
@@ -486,31 +486,31 @@ public class CMSEncryptionPanel extends CMSBaseTab {
certVector.addElement(tokenizer2.nextToken().trim());
}
} else {
- Debug.println("WARNING: CMSEncryptionPanel: setupDataContainer()- no certlist for: "+token);
+ Debug.println("WARNING: CMSEncryptionPanel: setupDataContainer()- no certlist for: "+token);
}
-
+
//set the token-cert to hashtable
mTokenCertList.put(token, certVector);
mTokenList.addItem(token);
}
} else {
- Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no tokenlist");
+ Debug.println("ERROR: CMSEncryptionPanel: setupDataContainer()- no tokenlist");
}
-
+
//setup the initial combobox selection
String newToken = (String) mTokenList.getSelectedItem();
mSelectedToken = newToken;
mCertList.removeAllItems();
Vector list = (Vector) mTokenCertList.get(newToken);
for (int i=0; i< list.size(); i++)
- mCertList.addItem(list.elementAt(i));
+ mCertList.addItem(list.elementAt(i));
}
-
+
//setup combobox selection
private void setupComboSelection() {
//get current function selection
CipherEntryData data = (CipherEntryData) mCertMapping.get(mSelection.getSelectedItem());
-
+
//select correct token from the token list
String oldToken = (String) mTokenList.getSelectedItem();
String newToken = data.getTokenName();
@@ -523,7 +523,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
mCertList.setSelectedItem(data.getCertName());
mSelectedCert = data.getCertName();
}
-
+
//setup the certlist combo
private void setupCertCombo() {
String newToken = (String) mTokenList.getSelectedItem();
@@ -532,7 +532,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
for (int i=0; i< list.size(); i++)
mCertList.addItem(list.elementAt(i));
}
-
+
//creating the certificate mapping UI components
private JPanel createCertEntry() {
JPanel panel = new JPanel();
@@ -540,15 +540,15 @@ public class CMSEncryptionPanel extends CMSBaseTab {
GridBagConstraints gbc = new GridBagConstraints();
CMSAdminUtil.resetGBC(gbc);
panel.setLayout(gb);
-
+
//set border
panel.setBorder( new CompoundBorder(
- BorderFactory.createTitledBorder(mResource.getString("ENCRYPTION_BORDER_MAPTO_LABEL")),
+ BorderFactory.createTitledBorder(mResource.getString("ENCRYPTION_BORDER_MAPTO_LABEL")),
new EmptyBorder(-3,
0,
CMSAdminUtil.DIFFERENT_COMPONENT_SPACE,
0)));
-
+
//add components
mTokenList = new JComboBox();
mTokenList.addItemListener(this);
@@ -559,13 +559,13 @@ public class CMSEncryptionPanel extends CMSBaseTab {
CMSAdminUtil.addEntryField(panel, label1, mTokenList, label2, mCertList, gbc);
return panel;
}
-
+
/**
* The certificates used by each subsystem are stored as cert list
* strings in the resource file using the PR_ prefix tags.
*/
private void updateCertSelection() {
- //get installed subsystem
+ //get installed subsystem
Vector v = mServerInfo.getInstalledSubsystems();
//add default system certificate list
@@ -583,7 +583,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
loadCertList(certname);
}
}
-
+
//create additional subsystem certificate list
for (int i=0; i< v.size(); i++) {
String name = (String)v.elementAt(i);
@@ -597,11 +597,11 @@ public class CMSEncryptionPanel extends CMSBaseTab {
}
}
} catch (MissingResourceException e) {
- Debug.println("ERROR: unable retrieving subsystem certificate list: "+name);
+ Debug.println("ERROR: unable retrieving subsystem certificate list: "+name);
}
- }
+ }
}
-
+
//register the certificate and mapping entry
private void loadCertList(String certTag) {
//add to selection list
@@ -616,7 +616,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
mCertMapping.put(name, new CipherEntryData(certTag));
}
- private static void addTopEntryField(JPanel panel, JComponent label,
+ private static void addTopEntryField(JPanel panel, JComponent label,
JComponent field, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -636,7 +636,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
panel.add( field, gbc );
}
- private static void addButtonEntryField(JPanel panel,
+ private static void addButtonEntryField(JPanel panel,
JComponent field, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -657,9 +657,9 @@ public class CMSEncryptionPanel extends CMSBaseTab {
gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,
0,COMPONENT_SPACE);
panel.add( field, gbc );
- }
+ }
- private static void addButtonEntryField(JPanel panel, JComponent label,
+ private static void addButtonEntryField(JPanel panel, JComponent label,
JComponent field, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -669,7 +669,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
//gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0);
gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,0,0);
panel.add(new JLabel(""));
-
+
gbc.gridx++;
gbc.weightx = 1.0;
panel.add( label, gbc );
@@ -684,9 +684,9 @@ public class CMSEncryptionPanel extends CMSBaseTab {
gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,
0,COMPONENT_SPACE);
panel.add( field, gbc );
- }
+ }
- private static void addButtonEntryField(JPanel panel, JComponent label,
+ private static void addButtonEntryField(JPanel panel, JComponent label,
JComponent field, JComponent field1, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -696,7 +696,7 @@ public class CMSEncryptionPanel extends CMSBaseTab {
//gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,DIFFERENT_COMPONENT_SPACE,0,0);
gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,0,0);
panel.add(new JLabel(""));
-
+
gbc.gridx++;
gbc.weightx = 1.0;
panel.add( label, gbc );
@@ -722,14 +722,14 @@ public class CMSEncryptionPanel extends CMSBaseTab {
gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,
0,COMPONENT_SPACE);
panel.add( field1, gbc );
- }
+ }
/*==========================================================
- * SEND STUFF TO SERVER
- *==========================================================*/
-
+ * SEND STUFF TO SERVER
+ *==========================================================*/
+
//retrieve security information from the server side
- private NameValuePairs updateSecurityInformation()
+ private NameValuePairs updateSecurityInformation()
throws EAdminException
{
Debug.println("Get Security Information");
@@ -738,32 +738,32 @@ public class CMSEncryptionPanel extends CMSBaseTab {
nvp.put(Constants.PR_CIPHER_VERSION, "");
nvp.put(Constants.PR_CIPHER_FORTEZZA, "");
nvp.put(Constants.PR_TOKEN_LIST, "");
-
+
//create installed certificate list data request
for (Enumeration e = mCertMapping.elements(); e.hasMoreElements() ;) {
CipherEntryData data = (CipherEntryData)e.nextElement();
nvp.put(data.getTagName(), "");
}
-
+
NameValuePairs response;
-
+
response = mConnection.read(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_ENCRYPTION,
Constants.RS_ID_CONFIG,
- nvp);
-
+ nvp);
+
Debug.println("Received: "+response.toString());
-
+
return response;
}
-
+
//modify cipher preference
private void updateCipherPref(String list) {
Debug.println("Set Cipher Preference: "+list);
-
+
NameValuePairs nvp = new NameValuePairs();
nvp.put(Constants.PR_CIPHER_PREF, list);
-
+
//send to server
try {
mConnection.modify(DestDef.DEST_SERVER_ADMIN,
@@ -777,11 +777,11 @@ public class CMSEncryptionPanel extends CMSBaseTab {
return;
}
}
-
+
//modify certificate mapping
private boolean updateCertMap(NameValuePairs config) {
Debug.println("Set Certificate Mapping: "+config.toString());
-
+
//send to server
try {
mConnection.modify(DestDef.DEST_SERVER_ADMIN,
@@ -794,42 +794,42 @@ public class CMSEncryptionPanel extends CMSBaseTab {
e.getMessage(), CMSAdminUtil.ERROR_MESSAGE);
return false;
}
-
+
return true;
- }
-
+ }
+
}
//internal data structure
class CipherEntryData {
-
+
String mTag;
String mToken;
String mCert;
-
+
public CipherEntryData(String tag) {
mTag = tag;
}
-
+
public void setData(String token, String cert) {
mToken = token;
mCert = cert;
}
-
+
public String getCertName() {
- return mCert;
+ return mCert;
}
-
+
public String getTokenName() {
- return mToken;
+ return mToken;
}
-
+
public String getTagName() {
- return mTag;
+ return mTag;
}
-
+
public String toString() {
- return mTag+"-"+mToken+":"+mCert;
+ return mTag+"-"+mToken+":"+mCert;
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
index 23b4ececa..7160276d7 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSErrorLogPanel.java
@@ -47,7 +47,7 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel {
mHelpToken = HELPINDEX;
mIsNT = isNT;
}
-
+
/*==========================================================
* public methods
*==========================================================*/
@@ -90,14 +90,14 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel {
private void parseVals(NameValuePairs nvp) {
if (nvp.get(Constants.PR_LOG_ENABLED).equalsIgnoreCase(
- Constants.TRUE))
+ Constants.TRUE))
activateLog.setSelected(true);
else
activateLog.setSelected(false);
mLevel = Integer.parseInt(nvp.get(Constants.PR_LOG_LEVEL));
mlogBufSizTextData = nvp.get(Constants.PR_LOG_BUFFERSIZE);
mlogMaxSizTextData = nvp.get(Constants.PR_LOG_MAXFILESIZE);
- int val =
+ int val =
Integer.parseInt(nvp.get(Constants.PR_LOG_ROLLEROVER_INTERVAL));
mFrequency = getRollOverIndex(val);
}
@@ -159,7 +159,7 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel {
clearDirtyFlag();
return true;
}
-
+
/**
* Implementation for reset values
* @return true if save successful; otherwise, false.
@@ -171,8 +171,8 @@ public class CMSErrorLogPanel extends CMSBaseLogPanel {
/*==========================================================
* EVENT HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
index f408e7297..8a0160101 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
@@ -27,7 +27,7 @@ import java.awt.event.*;
/**
* KRA recovery management tab
- *
+ *
* @author Christine Ho
* @version $Revision$, $Date$
*/
@@ -186,7 +186,7 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab {
}
public void actionPerformed(ActionEvent e) {
-
+
if (e.getActionCommand().equals("autoButton")) {
String text = mEnableAuto.getText();
if (text.equals(mEnableLabel)) {
@@ -211,7 +211,7 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab {
refresh();
} else if (e.getSource().equals(mHelp)) {
helpCallback();
- }
+ }
}
public void mouseClicked(MouseEvent e) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
index 641a6641e..6bfec15b2 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSLDAPSettingPanel.java
@@ -33,7 +33,7 @@ import java.awt.event.*;
public class CMSLDAPSettingPanel extends CMSBaseTab {
private static String PANEL_NAME = "LDAPSETTING";
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-database-settings-help";
private JTextField mHostNameText;
private JTextField mPortText;
@@ -306,7 +306,7 @@ public class CMSLDAPSettingPanel extends CMSBaseTab {
nvps.put(Constants.PR_LDAP_MAX_CONNS, maxConns);
nvps.put(Constants.PR_LDAP_MIN_CONNS, minConns);
/*
- nvps.add(Constants.PR_LDAP_VERSION,
+ nvps.add(Constants.PR_LDAP_VERSION,
(String)mVersionBox.getSelectedItem());
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
index 03458d2b1..0716f2bc8 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSNetworkPanel.java
@@ -47,7 +47,7 @@ public class CMSNetworkPanel extends CMSBaseTab {
private static final int MAX_PORT = 65535;
private static final int MIN_PORT = 1;
- private Color mActiveColor;
+ private Color mActiveColor;
// TextField for port
private JTextField mAdminSSLPortText;
@@ -88,7 +88,7 @@ public class CMSNetworkPanel extends CMSBaseTab {
mModel = parent.getResourceModel();
mHelpToken = HELPINDEX;
}
-
+
/*==========================================================
* public methods
*==========================================================*/
@@ -122,7 +122,7 @@ public class CMSNetworkPanel extends CMSBaseTab {
JLabel adminBacklog = makeJLabel("ADMINBACKLOG");
mAdminSSLBacklogText = makeJTextField(10);
JLabel dummy1 = new JLabel(" ");
- CMSAdminUtil.addEntryField(adminPanel, adminSSLport,
+ CMSAdminUtil.addEntryField(adminPanel, adminSSLport,
mAdminSSLPortText, adminBacklog, mAdminSSLBacklogText, dummy1, gbc);
mActiveColor = mAdminSSLPortText.getBackground();
@@ -138,7 +138,7 @@ public class CMSNetworkPanel extends CMSBaseTab {
gbc.weightx = 1.0;
gb.setConstraints(agentPanel, gbc);
mCenterPanel.add(agentPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel agentPort = makeJLabel("AGENTSSLPORT");
mAgentSSLPortText = makeJTextField(10);
@@ -168,7 +168,7 @@ public class CMSNetworkPanel extends CMSBaseTab {
mGatewayBacklogText = makeJTextField(10);
mEnableLabel = makeJLabel("ENABLED");
mEnable = makeJCheckBox();
- CMSAdminUtil.addEntryField(gatewayPanel, mPortLabel, mGatewayPortText,
+ CMSAdminUtil.addEntryField(gatewayPanel, mPortLabel, mGatewayPortText,
mBacklogLabel, mGatewayBacklogText, mEnableLabel, mEnable, gbc);
CMSAdminUtil.resetGBC(gbc);
@@ -177,10 +177,10 @@ public class CMSNetworkPanel extends CMSBaseTab {
mSSLBacklogLabel = makeJLabel("SECUREEEBACKLOG");
mGatewaySSLBacklogText = makeJTextField(10);
JLabel dummy2 = new JLabel(" ");
- CMSAdminUtil.addEntryField(gatewayPanel, mSSLPortLabel,
+ CMSAdminUtil.addEntryField(gatewayPanel, mSSLPortLabel,
mGatewaySSLPortText, mSSLBacklogLabel, mGatewaySSLBacklogText,
dummy2, gbc);
-
+
refresh();
}
@@ -200,14 +200,14 @@ public class CMSNetworkPanel extends CMSBaseTab {
//String docroot = mDocRootText.getText().trim();
//check blank fields
- if (adminSSLPortStr.equals("") ||
+ if (adminSSLPortStr.equals("") ||
(gatewayPortStr.equals("") && mGatewayPortText.isEnabled()) ||
- (gatewaySSLPortStr.equals("") && mGatewaySSLPortText.isEnabled()) ||
- agentSSLPortStr.equals("") ||
- adminSSLBacklogStr.equals("") ||
+ (gatewaySSLPortStr.equals("") && mGatewaySSLPortText.isEnabled()) ||
+ agentSSLPortStr.equals("") ||
+ adminSSLBacklogStr.equals("") ||
(gatewayBacklogStr.equals("") && mGatewayBacklogText.isEnabled()) ||
(gatewaySSLBacklogStr.equals("") && mGatewaySSLBacklogText.isEnabled()) ||
- agentSSLBacklogStr.equals("") ) {
+ agentSSLBacklogStr.equals("") ) {
showMessageDialog("BLANKFIELD");
return false;
}
@@ -380,11 +380,11 @@ public class CMSNetworkPanel extends CMSBaseTab {
mAgentSSLBacklogText.setText(str);
} else if (name.equals(Constants.PR_GATEWAY_S_BACKLOG)) {
if (str.equals(DISABLED)) {
- enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText,
+ enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText,
false, getBackground());
mGatewaySSLBacklogText.setText("");
} else {
- enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText,
+ enableFields(mSSLBacklogLabel, mGatewaySSLBacklogText,
true, mActiveColor);
mGatewaySSLBacklogText.setText(str);
}
@@ -427,7 +427,7 @@ public class CMSNetworkPanel extends CMSBaseTab {
repaint(1);
}
- private void enableFields(JLabel label, JTextComponent text,
+ private void enableFields(JLabel label, JTextComponent text,
boolean enabled, Color color) {
label.setEnabled(enabled);
text.setEnabled(enabled);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
index 37dfbef44..4b3a9d737 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSOCSPGeneralPanel.java
@@ -79,7 +79,7 @@ public class CMSOCSPGeneralPanel extends CMSBaseTab implements ItemListener {
//gbc.weighty = 1.0;
// gb.setConstraints(adminPanel, gbc);
// mCenterPanel.add(adminPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
@@ -89,7 +89,7 @@ public class CMSOCSPGeneralPanel extends CMSBaseTab implements ItemListener {
gbc.weighty = 1.0;
gb.setConstraints(signingPanel, gbc);
mCenterPanel.add(signingPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel signingLabel = makeJLabel("ALGORITHM");
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
index 47cb6c865..f53aae76c 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSPasswordDialog.java
@@ -37,13 +37,13 @@ import com.netscape.admin.certsrv.connection.*;
* @date 07/21/98
*/
-public class CMSPasswordDialog extends JDialog
+public class CMSPasswordDialog extends JDialog
implements ActionListener, DocumentListener, MouseListener
{
-
+
/*==========================================================
* variables
- *==========================================================*/
+ *==========================================================*/
private static final int WIDTH = 300;
private static final int HEIGHT = 216;
@@ -59,12 +59,12 @@ public class CMSPasswordDialog extends JDialog
private ResourceBundle mResource;
private AdminConnection mAdmin;
private JButton mOK, mCancel, mHelp;
-
-
+
+
/*==========================================================
* constructors
*==========================================================*/
-
+
/**
* @param parent parent frame
*/
@@ -72,7 +72,7 @@ public class CMSPasswordDialog extends JDialog
super(parent, true);
mParentFrame = parent;
mAdmin = conn;
- mResource =
+ mResource =
ResourceBundle.getBundle(CMSAdminResources.class.getName());
setTitle(mResource.getString(PREFIX+"_TITLE"));
setLocationRelativeTo(parent);
@@ -96,30 +96,30 @@ public class CMSPasswordDialog extends JDialog
center.add(contentPanel);
CMSAdminUtil.resetGBC(gbc);
- JLabel lUsername =
+ JLabel lUsername =
new JLabel(mResource.getString(PREFIX+"_LABEL_USERID_LABEL"));
lUsername.setToolTipText(
mResource.getString(PREFIX+"_LABEL_USERID_TTIP"));
mUsernameField = new JLabel(uid);
-
+
CMSAdminUtil.addEntryField(contentPanel, lUsername, mUsernameField,
gbc);
CMSAdminUtil.resetGBC(gbc);
- JLabel lOldPassword=
+ JLabel lOldPassword=
new JLabel(mResource.getString(PREFIX+"_LABEL_OLDPASSWORD_LABEL"));
lOldPassword.setToolTipText(
mResource.getString(PREFIX+"_LABEL_OLDPASSWORD_TTIP"));
mOldPasswordField = new JPasswordField();
mOldPasswordField.getDocument().addDocumentListener(this);
mOldPasswordField.addMouseListener(this);
- CMSAdminUtil.addEntryField(contentPanel, lOldPassword,
+ CMSAdminUtil.addEntryField(contentPanel, lOldPassword,
mOldPasswordField, gbc);
CMSAdminUtil.resetGBC(gbc);
- JLabel lPassword=
+ JLabel lPassword=
new JLabel(mResource.getString(PREFIX+"_LABEL_PASSWORD_LABEL"));
lPassword.setToolTipText(
mResource.getString(PREFIX+"_LABEL_PASSWORD_TTIP"));
@@ -130,13 +130,13 @@ public class CMSPasswordDialog extends JDialog
gbc);
CMSAdminUtil.resetGBC(gbc);
- JLabel lPasswordAgain=
+ JLabel lPasswordAgain=
new JLabel(mResource.getString(PREFIX+"_LABEL_PASSWORD_AGAIN_LABEL"));
lPassword.setToolTipText(
mResource.getString(PREFIX+"_LABEL_PASSWORD_AGAIN_TTIP"));
mPasswordFieldAgain = new JPasswordField();
mPasswordFieldAgain.getDocument().addDocumentListener(this);
- mPasswordFieldAgain.addMouseListener(this);
+ mPasswordFieldAgain.addMouseListener(this);
CMSAdminUtil.addEntryField(contentPanel, lPasswordAgain,
mPasswordFieldAgain, gbc);
@@ -200,19 +200,19 @@ public class CMSPasswordDialog extends JDialog
public String getPassword() {
return mPassword;
}
-
-
+
+
/*==========================================================
* EVNET HANDLER METHODS
*==========================================================*/
-
+
public void actionPerformed(ActionEvent evt) {
if (evt.getSource().equals(mOK)) {
String userid = mUsernameField.getText().trim();
String oldpassword = mOldPasswordField.getText().trim();
String newpassword = mPasswordField.getText().trim();
String passwordAgain = mPasswordFieldAgain.getText().trim();
-
+
/* PROACTIVE VERIFICATION
if (oldpassword.equals("") || newpassword.equals("") ||
passwordAgain.equals("")) {
@@ -225,9 +225,9 @@ public class CMSPasswordDialog extends JDialog
CMSAdminUtil.showMessageDialog(mParentFrame, mResource,
PREFIX, "CONFIRMED", CMSAdminUtil.ERROR_MESSAGE);
return;
- }
-
-
+ }
+
+
NameValuePairs nvps = new NameValuePairs();
nvps.put(Constants.PR_OLD_AGENT_PWD, oldpassword);
nvps.put(Constants.PR_AGENT_PWD, newpassword);
@@ -241,7 +241,7 @@ public class CMSPasswordDialog extends JDialog
if (!ex.getMessage().equals("Server Error"))
return;
}
-
+
mCanceled = false;
this.dispose();
return;
@@ -253,21 +253,21 @@ public class CMSPasswordDialog extends JDialog
return;
}
}
-
-
+
+
//== DocumentListener ==
public void insertUpdate(DocumentEvent e) {
setButtons();
}
-
+
public void removeUpdate(DocumentEvent e){
setButtons();
}
-
+
public void changedUpdate(DocumentEvent e){
setButtons();
}
-
+
//==== MOUSELISTENER ======================
public void mouseClicked(MouseEvent e) {
setButtons();
@@ -277,34 +277,34 @@ public class CMSPasswordDialog extends JDialog
public void mouseReleased(MouseEvent e) {}
public void mouseEntered(MouseEvent e) {}
public void mouseExited(MouseEvent e) {
- setButtons();
- }
-
-
+ setButtons();
+ }
+
+
/*==========================================================
* private methods
- *==========================================================*/
-
+ *==========================================================*/
+
private JPanel makeActionPane() {
- mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null,
+ mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null,
this);
mOK.setEnabled(false);
- mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL",
+ mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL",
null, this);
JButton[] buttons = { mOK, mCancel};
JButtonFactory.resize( buttons );
return CMSAdminUtil.makeJButtonPanel(buttons);
- }
-
+ }
+
//set buttons
private void setButtons() {
if ( (mPasswordField.getText().trim().equals("")) ||
(mPasswordFieldAgain.getText().trim().equals("")) ||
(mOldPasswordField.getText().trim().equals("")) ) {
- mOK.setEnabled(false);
+ mOK.setEnabled(false);
} else {
- mOK.setEnabled(true);
+ mOK.setEnabled(true);
}
- }
-
+ }
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
index d4fb62340..4beb2a6b4 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
@@ -45,8 +45,8 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
protected static String RULE_STAT = null;
protected static String RULE_IMPL = null;
protected static String RULE_TYPE = null;
-
-
+
+
protected AdminConnection mConnection;
protected JScrollPane mScrollPane;
@@ -138,25 +138,25 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
}
mModel.progressStop();
Debug.println(response.toString());
-
+
CMSBaseConfigDialog dialog = makeEditConfigDialog(
response,
mModel.getFrame(),
mModel.getServerInfo().getAdmin(),
mDestination);
-
+
dialog.setModel(mModel);
dialog.setInstanceScope(mScope);
dialog.showDialog(response, data.get(RULE_NAME));
-
+
if(!dialog.isOK()) return;
- refresh();
+ refresh();
}
-
+
if (e.getSource().equals(mAdd)) {
Debug.println("Add");
- PluginSelectionDialog dialog =
+ PluginSelectionDialog dialog =
getPluginSelectionDialog(
mModel.getFrame(),
mConnection,
@@ -168,7 +168,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
dialog.showDialog();
refresh();
}
-
+
if (e.getSource().equals(mDelete)) {
Debug.println("Delete");
if(mTable.getSelectedRow()< 0)
@@ -191,8 +191,8 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
- }
+ setButtons();
+ }
/*==========================================================
* protected methods
@@ -201,8 +201,8 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
mDataModel.removeAllRows();
update();
-
- setButtons();
+
+ setButtons();
}
/**
@@ -251,7 +251,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
mScrollPane.setBackground(Color.white);
mTable.addMouseListener(this);
setLabelCellRenderer(mTable,0);
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
gbc.fill = gbc.BOTH;
@@ -289,7 +289,7 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
Debug.println("Table.getColumnModel = "+table.getColumnModel());
table.getColumnModel().getColumn(index).setCellRenderer(new LabelCellRenderer(new JLabel()));
}
-
+
//Set the first column's cellrender as label cell
protected void setLabelCellEditor(JTable table, int index) {
table.getColumnModel().getColumn(index).setCellRenderer(new PasswordCellRenderer());
@@ -299,26 +299,26 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
//set buttons
protected void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
-
+
if (mTable.getSelectionModel().isSelectionEmpty()) {
mDelete.setEnabled(false);
mEdit.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mEdit.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
mEdit.setEnabled(true);
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
@@ -386,11 +386,11 @@ Debug.println("xxxxxxx plugin " + plugin);
}
mDataModel.processData(data);
}
- }
+ }
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mTable.invalidate();
mTable.validate();
mTable.repaint(1);
@@ -398,7 +398,7 @@ Debug.println("xxxxxxx plugin " + plugin);
}
private void delete() {
-
+
mModel.progressStart();
//get entry name
NameValuePairs data = (NameValuePairs)
@@ -419,7 +419,7 @@ Debug.println("xxxxxxx plugin " + plugin);
mModel.progressStop();
//send comment to server and refetch the content
refresh();
-
+
}
//this returns the onfiguration
@@ -430,13 +430,13 @@ Debug.println("xxxxxxx plugin " + plugin);
if (mId != null && mId.length() > 0) {
request.put(mId, "");
}
-
+
NameValuePairs response = mConnection.read(mDestination,
mScope,
data.get(RULE_NAME),
request);
return response;
}
-
-
+
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
index 734425b41..7b284f1d6 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRACLMPanel.java
@@ -44,7 +44,7 @@ public class CMSRACLMPanel extends CMSBaseTab {
private JTextField mIntervalText;
private Color mActiveColor;
private CMSTabPanel mParent;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-ra-clm-help";
public CMSRACLMPanel(CMSTabPanel parent) {
@@ -83,13 +83,13 @@ public class CMSRACLMPanel extends CMSBaseTab {
gbc.weighty = 1.0;
gb.setConstraints(adminPanel, gbc);
mCenterPanel.add(adminPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel validLbl = makeJLabel("VALID");
mValidText = makeJTextField(4);
mActiveColor = mValidText.getBackground();
JLabel day1Lbl = makeJLabel("DAYS");
- CMSAdminUtil.addEntryField(adminPanel, validLbl, mValidText,
+ CMSAdminUtil.addEntryField(adminPanel, validLbl, mValidText,
day1Lbl, gbc);
CMSAdminUtil.resetGBC(gbc);
@@ -129,7 +129,7 @@ public class CMSRACLMPanel extends CMSBaseTab {
JLabel intervalLbl = makeJLabel("INTERVAL");
mIntervalText = makeJTextField(4);
JLabel day2Lbl = makeJLabel("DAYS");
- CMSAdminUtil.addEntryField(subPanel, intervalLbl, mIntervalText,
+ CMSAdminUtil.addEntryField(subPanel, intervalLbl, mIntervalText,
day2Lbl, gbc);
refresh();
@@ -172,7 +172,7 @@ public class CMSRACLMPanel extends CMSBaseTab {
mNotifyEnable.setSelected(notificationEnabled);
} else if (name.equals(Constants.PR_RENEWAL_VALIDITY)) {
mValidText.setText(value);
- } else if (name.equals(Constants.PR_RENEWAL_EMAIL)) {
+ } else if (name.equals(Constants.PR_RENEWAL_EMAIL)) {
mEmailText.setText(value);
} else if (name.equals(Constants.PR_RENEWAL_NUMNOTIFICATION)) {
mNotifiedText.setText(value);
@@ -217,7 +217,7 @@ public class CMSRACLMPanel extends CMSBaseTab {
mValidText.setEnabled(enable);
mValidText.setEditable(enable);
mValidText.setBackground(color);
- mNotifyEnable.setEnabled(enable);
+ mNotifyEnable.setEnabled(enable);
mNotifyEnable.setBackground(color);
//enableNotification(enable, color);
}
@@ -239,9 +239,9 @@ public class CMSRACLMPanel extends CMSBaseTab {
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
- if (e.getSource().equals(mRenewEnable) ||
+ if (e.getSource().equals(mRenewEnable) ||
e.getSource().equals(mNotifyEnable)) {
- enableRenewal(mRenewEnable.isSelected(),
+ enableRenewal(mRenewEnable.isSelected(),
mNotifyEnable.isSelected());
}
}
@@ -262,7 +262,7 @@ public class CMSRACLMPanel extends CMSBaseTab {
return false;
}
nvps.put(Constants.PR_RENEWAL_VALIDITY, validStr);
-
+
if (mNotifyEnable.isSelected()) {
nvps.put(Constants.PR_RENEWAL_EXPIREDNOTIFIEDENABLED,
Constants.TRUE);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
index 7733a43d7..c257165d4 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRAConnectorPanel.java
@@ -177,7 +177,7 @@ public class CMSRAConnectorPanel extends CMSBaseTab
NameValuePairs subsystems = mAdmin.search(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_SUBSYSTEM, new NameValuePairs());
-
+
boolean colocated = false;
if (name.equals("Data Recovery Manager Connector")) {
String val = values.get("id");
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
index 6605385b0..0f27dbcf9 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRAGeneralPanel.java
@@ -71,7 +71,7 @@ public class CMSRAGeneralPanel extends CMSBaseTab {
gbc.weighty = 1.0;
gb.setConstraints(adminPanel, gbc);
mCenterPanel.add(adminPanel);
-
+
CMSAdminUtil.resetGBC(gbc);
mEEEnable = makeJCheckBox("EE");
gbc.anchor = gbc.NORTHWEST;
@@ -93,7 +93,7 @@ public class CMSRAGeneralPanel extends CMSBaseTab {
gb1.setConstraints(mRAEnable, gbc);
adminPanel.add(mRAEnable);
*/
-
+
refresh();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
index 2c12183c7..b618f91be 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSRuleDataModel.java
@@ -39,10 +39,10 @@ public abstract class CMSRuleDataModel extends CMSContentTableModel
* variables
*==========================================================*/
public static final String RULE_NAME = "RULENAME";
- public static final String RULE_STAT = "STATUS";
+ public static final String RULE_STAT = "STATUS";
public static final String RULE_IMPL = "IMPL";
public static final String RULE_TYPE = "TYPE";
-
+
protected static String[] mColumns = null;
protected Vector mRules;
@@ -61,22 +61,22 @@ public abstract class CMSRuleDataModel extends CMSContentTableModel
*==========================================================*/
protected abstract String[] getColumns();
-
+
/**
* clean up the table including the datat objects
*/
public void removeAllRows() {
super.removeAllRows();
mRules.removeAllElements();
- }
-
-
+ }
+
+
public Vector getRules() {
- return (Vector) mRules.clone();
+ return (Vector) mRules.clone();
}
-
+
public boolean isCellEditable(int row, int col) {
return false;
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
index 0275e3cb0..6636f059b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSMTPPanel.java
@@ -35,7 +35,7 @@ public class CMSSMTPPanel extends CMSBaseTab {
private static String PANEL_NAME = "SMTPSETTING";
private JTextField mServerText;
private JTextField mPortText;
- private Color mActiveColor;
+ private Color mActiveColor;
private AdminConnection mAdmin;
private CMSBaseResourceModel mModel;
private CMSTabPanel mParent;
@@ -80,7 +80,7 @@ public class CMSSMTPPanel extends CMSBaseTab {
JLabel portLabel = makeJLabel("PORT");
mPortText = makeJTextField(30);
CMSAdminUtil.addEntryField(smtpInfo, portLabel, mPortText, gbc);
-
+
refresh();
}
@@ -92,7 +92,7 @@ public class CMSSMTPPanel extends CMSBaseTab {
try {
NameValuePairs val = mAdmin.read(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_SMTP, Constants.RS_ID_CONFIG, nvps);
-
+
populate(val);
} catch (EAdminException e) {
showErrorDialog(e.toString());
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
index b5b589eb0..238397ee0 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSNMPPanel.java
@@ -52,7 +52,7 @@ public class CMSSNMPPanel extends CMSBaseTab {
private JLabel mOrgnLabel;
private JLabel mLocLabel;
private JLabel mContactLabel;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-system-snmp-help";
public CMSSNMPPanel(CMSTabPanel parent) {
@@ -93,7 +93,7 @@ public class CMSSNMPPanel extends CMSBaseTab {
mOffB = makeJButton("OFF");
JButton[] bArray = {mOnB, mOffB};
JPanel buttonPanel = CMSAdminUtil.makeJButtonPanel(bArray);
-
+
GridBagLayout gb1 = new GridBagLayout();
snmpInfo.setLayout(gb1);
@@ -140,7 +140,7 @@ public class CMSSNMPPanel extends CMSBaseTab {
gbc.gridheight = gbc.REMAINDER;
gb1.setConstraints(buttonPanel, gbc);
snmpInfo.add(buttonPanel);
-
+
refresh();
}
@@ -208,7 +208,7 @@ public class CMSSNMPPanel extends CMSBaseTab {
enableTextField(true, mActiveColor);
} else {
enableTextField(false, getBackground());
- }
+ }
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
index 4e95d25db..500523473 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherPreference.java
@@ -19,14 +19,14 @@ package com.netscape.admin.certsrv.config;
import com.netscape.admin.certsrv.security.*;
/**
- * Constructs panel containing a SSL2 cipher suites
+ * Constructs panel containing a SSL2 cipher suites
*
* @author Christine Ho
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config
*/
-public class CMSSSL2CipherPreference extends CMSCipherPreferencePane
+public class CMSSSL2CipherPreference extends CMSCipherPreferencePane
implements ICipherConstants {
public CMSSSL2CipherPreference(boolean isDomestic) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
index fa18107cb..eb5065fce 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL2CipherSet.java
@@ -23,7 +23,7 @@ import java.util.*;
/**
* Constructs a SSL2 cipher suites.
- *
+ *
* @author Christine Ho
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
index 63444fc75..777c9d466 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherPreference.java
@@ -20,14 +20,14 @@ package com.netscape.admin.certsrv.config;
import com.netscape.admin.certsrv.security.*;
/**
- * Constructs panel containing a SSL3 cipher suites
+ * Constructs panel containing a SSL3 cipher suites
*
* @author Christine Ho
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config
*/
-public class CMSSSL3CipherPreference extends CMSCipherPreferencePane
+public class CMSSSL3CipherPreference extends CMSCipherPreferencePane
implements ICipherConstants {
public CMSSSL3CipherPreference(boolean isDomestic, boolean hasFortezza) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
index 0286f3820..df07a4968 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSSL3CipherSet.java
@@ -23,7 +23,7 @@ import com.netscape.admin.certsrv.*;
/**
* Constructs a SSL3 cipher suites.
- *
+ *
* @author Christine Ho
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
index ab957a69c..76f467091 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSSelfTestsPanel.java
@@ -38,7 +38,7 @@ public class CMSSelfTestsPanel extends CMSBaseTab
private static final String PROP_TITLE = "On-Demand Self Tests Results";
private static String PANEL_NAME = "SELFTESTS";
private AdminConnection mAdmin;
- private JButton mOnDemand;
+ private JButton mOnDemand;
private CMSBaseResourceModel mModel;
private CMSTabPanel mParent;
private static final String HELPINDEX =
@@ -145,12 +145,12 @@ public class CMSSelfTestsPanel extends CMSBaseTab
NameValuePairs nvps = new NameValuePairs();
NameValuePairs nvps1;
-
+
nvps.put(Constants.PR_RUN_SELFTESTS_ON_DEMAND, Constants.TRUE);
-
+
if( evt.getSource().equals( mOnDemand ) ) {
Debug.println( "Run self tests on-demand . . ." );
-
+
mModel.progressStart();
try {
nvps1 = mAdmin.process( DestDef.DEST_SERVER_ADMIN,
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
index ca424c3a0..c454063a1 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMSUserCertSettingPanel.java
@@ -52,24 +52,24 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel {
mParent = parent;
if (panelName.equals("RAUSERCERTSETTING"))
mHelpToken = RAHELPINDEX;
- else
+ else
mHelpToken = CAHELPINDEX;
}
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* Actual UI construction
*/
public void init() {
- super.init();
-
+ super.init();
+
//XXX B1 - disable the publisher configuration
mPublisher.setEnabled(false);
- //XXX B1 - disable the publisher configuration
-
+ //XXX B1 - disable the publisher configuration
+
refresh();
}
@@ -114,14 +114,14 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel {
/*==========================================================
* EVNET HANDLER METHODS
- *==========================================================*/
-
+ *==========================================================*/
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(mMapper)) {
Debug.println("Edit Mapper Config");
mDialog = new PanelMapperConfigDialog(_model.getFrame(), _admin);
- mDialog.showDialog(_mapper.getText(),
+ mDialog.showDialog(_mapper.getText(),
_servletName, ScopeDef.SC_USERCERT);
if (!mDialog.isOK())
return;
@@ -150,6 +150,6 @@ public class CMSUserCertSettingPanel extends CMSCertSettingPanel {
}
}
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java b/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
index ea448b4e0..1977b5428 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CMStoAdminEncryptionPane.java
@@ -39,12 +39,12 @@ import javax.swing.event.*;
*/
/* replace "implements ActionListener" with
- *"implements IPluginConfigPanel" when the
+ *"implements IPluginConfigPanel" when the
* com.netscape.management.admserv.config.* package is available
public class CMStoAdminEncryptionPane extends EncryptionPane implements IPluginConfigPanel{
*/
-public class CMStoAdminEncryptionPane extends EncryptionPane
+public class CMStoAdminEncryptionPane extends EncryptionPane
implements ActionListener
{
protected boolean mEncryptionPaneDirty = false;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
index 9a4f5ae17..26346f58e 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsConfigDialog.java
@@ -73,4 +73,4 @@ public class CRLExtensionsConfigDialog extends CMSBaseConfigDialog
init(nvp,parent,conn,dest,id);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
index 5c687ea90..d48600fa5 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsInstanceTab.java
@@ -43,7 +43,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "CRLEXTSRULE";
-
+
private final static String CAHELPINDEX = "configuration-ca-crlinstances-help";
/*==========================================================
@@ -56,7 +56,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab {
mDataModel = new RuleRuleDataModel();
mScope = ScopeDef.SC_CRLEXTS_RULES;
RULE_NAME = CRLExtensionsRuleDataModel.RULE_NAME;
- RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT;
+ RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT;
mHelpToken = CAHELPINDEX;
}
@@ -67,7 +67,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab {
mDataModel = new RuleRuleDataModel();
mScope = ScopeDef.SC_CRLEXTS_RULES;
RULE_NAME = CRLExtensionsRuleDataModel.RULE_NAME;
- RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT;
+ RULE_STAT = CRLExtensionsRuleDataModel.RULE_STAT;
mHelpToken = CAHELPINDEX;
mId = id;
}
@@ -77,7 +77,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab {
NameValuePairs nvp,
JFrame parent,
AdminConnection conn,
- String dest)
+ String dest)
{
if (mId != null && mId.length() > 0)
return new CRLExtensionsConfigDialog(nvp, parent, conn, dest, mId);
@@ -89,7 +89,7 @@ public class CRLExtensionsInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
return new CRLExtensionsPluginSelectionDialog(parent, conn, dest, pluginType);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
index aa169235d..9f7ed87c2 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsPluginSelectionDialog.java
@@ -40,7 +40,7 @@ public class CRLExtensionsPluginSelectionDialog extends PluginSelectionDialog
* variables
*==========================================================*/
private static final String PREFIX = "CRLEXTSELECTIONDIALOG";
- private static final String CAHELPINDEX =
+ private static final String CAHELPINDEX =
"configuration-ca-add-crlextensionrule-dbox-help";
/*==========================================================
@@ -48,9 +48,9 @@ public class CRLExtensionsPluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public CRLExtensionsPluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
// mScope = ScopeDef.SC_RULE_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
index e5ae9352a..1d0553c0e 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLExtensionsRuleDataModel.java
@@ -55,7 +55,7 @@ public class CRLExtensionsRuleDataModel extends CMSRuleDataModel
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
- v.addElement(mResource.getString("CRLEXTSRULE_LABEL_ENABLED_LABEL"));
+ v.addElement(mResource.getString("CRLEXTSRULE_LABEL_ENABLED_LABEL"));
} else {
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
diff --git a/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java b/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
index 040b21b83..0cde2d21c 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
@@ -36,7 +36,7 @@ import com.netscape.certsrv.common.*;
public class CRLIPEditor extends JDialog implements ActionListener {
private final static String PREFIX = "CRLIPEDITOR";
- private final static String HELPINDEX =
+ private final static String HELPINDEX =
"configuration-revocation";
private JButton mOK, mCancel, mHelp;
private String mName;
@@ -319,7 +319,7 @@ public class CRLIPEditor extends JDialog implements ActionListener {
}
this.dispose();
} catch (EAdminException ex) {
- CMSAdminUtil.showMessageDialog(mParentFrame,
+ CMSAdminUtil.showMessageDialog(mParentFrame,
"Error", ex.toString(), CMSAdminUtil.ERROR_MESSAGE);
}
} else if (e.getSource().equals(mHelp)) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
index 6f711eca9..293d13d9f 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
@@ -39,7 +39,7 @@ import com.netscape.certsrv.common.*;
public class ConnectorEditor extends JDialog implements ActionListener, MouseListener {
private final static String PREFIX = "CONNECTOREDITOR";
- private final static String HELPINDEX =
+ private final static String HELPINDEX =
"configuration-ra-connector-editor-help";
private final static String HELPINDEX1 =
"configuration-overview";
@@ -226,7 +226,7 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
mHostText.setText(val);
} else if (name.equals(Constants.PR_PORT)) {
mPortText.setText(val);
- // Inserted by beomsuk
+ // Inserted by beomsuk
} else if (name.equals(Constants.PR_TIMEOUT)) {
if (val == null || val.equals(""))
mTimeoutText.setText("30");
@@ -472,13 +472,13 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
gbc.anchor = gbc.WEST;
gbc.weightx = 1.0;
gbc.fill = gbc.HORIZONTAL;
- gbc.insets = new Insets(2*CMSAdminUtil.COMPONENT_SPACE,
+ gbc.insets = new Insets(2*CMSAdminUtil.COMPONENT_SPACE,
4*CMSAdminUtil.COMPONENT_SPACE,
CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
gb.setConstraints(mHeading, gbc);
mainPanel.add(mHeading);
-
+
CMSAdminUtil.resetGBC(gbc);
mDataModel = new ListCertsModel();
mCertTable = new JTable(mDataModel);
@@ -551,15 +551,15 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
}
public void actionPerformed(ActionEvent e) {
-
+
if (e.getSource().equals(mEnableBox)) {
mEnable = mEnableBox.isSelected();
enableConnector();
- } else if (e.getSource().equals(mCancel))
+ } else if (e.getSource().equals(mCancel))
this.dispose();
else if (e.getSource().equals(mOK)) {
NameValuePairs nvps = new NameValuePairs();
-
+
if (mEnable) {
nvps.put(Constants.PR_LOCAL, Constants.FALSE);
nvps.put(Constants.PR_HOST, mHostText.getText());
@@ -572,7 +572,7 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
return;
}
} catch (NumberFormatException ex) {
- CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX,
+ CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX,
"NONINTEGER", CMSAdminUtil.ERROR_MESSAGE);
return;
}
@@ -587,12 +587,12 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
return;
}
} catch (NumberFormatException ex) {
- CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX,
+ CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX,
"TIMEOUTNONINTEGER", CMSAdminUtil.ERROR_MESSAGE);
return;
}
nvps.put(Constants.PR_TIMEOUT, timeoutStr);
-
+
if (mName.equals("Data Recovery Manager Connector")) {
nvps.put(Constants.PR_URI, "/kra/agent/kra/connector");
} else if (mName.equals("Registration Manager Connector")) {
@@ -611,7 +611,7 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
mName, nvps);
this.dispose();
} catch (EAdminException ex) {
- CMSAdminUtil.showMessageDialog(mParentFrame,
+ CMSAdminUtil.showMessageDialog(mParentFrame,
"Error", ex.toString(), CMSAdminUtil.ERROR_MESSAGE);
}
} else if (e.getSource().equals(mHelp)) {
@@ -621,11 +621,11 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
private NameValuePairs getCertsList(String scope) {
try {
- NameValuePairs nvps =
+ NameValuePairs nvps =
mAdmin.search(DestDef.DEST_SERVER_ADMIN, scope, new NameValuePairs());
return nvps;
} catch (EAdminException ex) {
- CMSAdminUtil.showMessageDialog(mParentFrame,
+ CMSAdminUtil.showMessageDialog(mParentFrame,
"Error", ex.toString(), CMSAdminUtil.ERROR_MESSAGE);
return null;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java b/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
index 66e9b4397..99b2881d6 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/GeneralLogPanel.java
@@ -33,7 +33,7 @@ import java.awt.event.*;
public class GeneralLogPanel extends CMSBaseTab {
private static String PANEL_NAME = "GENERALLOG";
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-general-logs-settings-help";
private JCheckBox mEnable;
private Color mActiveColor;
@@ -157,7 +157,7 @@ public class GeneralLogPanel extends CMSBaseTab {
mEnable.setSelected(false);
} else if (name.equals(Constants.PR_DEBUG_LOG_LEVEL)) {
mLevelText.setText(value);
- }
+ }
/* else if (name.equals(Constants.PR_DEBUG_LOG_SHOWCALLER)) {
if (value.equals(Constants.TRUE))
diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
index 307ddbbc4..5b38a17d2 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsConfigDialog.java
@@ -46,7 +46,7 @@ public class JobsConfigDialog extends CMSBaseConfigDialog
*==========================================================*/
public JobsConfigDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -59,4 +59,4 @@ public class JobsConfigDialog extends CMSBaseConfigDialog
init(nvp,parent,conn,dest);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
index d3a605433..24de6a8e9 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsImplDataModel.java
@@ -40,7 +40,7 @@ public class JobsImplDataModel extends CMSContentTableModel
public static final String IMPL_NAME = "NAME";
public static final String IMPL_CLASS = "CLASS";
public static final String IMPL_DESC = "DESC";
-
+
private static String[] mColumns = {JOBS_IMPL, CLASSNAME};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
index 57848c649..c9c3ac173 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
@@ -43,19 +43,19 @@ public class JobsImplTab extends CMSBaseUGTab {
private static final String IMPL_NAME = JobsImplDataModel.IMPL_NAME;
private static final String IMPL_CLASS = JobsImplDataModel.IMPL_CLASS;
private static final String IMPL_DESC = JobsImplDataModel.IMPL_DESC;
-
+
private static final String PANEL_NAME = "JOBSIMPL";
private static final String DIALOG_PREFIX = "JOBSREGISTERDIALOG";
-
+
private AdminConnection mConnection;
private String mDestination;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected JobsImplDataModel mDataModel; //table model
protected JobsRegisterDialog mEditor=null; //keep single copy
protected ViewDialog mViewer=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String HELPINDEX = "jobsscheduler-certsrv-jobplugin-help";
@@ -106,13 +106,13 @@ public class JobsImplTab extends CMSBaseUGTab {
if(mTable.getSelectedRow()< 0)
return;
NameValuePairs obj = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
if (mViewer==null)
mViewer = new ViewDialog(mModel.getFrame());
mViewer.showDialog(obj.get(IMPL_NAME),
obj.get(IMPL_CLASS),
obj.get(IMPL_DESC));
- }
+ }
if (e.getSource().equals(mHelp)) {
helpCallback();
}
@@ -124,7 +124,7 @@ public class JobsImplTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -133,8 +133,8 @@ public class JobsImplTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -218,7 +218,7 @@ public class JobsImplTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -227,24 +227,24 @@ public class JobsImplTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
@@ -283,18 +283,18 @@ public class JobsImplTab extends CMSBaseUGTab {
}
data.put(entry,obj);
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
mDataModel.processData(data.get(vals[y]));
}
-
+
data.clear();
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
index 059a741ce..1c457c720 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsInstanceTab.java
@@ -42,7 +42,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "JOBSRULE";
-
+
private final static String HELPINDEX = "jobsscheduler-certsrv-jobrules-help";
@@ -56,7 +56,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab {
mDataModel = new JobsRuleDataModel();
mScope = ScopeDef.SC_JOBS_INSTANCE;
RULE_NAME = JobsRuleDataModel.RULE_NAME;
- RULE_STAT = JobsRuleDataModel.RULE_STAT;
+ RULE_STAT = JobsRuleDataModel.RULE_STAT;
mHelpToken = HELPINDEX;
}
@@ -67,7 +67,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new JobsConfigDialog(nvp,
@@ -81,7 +81,7 @@ public class JobsInstanceTab extends CMSPluginInstanceTab {
AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType
- )
+ )
{
return new JobsPluginSelectionDialog(parent,conn,dest,pluginType);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
index d07e5ed32..ba3403b5c 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsPluginSelectionDialog.java
@@ -41,7 +41,7 @@ public class JobsPluginSelectionDialog extends PluginSelectionDialog
* variables
*==========================================================*/
private static final String PREFIX = "JOBSSELECTIONDIALOG";
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"jobsscheduler-certsrv-add-jobrule-dbox-help";
/*==========================================================
@@ -49,9 +49,9 @@ public class JobsPluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public JobsPluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
mScope = ScopeDef.SC_JOBS_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
index 76fbd9a38..9bce4799b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsRuleDataModel.java
@@ -56,7 +56,7 @@ public class JobsRuleDataModel extends CMSRuleDataModel
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
- v.addElement(mResource.getString("JOBSRULE_LABEL_ENABLED_LABEL"));
+ v.addElement(mResource.getString("JOBSRULE_LABEL_ENABLED_LABEL"));
} else {
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
diff --git a/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java b/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
index b6a93d191..86b8e90ff 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/JobsSettingPanel.java
@@ -32,7 +32,7 @@ import java.awt.event.*;
* @version $Revision$, $Date$
*/
public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"jobsscheduler-certsrv-setting-jobrule-help";
private JTextField mFrequencyText;
private JCheckBox mEnable;
@@ -48,7 +48,7 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
this(panelName, parent, true);
mPanelName = panelName;
}
-
+
public JobsSettingPanel(String panelName, CMSTabPanel parent, boolean flag) {
super(panelName, parent);
mServletName = DestDef.DEST_JOBS_ADMIN;
@@ -63,7 +63,7 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
GridBagLayout gb = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
mCenterPanel.setLayout(gb);
-
+
//add the enable checkbox
mEnable = makeJCheckBox("ENABLE");
mEnable.setSelected(true);
@@ -72,13 +72,13 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
gbc.fill = gbc.NONE;
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
- gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
+ gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
DIFFERENT_COMPONENT_SPACE,
0,
DIFFERENT_COMPONENT_SPACE);
gb.setConstraints(mEnable, gbc);
mCenterPanel.add(mEnable);
-
+
//add the frequency panel
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
@@ -92,7 +92,7 @@ public class JobsSettingPanel extends CMSBaseTab implements ItemListener {
GridBagLayout gb1 = new GridBagLayout();
serverInfo.setLayout(gb1);
serverInfo.setBorder(makeTitledBorder("FREQUENCY"));
-
+
// add frequency label and text field
CMSAdminUtil.resetGBC(gbc);
mFrequencyLabel = makeJLabel("FREQUENCY");
diff --git a/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java b/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
index 5821127d4..3df1832fd 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/KeyCreateDialog.java
@@ -62,7 +62,7 @@ public class KeyCreateDialog extends JDialog
/*==========================================================
* constructors
*==========================================================*/
-
+
public KeyCreateDialog(JFrame parent, AdminConnection conn) {
super(parent,true);
KeyCreateDialog2(PREFIX, parent, conn);
@@ -128,7 +128,7 @@ public class KeyCreateDialog extends JDialog
}
if (evt.getSource().equals(mOK)) {
-
+
/* REPLACED BY PROACTIVE ENFORCEMENT
if (mNameField.getText().trim().equals("")) {
CMSAdminUtil.showMessageDialog(mParentFrame, mResource, mPrefix,
@@ -162,15 +162,15 @@ public class KeyCreateDialog extends JDialog
public void insertUpdate(DocumentEvent e) {
setButtons();
}
-
+
public void removeUpdate(DocumentEvent e){
setButtons();
}
-
+
public void changedUpdate(DocumentEvent e){
setButtons();
}
-
+
//==== MOUSELISTENER ======================
public void mouseClicked(MouseEvent e) {
setButtons();
@@ -180,13 +180,13 @@ public class KeyCreateDialog extends JDialog
public void mouseReleased(MouseEvent e) {}
public void mouseEntered(MouseEvent e) {}
public void mouseExited(MouseEvent e) {
- setButtons();
+ setButtons();
}
-
+
/*==========================================================
* protected methods
- *==========================================================*/
-
+ *==========================================================*/
+
protected void setDisplay() {
getContentPane().setLayout(new BorderLayout());
JPanel center = new JPanel();
@@ -219,19 +219,19 @@ public class KeyCreateDialog extends JDialog
/*==========================================================
* private methods
- *==========================================================*/
+ *==========================================================*/
//set arrow buttons
private void setButtons() {
- if ( mNameField.getText().trim().equals("")) {
+ if ( mNameField.getText().trim().equals("")) {
//||
//(mClassField.getText().trim().equals("")) ) {
- mOK.setEnabled(false);
+ mOK.setEnabled(false);
} else {
- mOK.setEnabled(true);
+ mOK.setEnabled(true);
}
- }
-
+ }
+
private JPanel makeActionPane() {
mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this);
mOK.setEnabled(false);
@@ -259,7 +259,7 @@ public class KeyCreateDialog extends JDialog
//JLabel label2 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "CLASS", null);
//mClassField = new JTextField();
//mClassField.getDocument().addDocumentListener(this);
- //mClassField.addMouseListener(this);
+ //mClassField.addMouseListener(this);
//CMSAdminUtil.addEntryField(content, label2, mClassField, gbc);
//if (mType) {
@@ -268,10 +268,10 @@ public class KeyCreateDialog extends JDialog
// JLabel label3 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "TYPE", null);
// mTypeField = new JTextField();
// mTypeField.getDocument().addDocumentListener(this);
- // mTypeField.addMouseListener(this);
+ // mTypeField.addMouseListener(this);
// CMSAdminUtil.addEntryField(content, label3, mTypeField, gbc);
//}
-
+
return content;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
index b239edfb9..70ab973df 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ListCertsModel.java
@@ -37,9 +37,9 @@ public class ListCertsModel extends CMSTableModel
*==========================================================*/
public static final String COL1 = "CERTNICKNAMENAME";
public static final String COL2 = "SERIALNUMBER";
- public static final String COL3 = "ISSUERNAME";
+ public static final String COL3 = "ISSUERNAME";
public static final String COL4 = "TOKENNAME";
-
+
private static String[] mColumns = {COL1, COL2, COL3, COL4};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java b/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
index 78f033be5..bf80db90f 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ListKeysModel.java
@@ -37,9 +37,9 @@ public class ListKeysModel extends CMSTableModel
*==========================================================*/
public static final String COL1 = "KEYNAME";
public static final String COL2 = "SERIALNUMBER";
- public static final String COL3 = "ISSUERNAME";
+ public static final String COL3 = "ISSUERNAME";
public static final String COL4 = "TOKENNAME";
-
+
private static String[] mColumns = {COL1};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
index 7f3833034..5333d36a0 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogConfigDialog.java
@@ -46,7 +46,7 @@ public class LogConfigDialog extends CMSBaseConfigDialog
*==========================================================*/
public LogConfigDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
index a5af0b1dc..7e65ba0ff 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogImplDataModel.java
@@ -40,7 +40,7 @@ public class LogImplDataModel extends CMSContentTableModel
public static final String IMPL_NAME = "NAME";
public static final String IMPL_CLASS = "CLASS";
public static final String IMPL_DESC = "DESC";
-
+
private static String[] mColumns = {LOG_IMPL, CLASSNAME};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
index 1b654fead..bb399e183 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
@@ -43,19 +43,19 @@ public class LogImplTab extends CMSBaseUGTab {
private static final String IMPL_NAME = LogImplDataModel.IMPL_NAME;
private static final String IMPL_CLASS = LogImplDataModel.IMPL_CLASS;
private static final String IMPL_DESC = LogImplDataModel.IMPL_DESC;
-
+
private static final String PANEL_NAME = "LOGIMPL";
private static final String DIALOG_PREFIX = "LOGREGISTERDIALOG";
-
+
private AdminConnection mConnection;
private String mDestination;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected LogImplDataModel mDataModel; //table model
protected LogRegisterDialog mEditor=null; //keep single copy
protected ViewDialog mViewer=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String HELPINDEX = "configuration-log-plugin-help";
@@ -106,13 +106,13 @@ public class LogImplTab extends CMSBaseUGTab {
if(mTable.getSelectedRow()< 0)
return;
NameValuePairs obj = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
if (mViewer==null)
mViewer = new ViewDialog(mModel.getFrame());
mViewer.showDialog(obj.get(IMPL_NAME),
obj.get(IMPL_CLASS),
obj.get(IMPL_DESC));
- }
+ }
if (e.getSource().equals(mHelp)) {
helpCallback();
}
@@ -124,7 +124,7 @@ public class LogImplTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -133,8 +133,8 @@ public class LogImplTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -218,7 +218,7 @@ public class LogImplTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -227,24 +227,24 @@ public class LogImplTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
@@ -275,18 +275,18 @@ public class LogImplTab extends CMSBaseUGTab {
obj.put(IMPL_DESC, value.substring(x + 1));
data.put(entry,obj);
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
mDataModel.processData(data.get(vals[y]));
}
-
+
data.clear();
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
index 99b86e5eb..f69557d4a 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogInstanceTab.java
@@ -42,7 +42,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "LOGRULE";
-
+
private final static String HELPINDEX = "configuration-loginstances-help";
@@ -57,7 +57,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab {
mScope = ScopeDef.SC_LOG_RULES;
RULE_NAME = LogRuleDataModel.RULE_NAME;
RULE_IMPL = LogRuleDataModel.RULE_IMPL;
- RULE_STAT = LogRuleDataModel.RULE_STAT;
+ RULE_STAT = LogRuleDataModel.RULE_STAT;
mHelpToken = HELPINDEX;
}
@@ -68,7 +68,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new LogConfigDialog(nvp,
@@ -82,7 +82,7 @@ public class LogInstanceTab extends CMSPluginInstanceTab {
AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType
- )
+ )
{
return new LogPluginSelectionDialog(parent,conn,dest,pluginType);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
index 83c8ab2e8..b1d5662a0 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/LogPluginSelectionDialog.java
@@ -49,9 +49,9 @@ public class LogPluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public LogPluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
mScope = ScopeDef.SC_LOG_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
index 119823d58..80969a793 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperConfigDialog.java
@@ -46,7 +46,7 @@ public class MapperConfigDialog extends CMSBaseConfigDialog
*==========================================================*/
public MapperConfigDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -61,4 +61,4 @@ public class MapperConfigDialog extends CMSBaseConfigDialog
init(nvp,parent,conn,dest);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
index 23d6ee0b4..77da97def 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperImplDataModel.java
@@ -40,7 +40,7 @@ public class MapperImplDataModel extends CMSContentTableModel
public static final String IMPL_NAME = "NAME";
public static final String IMPL_CLASS = "CLASS";
public static final String IMPL_DESC = "DESC";
-
+
private static String[] mColumns = {MAPPER_IMPL, CLASSNAME};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
index 2ad54da60..c12d05df6 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
@@ -43,19 +43,19 @@ public class MapperImplTab extends CMSBaseUGTab {
private static final String IMPL_NAME = MapperImplDataModel.IMPL_NAME;
private static final String IMPL_CLASS = MapperImplDataModel.IMPL_CLASS;
private static final String IMPL_DESC = MapperImplDataModel.IMPL_DESC;
-
+
private static final String PANEL_NAME = "MAPPERIMPL";
private static final String DIALOG_PREFIX = "MAPPERREGISTERDIALOG";
-
+
private AdminConnection mConnection;
private String mDestination;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected MapperImplDataModel mDataModel; //table model
protected MapperRegisterDialog mEditor=null; //keep single copy
protected ViewDialog mViewer=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String RAHELPINDEX = "configuration-ra-mapperplugin-help";
private final static String CAHELPINDEX = "configuration-ca-mapperplugin-help";
@@ -111,13 +111,13 @@ public class MapperImplTab extends CMSBaseUGTab {
if(mTable.getSelectedRow()< 0)
return;
NameValuePairs obj = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
if (mViewer==null)
mViewer = new ViewDialog(mModel.getFrame());
mViewer.showDialog(obj.get(IMPL_NAME),
obj.get(IMPL_CLASS),
obj.get(IMPL_DESC));
- }
+ }
if (e.getSource().equals(mHelp)) {
helpCallback();
}
@@ -129,7 +129,7 @@ public class MapperImplTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -138,8 +138,8 @@ public class MapperImplTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -223,7 +223,7 @@ public class MapperImplTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -232,24 +232,24 @@ public class MapperImplTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
@@ -280,18 +280,18 @@ public class MapperImplTab extends CMSBaseUGTab {
obj.put(IMPL_DESC, value.substring(x + 1));
data.put(entry,obj);
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
mDataModel.processData(data.get(vals[y]));
}
-
+
data.clear();
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
index a531ecf30..9e50c67f3 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperInstanceTab.java
@@ -42,7 +42,7 @@ public class MapperInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "MAPPERRULE";
-
+
private final static String RAHELPINDEX = "configuration-ra-mapperinstances-help";
private final static String CAHELPINDEX = "configuration-ca-mapperinstances-help";
private final static String KRAHELPINDEX = "configuration-kra-mapperinstances-help";
@@ -58,9 +58,9 @@ public class MapperInstanceTab extends CMSPluginInstanceTab {
mDataModel = new MapperRuleDataModel();
mScope = ScopeDef.SC_MAPPER_RULES;
RULE_NAME = MapperRuleDataModel.RULE_NAME;
- RULE_STAT = MapperRuleDataModel.RULE_STAT;
+ RULE_STAT = MapperRuleDataModel.RULE_STAT;
- if (mDestination.equals(DestDef.DEST_RA_MAPPER_ADMIN))
+ if (mDestination.equals(DestDef.DEST_RA_MAPPER_ADMIN))
mHelpToken = RAHELPINDEX;
else
mHelpToken = CAHELPINDEX;
@@ -72,7 +72,7 @@ public class MapperInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new MapperConfigDialog(nvp,
@@ -86,7 +86,7 @@ public class MapperInstanceTab extends CMSPluginInstanceTab {
AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType
- )
+ )
{
return new MapperPluginSelectionDialog(parent,conn,dest,pluginType);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
index ce0e10e9a..f393ae05d 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/MapperPluginSelectionDialog.java
@@ -41,7 +41,7 @@ public class MapperPluginSelectionDialog extends PluginSelectionDialog
* variables
*==========================================================*/
private static final String PREFIX = "MAPPERSELECTIONDIALOG";
- private static final String CAHELPINDEX =
+ private static final String CAHELPINDEX =
"configuration-ca-add-mapperrule-dbox-help";
private static final String RAHELPINDEX =
"configuration-ra-add-mapperrule-dbox-help";
@@ -51,9 +51,9 @@ public class MapperPluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public MapperPluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
mScope = ScopeDef.SC_MAPPER_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
index 87097ddc0..024196284 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresConfigDialog.java
@@ -57,4 +57,4 @@ public class OCSPStoresConfigDialog extends CMSBaseConfigDialog
init(nvp,parent,conn,dest);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
index ff234c7fd..110ba7806 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresInstanceTab.java
@@ -40,7 +40,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "OCSPSTORESRULE";
-
+
private final static String OCSPHELPINDEX = "configuration-ocsp-storeinstances-help";
@@ -53,9 +53,9 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab {
mConnection = model.getServerInfo().getAdmin();
mDataModel = new OCSPStoresRuleDataModel();
mScope = ScopeDef.SC_OCSPSTORES_RULES;
- RULE_NAME = OCSPStoresRuleDataModel.RULE_NAME;
+ RULE_NAME = OCSPStoresRuleDataModel.RULE_NAME;
RULE_IMPL = OCSPStoresRuleDataModel.RULE_IMPL;
- RULE_STAT = OCSPStoresRuleDataModel.RULE_STAT;
+ RULE_STAT = OCSPStoresRuleDataModel.RULE_STAT;
mHelpToken = OCSPHELPINDEX;
}
@@ -64,7 +64,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab {
NameValuePairs nvp,
JFrame parent,
AdminConnection conn,
- String dest)
+ String dest)
{
return new OCSPStoresConfigDialog(nvp, parent, conn, dest);
}
@@ -73,7 +73,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
return new OCSPStoresPluginSelectionDialog(parent, conn, dest, pluginType);
}
@@ -108,7 +108,7 @@ public class OCSPStoresInstanceTab extends CMSPluginInstanceTab {
mModel.progressStart();
//get entry name
NameValuePairs data = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
NameValuePairs nvps = new NameValuePairs();
//send comment to server for the removal of user
diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
index 32365c27c..68c952c7b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresPluginSelectionDialog.java
@@ -40,7 +40,7 @@ public class OCSPStoresPluginSelectionDialog extends PluginSelectionDialog
* variables
*==========================================================*/
private static final String PREFIX = "OCSPSTORESELECTIONDIALOG";
- private static final String OCSPHELPINDEX =
+ private static final String OCSPHELPINDEX =
"configuration-ocsp-add-crlextensionrule-dbox-help";
/*==========================================================
@@ -48,9 +48,9 @@ public class OCSPStoresPluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public OCSPStoresPluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
// mScope = ScopeDef.SC_RULE_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
index 5cd67e276..05c9c74ad 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/OCSPStoresRuleDataModel.java
@@ -55,7 +55,7 @@ public class OCSPStoresRuleDataModel extends CMSRuleDataModel
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
- v.addElement(mResource.getString("OCSPSTORESRULE_LABEL_ENABLED_LABEL"));
+ v.addElement(mResource.getString("OCSPSTORESRULE_LABEL_ENABLED_LABEL"));
} else {
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
index 5de06c7f9..d920c1681 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
@@ -57,7 +57,7 @@ public class PanelMapperConfigDialog extends JDialog
private AdminConnection mConn;
private JButton mOK, mCancel, mHelp;
private JComboBox mSelection;
-
+
private static final String CAHELPINDEX =
"configuration-ldappublish-camapper-dbox-help";
private static final String RAHELPINDEX =
@@ -97,7 +97,7 @@ public class PanelMapperConfigDialog extends JDialog
mScope = scope;
Debug.println("MapperConfigDialog: showDialog() - mapper: "+
mRuleName+" dest: "+mDest+" scope: "+mScope);
-
+
if (!refresh(name))
return;
@@ -127,7 +127,7 @@ public class PanelMapperConfigDialog extends JDialog
mTable.setValueAt(str, row, col);
}
}
-
+
try {
saveConfiguration();
} catch (EAdminException e) {
@@ -136,7 +136,7 @@ public class PanelMapperConfigDialog extends JDialog
e.toString(), CMSAdminUtil.ERROR_MESSAGE);
return;
}
-
+
mIsOK = true;
this.dispose();
}
@@ -164,37 +164,37 @@ public class PanelMapperConfigDialog extends JDialog
}
}
}
-
+
/*==========================================================
* private methods
*==========================================================*/
-
+
private void saveEdit() {
-
+
//save any current edit component
Component component = mTable.getEditorComponent();
-
+
}
-
- //setup and refresh the UI components
+
+ //setup and refresh the UI components
private boolean refresh(String mapperName) {
-
+
//get mapper listing
if (!getMapperListing(mapperName))
return false;
-
+
//setup UI
if (! setupConfigUI(mapperName))
return false;
-
+
return true;
}
-
- //retrieve the mapper class listing and update
+
+ //retrieve the mapper class listing and update
//the selection UI
private boolean getMapperListing(String mapperName) {
NameValuePairs response;
-
+
try {
response = getMapperList();
}catch (EAdminException e) {
@@ -202,22 +202,22 @@ public class PanelMapperConfigDialog extends JDialog
e.toString(), CMSAdminUtil.ERROR_MESSAGE);
return false;
}
-
+
Debug.println("MapperList: "+response.toString());
mSelection.removeAllItems();
-
+
for (String name : response.keySet()) {
mSelection.addItem(name.trim());
}
-
+
mSelection.setSelectedItem(mapperName);
return true;
}
-
+
//retrieve the config parameters for the mapper
//and update the config UI
private boolean setupConfigUI(String mapperName) {
-
+
try {
mData = getConfiguration(mapperName);
}catch (EAdminException e) {
@@ -228,7 +228,7 @@ public class PanelMapperConfigDialog extends JDialog
Debug.println("MapperConfigDialog: showDialog() config: "+mData.toString());
mDataModel.removeAllRows();
-
+
for (String entry : mData.keySet()) {
entry = entry.trim();
if (!entry.equals(Constants.PR_MAPPER)) {
@@ -243,7 +243,7 @@ public class PanelMapperConfigDialog extends JDialog
mTable.repaint();
return true;
}
-
+
private void setDisplay() {
getContentPane().setLayout(new BorderLayout());
JPanel center = new JPanel();
@@ -311,7 +311,7 @@ public class PanelMapperConfigDialog extends JDialog
mScrollPane.setBackground(Color.white);
//setLabelCellRenderer(mTable,1);
setCellEditor(mTable,1);
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
gbc.gridwidth = gbc.REMAINDER;
@@ -330,41 +330,41 @@ public class PanelMapperConfigDialog extends JDialog
//Set the index column's cellrender as label cell
private void setLabelCellRenderer(JTable table, int index) {
table.getColumnModel().getColumn(index).setCellRenderer(
- new DefaultTableCellRenderer());
+ new DefaultTableCellRenderer());
}
-
+
//set the index column's cell editor
private void setCellEditor(JTable table, int index) {
table.getColumnModel().getColumn(index).setCellEditor(
- new DefaultCellEditor(new JTextField()));
+ new DefaultCellEditor(new JTextField()));
}
-
+
//retrieve the mapper listing from the server side
- private NameValuePairs getMapperList()
- throws EAdminException
+ private NameValuePairs getMapperList()
+ throws EAdminException
{
- return mConn.search(mDest, getMapperScope(),
+ return mConn.search(mDest, getMapperScope(),
new NameValuePairs());
}
-
+
//retrieve the configuration parameters for specific
//mapper class
- private NameValuePairs getConfiguration(String mapper)
- throws EAdminException
+ private NameValuePairs getConfiguration(String mapper)
+ throws EAdminException
{
- return mConn.read(mDest, getMapperScope(),
+ return mConn.read(mDest, getMapperScope(),
mapper, new NameValuePairs());
}
-
+
//get the mapper scope
private String getMapperScope() {
-
+
if (mScope.equals(ScopeDef.SC_CACERT))
return ScopeDef.SC_CAMAPPER;
else
return ScopeDef.SC_USERMAPPER;
}
-
+
//save the configuration settings for the mapper
private void saveConfiguration() throws EAdminException {
NameValuePairs nvp = getData();
@@ -380,12 +380,12 @@ public class PanelMapperConfigDialog extends JDialog
}
return response;
}
-
+
/**
* Add a label and a textfield to a panel, assumed to be using
* GridBagLayout.
*/
- private static void addEntryField(JPanel panel, JComponent label,
+ private static void addEntryField(JPanel panel, JComponent label,
JComponent field, GridBagConstraints gbc) {
gbc.fill = gbc.NONE;
gbc.weightx = 0.0;
@@ -405,5 +405,5 @@ public class PanelMapperConfigDialog extends JDialog
CMSAdminUtil.COMPONENT_SPACE,
0,CMSAdminUtil.COMPONENT_SPACE);
panel.add( field, gbc );
- }
+ }
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
index 437881186..ed1c21aa9 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
@@ -60,9 +60,9 @@ public class PluginSelectionDialog extends JDialog
protected CMSBaseResourceModel mModel=null;
public PluginSelectionDialog(
- String prefix,
- JFrame parent,
- AdminConnection conn,
+ String prefix,
+ JFrame parent,
+ AdminConnection conn,
String dest)
{
this( prefix,
@@ -76,11 +76,11 @@ public class PluginSelectionDialog extends JDialog
* constructors
*==========================================================*/
public PluginSelectionDialog(
- String prefix,
- JFrame parent,
- AdminConnection conn,
+ String prefix,
+ JFrame parent,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(parent,true);
mParentFrame = parent;
@@ -341,18 +341,18 @@ public class PluginSelectionDialog extends JDialog
vals[i++] = name.trim();
Debug.println("PluginSelectionDialog::update() - adding '" + vals[i - 1] + "'");
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
try {
- mDataModel.addElement(new JLabel(vals[y],
+ mDataModel.addElement(new JLabel(vals[y],
CMSAdminUtil.getImage(mImageName), JLabel.LEFT));
}
catch (Exception ex) {
Debug.println("PluginSelectionDialog could not get image for '"+
mImageName+"'. Adding without image");
- mDataModel.addElement(new JLabel(vals[y],
+ mDataModel.addElement(new JLabel(vals[y],
JLabel.LEFT));
}
}
@@ -364,12 +364,12 @@ public class PluginSelectionDialog extends JDialog
protected NameValuePairs getDefaultConfig() throws EAdminException {
String id = ((JLabel)mDataModel.elementAt(mList.getSelectedIndex())).getText();
NameValuePairs response;
- response = mConnection.read(mDestination, mScope, id,
+ response = mConnection.read(mDestination, mScope, id,
new NameValuePairs());
Debug.println(response.toString());
return response;
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
index 8dec3cabf..c5a09837f 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyConfigDialog.java
@@ -46,7 +46,7 @@ public class PolicyConfigDialog extends CMSBaseConfigDialog
*==========================================================*/
public PolicyConfigDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -61,4 +61,4 @@ public class PolicyConfigDialog extends CMSBaseConfigDialog
init(nvp,parent,conn,dest);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
index 59ea36ec8..00baf6b8e 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplDataModel.java
@@ -40,7 +40,7 @@ public class PolicyImplDataModel extends CMSContentTableModel
public static final String IMPL_NAME = "NAME";
public static final String IMPL_CLASS = "CLASS";
public static final String IMPL_DESC = "DESC";
-
+
private static String[] mColumns = {POLICY_IMPL, CLASSNAME};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
index f4fab7260..dbdfe8228 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
@@ -43,19 +43,19 @@ public class PolicyImplTab extends CMSBaseUGTab {
private static final String IMPL_NAME = PolicyImplDataModel.IMPL_NAME;
private static final String IMPL_CLASS = PolicyImplDataModel.IMPL_CLASS;
private static final String IMPL_DESC = PolicyImplDataModel.IMPL_DESC;
-
+
private static final String PANEL_NAME = "POLICYIMPL";
private static final String DIALOG_PREFIX = "POLICYREGISTERDIALOG";
-
+
private AdminConnection mConnection;
private String mDestination;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected PolicyImplDataModel mDataModel; //table model
protected PolicyRegisterDialog mEditor=null; //keep single copy
protected ViewDialog mViewer=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String RAHELPINDEX = "configuration-ra-policyplugin-help";
private final static String CAHELPINDEX = "configuration-ca-policyplugin-help";
@@ -113,13 +113,13 @@ public class PolicyImplTab extends CMSBaseUGTab {
if(mTable.getSelectedRow()< 0)
return;
NameValuePairs obj = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
if (mViewer==null)
mViewer = new ViewDialog(mModel.getFrame());
mViewer.showDialog(obj.get(IMPL_NAME),
obj.get(IMPL_CLASS),
obj.get(IMPL_DESC));
- }
+ }
if (e.getSource().equals(mHelp)) {
helpCallback();
}
@@ -131,7 +131,7 @@ public class PolicyImplTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -140,8 +140,8 @@ public class PolicyImplTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -225,7 +225,7 @@ public class PolicyImplTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -234,24 +234,24 @@ public class PolicyImplTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
@@ -282,18 +282,18 @@ public class PolicyImplTab extends CMSBaseUGTab {
obj.put(IMPL_DESC, value.substring(x + 1));
data.put(entry,obj);
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
mDataModel.processData(data.get(vals[y]));
}
-
+
data.clear();
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
index 9bf8fb54b..5d13c7a49 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyInstanceTab.java
@@ -42,7 +42,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "POLICYRULE";
-
+
protected JButton mOrder;
private final static String RAHELPINDEX = "configuration-ra-policyrules-help";
private final static String CAHELPINDEX = "configuration-ca-policyrules-help";
@@ -59,9 +59,9 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab {
mDataModel = new PolicyRuleDataModel();
mScope = ScopeDef.SC_POLICY_RULES;
RULE_NAME = PolicyRuleDataModel.RULE_NAME;
- RULE_STAT = PolicyRuleDataModel.RULE_STAT;
+ RULE_STAT = PolicyRuleDataModel.RULE_STAT;
- if (mDestination.equals(DestDef.DEST_RA_POLICY_ADMIN))
+ if (mDestination.equals(DestDef.DEST_RA_POLICY_ADMIN))
mHelpToken = RAHELPINDEX;
else if (mDestination.equals(DestDef.DEST_KRA_POLICY_ADMIN))
mHelpToken = KRAHELPINDEX;
@@ -75,7 +75,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new PolicyConfigDialog(nvp,
@@ -89,7 +89,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab {
AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType
- )
+ )
{
return new PolicyPluginSelectionDialog(parent,conn,dest,pluginType);
}
@@ -99,12 +99,12 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab {
public void moreActionPerformed(ActionEvent e) {
if (e.getSource().equals(mOrder)) {
Debug.println("Order");
- PolicyRuleOrderDialog dialog =
- new PolicyRuleOrderDialog(mModel.getFrame(),
+ PolicyRuleOrderDialog dialog =
+ new PolicyRuleOrderDialog(mModel.getFrame(),
mConnection, mDestination);
- dialog.showDialog(mDataModel.getRules());
+ dialog.showDialog(mDataModel.getRules());
refresh();
- }
+ }
}
/**
@@ -126,7 +126,7 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab {
//set buttons
protected void setButtons() {
super.setButtons();
-
+
if (mDataModel.getRowCount()<=0) {
mOrder.setEnabled(false);
}
@@ -134,6 +134,6 @@ public class PolicyInstanceTab extends CMSPluginInstanceTab {
mOrder.setEnabled(true);
}
}
-
-
+
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
index 6ef26b767..11120ce69 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyPluginSelectionDialog.java
@@ -41,7 +41,7 @@ public class PolicyPluginSelectionDialog extends PluginSelectionDialog
* variables
*==========================================================*/
private static final String PREFIX = "POLICYSELECTIONDIALOG";
- private static final String CAHELPINDEX =
+ private static final String CAHELPINDEX =
"configuration-ca-add-policyrule-dbox-help";
private static final String RAHELPINDEX =
"configuration-ra-add-policyrule-dbox-help";
@@ -53,9 +53,9 @@ public class PolicyPluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public PolicyPluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
mScope = ScopeDef.SC_POLICY_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
index 9bbeda334..5adf42cdd 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleDataModel.java
@@ -56,7 +56,7 @@ public class PolicyRuleDataModel extends CMSRuleDataModel
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
- v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL"));
+ v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL"));
} else {
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
index 1c99d999f..e4149df13 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
@@ -99,12 +99,12 @@ public class PolicyRuleOrderDialog extends JDialog
mDataModel.clear();
for (int i=0; i<rules.size(); i++)
mDataModel.addElement(
- new JLabel((String)rules.elementAt(i),
+ new JLabel((String)rules.elementAt(i),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
if (mDataModel.getSize() >0)
mList.setSelectedIndex(0);
-
+
refresh();
setArrowButtons();
this.show();
@@ -147,7 +147,7 @@ public class PolicyRuleOrderDialog extends JDialog
mDataModel.insertElementAt(obj,index+1);
mList.setSelectedIndex(index+1);
setArrowButtons();
- refresh();
+ refresh();
}
if (evt.getSource().equals(mHelp)) {
CMSAdminUtil.help(mHelpToken);
@@ -161,7 +161,7 @@ public class PolicyRuleOrderDialog extends JDialog
public void mousePressed(MouseEvent e) {}
public void mouseReleased(MouseEvent e) {
- setArrowButtons();
+ setArrowButtons();
}
public void mouseEntered(MouseEvent e) {}
public void mouseExited(MouseEvent e) {
@@ -282,12 +282,12 @@ public class PolicyRuleOrderDialog extends JDialog
x++;
buf.append(((JLabel)mDataModel.getElementAt(i)).getText());
}
-
+
NameValuePairs nvp = new NameValuePairs();
nvp.put(Constants.PR_POLICY_ORDER, buf.toString());
-
+
Debug.println("ORDER: "+buf.toString());
-
+
mConnection.modify(mDestination,
ScopeDef.SC_POLICY_RULES,
Constants.RS_ID_ORDER,
@@ -296,7 +296,7 @@ public class PolicyRuleOrderDialog extends JDialog
//set arrow buttons
private void setArrowButtons() {
-
+
//enable and diable buttons accordingly
Debug.println("setArrowButtons() - "+mList.getSelectedIndex());
if (mList.getSelectedIndex()< 0) {
@@ -305,7 +305,7 @@ public class PolicyRuleOrderDialog extends JDialog
mOK.setEnabled(false);
return;
}
-
+
if (mList.getSelectedIndex()==0)
mUp.setEnabled(false);
else
@@ -314,7 +314,7 @@ public class PolicyRuleOrderDialog extends JDialog
mDown.setEnabled(true);
else
mDown.setEnabled(false);
- mOK.setEnabled(true);
+ mOK.setEnabled(true);
}
//refresh the table content
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
index b1e2769db..e64a09254 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileComponentCellEditor.java
@@ -31,14 +31,14 @@ import javax.swing.*;
public class ProfileComponentCellEditor implements TableCellEditor {
protected EventListenerList listenerList = new EventListenerList();
protected ChangeEvent changeEvent = null;
-
+
protected JComponent editorComponent = null;
protected JComponent container = null; // Can be tree or table
public Component getComponent() {
return editorComponent;
}
-
+
public Object getCellEditorValue() {
return editorComponent;
}
@@ -46,28 +46,28 @@ public class ProfileComponentCellEditor implements TableCellEditor {
public boolean isCellEditable(EventObject anEvent) {
return true;
}
-
+
public boolean shouldSelectCell(EventObject anEvent) {
return true;
}
-
+
public boolean stopCellEditing() {
fireEditingStopped();
return true;
}
-
+
public void cancelCellEditing() {
fireEditingCanceled();
}
-
+
public void addCellEditorListener(CellEditorListener l) {
listenerList.add(CellEditorListener.class, l);
}
-
+
public void removeCellEditorListener(CellEditorListener l) {
listenerList.remove(CellEditorListener.class, l);
}
-
+
protected void fireEditingStopped() {
Object[] listeners = listenerList.getListenerList();
// Process the listeners last to first, notifying
@@ -78,10 +78,10 @@ public class ProfileComponentCellEditor implements TableCellEditor {
if (changeEvent == null)
changeEvent = new ChangeEvent(this);
((CellEditorListener)listeners[i+1]).editingStopped(changeEvent);
- }
+ }
}
}
-
+
protected void fireEditingCanceled() {
// Guaranteed to return a non-null array
Object[] listeners = listenerList.getListenerList();
@@ -93,14 +93,14 @@ public class ProfileComponentCellEditor implements TableCellEditor {
if (changeEvent == null)
changeEvent = new ChangeEvent(this);
((CellEditorListener)listeners[i+1]).editingCanceled(changeEvent);
- }
+ }
}
}
-
+
// implements javax.swing.table.TableCellEditor
public Component getTableCellEditorComponent(JTable table, Object value,
boolean isSelected, int row, int column) {
-
+
editorComponent = (JComponent)value;
container = table;
return editorComponent;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
index a8d312d2a..14b772675 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileConfigDialog.java
@@ -47,7 +47,7 @@ public class ProfileConfigDialog extends CMSBaseConfigDialog
*==========================================================*/
public ProfileConfigDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -370,7 +370,7 @@ public class ProfileConfigDialog extends CMSBaseConfigDialog
nvp.put("auth", mAuthField.getText());
nvp.put("desc", mDescField.getText());
// nvp.add("config", mConfigField.getText());
- // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
+ // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.add(mDest,
ScopeDef.SC_PROFILE_RULES, instanceName, nvp);
@@ -392,5 +392,5 @@ public class ProfileConfigDialog extends CMSBaseConfigDialog
CMSAdminUtil.help(mHelpToken);
}
- }
-}
+ }
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
index d10e19215..1d87b60fd 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileEditDialog.java
@@ -57,7 +57,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
*==========================================================*/
public ProfileEditDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -242,7 +242,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
policyColNames.addElement("Id");
policyColNames.addElement("Defaults");
policyColNames.addElement("Constraints");
- Vector policyData = new Vector();
+ Vector policyData = new Vector();
Vector policyRow = new Vector();
policyRow.addElement("p1");
policyRow.addElement("p1");
@@ -257,11 +257,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mPolicyDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", null, this);
JPanel buttonPanel = createUserButtonPanel(mPolicyAdd,
mPolicyDelete, mPolicyEdit);
- JPanel lpanel = createListPanel(mPolicyTable, buttonPanel,
+ JPanel lpanel = createListPanel(mPolicyTable, buttonPanel,
policyColNames, policyData);
Vector inputColNames = new Vector();
- inputColNames.addElement("Id");
+ inputColNames.addElement("Id");
inputColNames.addElement("Inputs");
Vector inputData = new Vector();
Vector inputRow = new Vector();
@@ -276,7 +276,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mInputDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE", null, this);
JPanel buttonPanel1 = createUserButtonPanel(mInputAdd,
mInputDelete, mInputEdit);
- JPanel lpanel1 = createListPanel(mInputTable, buttonPanel1,
+ JPanel lpanel1 = createListPanel(mInputTable, buttonPanel1,
inputColNames, inputData);
Vector outputColNames = new Vector();
@@ -292,11 +292,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mOutputTable = new JTable(model2);
mOutputEdit = CMSAdminUtil.makeJButton(mResource, PREFIX, "EDIT", null, this);
mOutputAdd = CMSAdminUtil.makeJButton(mResource, PREFIX, "ADD", null, this);
- mOutputDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE",
+ mOutputDelete = CMSAdminUtil.makeJButton(mResource, PREFIX, "DELETE",
null , this);
JPanel buttonPanel2 = createUserButtonPanel(mOutputAdd,
mOutputDelete, mOutputEdit);
- JPanel lpanel2 = createListPanel(mOutputTable, buttonPanel2,
+ JPanel lpanel2 = createListPanel(mOutputTable, buttonPanel2,
outputColNames, outputData);
// JPanel lpanel2 = createOutputPanel();
@@ -377,11 +377,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
return null;
}
- public JPanel createListPanel(JTable table, JPanel buttonPanel,
+ public JPanel createListPanel(JTable table, JPanel buttonPanel,
Vector column, Vector datav)
{
Vector colNames = column;
- Vector data = datav;
+ Vector data = datav;
JPanel listPanel = new JPanel();
GridBagLayout gb = new GridBagLayout();
@@ -448,7 +448,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
if (evt.getSource().equals(mPolicyAdd)) {
String profileId = mPluginName.getText();
- Debug.println("Add Policy");
+ Debug.println("Add Policy");
ProfilePolicySelectionDialog dialog =
new ProfilePolicySelectionDialog(mDefSetId, profileId,
"PROFILEPOLICYSELDIALOG",
@@ -456,15 +456,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mAdminConnection,
DestDef.DEST_REGISTRY_ADMIN, mDest);
- dialog.setModel(mModel);
- dialog.setDisplay();
- dialog.showDialog();
+ dialog.setModel(mModel);
+ dialog.setDisplay();
+ dialog.showDialog();
refresh();
}
if (evt.getSource().equals(mInputAdd)) {
String profileId = mPluginName.getText();
- Debug.println("Add Input");
+ Debug.println("Add Input");
ProfileNonPolicySelDialog dialog =
new ProfileNonPolicySelDialog(profileId,
"PROFILEINPUTSELDIALOG", mModel.getFrame(),
@@ -491,11 +491,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
}
if (evt.getSource().equals(mPolicyDelete)) {
- JTable table = getTable();
- if (table.getSelectedRowCount() <= 0) {
+ JTable table = getTable();
+ if (table.getSelectedRowCount() <= 0) {
String msg = mResource.getString(
PREFIX+"_DIALOG_NOPOLICY_MESSAGE");
- CMSAdminUtil.showErrorDialog(mModel.getFrame(),
+ CMSAdminUtil.showErrorDialog(mModel.getFrame(),
mResource, msg, CMSAdminUtil.ERROR_MESSAGE);
return;
}
@@ -507,8 +507,8 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
table.getValueAt(table.getSelectedRow(), 1);
try {
deletePolicy(mPluginName.getText().trim(),policyId);
-
- ProfileEditDataModel model =
+
+ ProfileEditDataModel model =
(ProfileEditDataModel)table.getModel();
model.removeRow(table.getSelectedRow());
table.invalidate();
@@ -587,21 +587,21 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
}
}
- if (evt.getSource().equals(mPolicyEdit)) {
+ if (evt.getSource().equals(mPolicyEdit)) {
JTable table = getTable();
// pick selected entry
- if (table.getSelectedRowCount() <= 0) {
- CMSAdminUtil.showErrorDialog(mModel.getFrame(),
- mResource,
- "You must select a policy first",
+ if (table.getSelectedRowCount() <= 0) {
+ CMSAdminUtil.showErrorDialog(mModel.getFrame(),
+ mResource,
+ "You must select a policy first",
CMSAdminUtil.ERROR_MESSAGE);
return;
}
String policyId = (String)
- table.getValueAt(table.getSelectedRow(), 0) + ":" +
+ table.getValueAt(table.getSelectedRow(), 0) + ":" +
table.getValueAt(table.getSelectedRow(), 1);
- Debug.println("Edit");
+ Debug.println("Edit");
NameValuePairs nvp = new NameValuePairs();
ProfilePolicyEditDialog dialog =
new ProfilePolicyEditDialog(nvp,
@@ -612,8 +612,8 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
dialog.setModel(mModel);
String name = mPluginName.getText() + ";" + policyId;
- Debug.println(" XXXX name=" + name);
- dialog.showDialog(null, name);
+ Debug.println(" XXXX name=" + name);
+ dialog.showDialog(null, name);
}
if (evt.getSource().equals(mInputEdit)) {
@@ -635,7 +635,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
new ProfileNonPolicyNewDialog(nvp,
mModel.getFrame(),
mAdminConnection,
- //DestDef.DEST_CA_PROFILE_ADMIN,
+ //DestDef.DEST_CA_PROFILE_ADMIN,
mDest,
ScopeDef.SC_PROFILE_INPUT_CONFIG, false);
dialog.setModel(mModel);
@@ -678,7 +678,7 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
NameValuePairs nvp = new NameValuePairs();
try {
- if (mModel != null)
+ if (mModel != null)
mModel.progressStart();
String instanceName = mPluginName.getText();
@@ -690,15 +690,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
// nvp.add("config", mConfigField.getText());
/*
- // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
+ // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
ScopeDef.SC_PROFILE_RULES, instanceName, nvp);
*/
- //DestDef.DEST_CA_PROFILE_ADMIN,
+ //DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.modify(mDest,
ScopeDef.SC_PROFILE_RULES, instanceName, nvp);
mIsOK = true;
- if (mModel != null)
+ if (mModel != null)
mModel.progressStop();
this.dispose();
} catch (EAdminException ex) {
@@ -712,9 +712,9 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
this.dispose();
}
- }
+ }
- private void deletePolicy(String profileId, String policyId)
+ private void deletePolicy(String profileId, String policyId)
throws EAdminException{
NameValuePairs nvps = new NameValuePairs();
nvps.put("POLICYID", policyId);
@@ -754,23 +754,23 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mModel.progressStart();
// retrieve profile information
- NameValuePairs response = null;
- NameValuePairs request = new NameValuePairs();
+ NameValuePairs response = null;
+ NameValuePairs request = new NameValuePairs();
try {
//response = mAdminConnection.read(DestDef.DEST_CA_PROFILE_ADMIN,
response = mAdminConnection.read(mDest,
ScopeDef.SC_PROFILE_RULES,
name, request);
- } catch (EAdminException e) {
-// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
- mModel.progressStop();
- }
+ } catch (EAdminException e) {
+// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
+ mModel.progressStop();
+ }
mModel.progressStop();
String enable = response.get("enable");
if (response != null) {
- mPluginName.setEnabled(false);
+ mPluginName.setEnabled(false);
mPluginName.setBackground(getBackground());
mPluginName.setText(name);
mNameField.setText(response.get("name"));
@@ -801,28 +801,28 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mOutputDelete.setEnabled(false);
}
}
-
+
private void setProfileOtherInfo(String name) {
if (mModel != null)
mModel.progressStart();
JTable table = getTable();
NameValuePairs request = new NameValuePairs();
- NameValuePairs response = null;
+ NameValuePairs response = null;
if (table == mPolicyTable) {
try {
response = mAdminConnection.read(
mDest,
ScopeDef.SC_PROFILE_POLICIES, name, request);
} catch (EAdminException e) {
- CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
- e.toString(), CMSAdminUtil.ERROR_MESSAGE);
+ CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
+ e.toString(), CMSAdminUtil.ERROR_MESSAGE);
if (mModel != null)
- mModel.progressStop();
+ mModel.progressStop();
return;
}
if (mModel != null)
- mModel.progressStop();
+ mModel.progressStop();
if (response != null) {
populatePolicies(response, table);
}
@@ -832,15 +832,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mDest,
ScopeDef.SC_PROFILE_INPUT, name, request);
} catch (EAdminException e) {
- CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
- e.toString(), CMSAdminUtil.ERROR_MESSAGE);
+ CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
+ e.toString(), CMSAdminUtil.ERROR_MESSAGE);
if (mModel != null)
- mModel.progressStop();
+ mModel.progressStop();
return;
}
if (mModel != null)
- mModel.progressStop();
+ mModel.progressStop();
if (response != null) {
populateNonPolicy(response, table);
}
@@ -850,15 +850,15 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
mDest,
ScopeDef.SC_PROFILE_OUTPUT, name, request);
} catch (EAdminException e) {
- CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
- e.toString(), CMSAdminUtil.ERROR_MESSAGE);
+ CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
+ e.toString(), CMSAdminUtil.ERROR_MESSAGE);
if (mModel != null)
- mModel.progressStop();
+ mModel.progressStop();
return;
}
if (mModel != null)
- mModel.progressStop();
+ mModel.progressStop();
if (response != null) {
populateNonPolicy(response, table);
}
@@ -885,11 +885,11 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
String def = st.nextToken();
String con = st.nextToken();
Vector<String> row = new Vector<String>();
-
+
StringTokenizer st1 = new StringTokenizer(entry, ":");
String setId = st1.nextToken();
String id = st1.nextToken();
-
+
if (mDefSetId == null) {
mDefSetId = setId;
}
@@ -928,4 +928,4 @@ public class ProfileEditDialog extends CMSBaseConfigDialog
model.setInfo(d, colNames);
table.setModel(model);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
index eee2531cf..cdaf6d978 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplDataModel.java
@@ -41,7 +41,7 @@ public class ProfileImplDataModel extends CMSContentTableModel
public static final String IMPL_CLASS = "CLASS";
public static final String IMPL_TYPE = "TYPE";
public static final String IMPL_DESC = "DESC";
-
+
private static String[] mColumns = {POLICY_IMPL, IMPL_TYPE, CLASSNAME};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
index c7d28dd07..2e1f5e27f 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
@@ -44,19 +44,19 @@ public class ProfileImplTab extends CMSBaseUGTab {
private static final String IMPL_TYPE = ProfileImplDataModel.IMPL_TYPE;
private static final String IMPL_CLASS = ProfileImplDataModel.IMPL_CLASS;
private static final String IMPL_DESC = ProfileImplDataModel.IMPL_DESC;
-
+
private static final String PANEL_NAME = "PROFILEIMPL";
private static final String DIALOG_PREFIX = "PROFILEREGISTERDIALOG";
-
+
private AdminConnection mConnection;
private String mDestination;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected ProfileImplDataModel mDataModel; //table model
protected ProfileRegisterDialog mEditor=null; //keep single copy
protected ViewDialog mViewer=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String HELPINDEX = "configuration-certificateprofiles";
@@ -107,13 +107,13 @@ public class ProfileImplTab extends CMSBaseUGTab {
if(mTable.getSelectedRow()< 0)
return;
NameValuePairs obj = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
if (mViewer==null)
mViewer = new ViewDialog(mModel.getFrame());
mViewer.showDialog(obj.get(IMPL_NAME),
obj.get(IMPL_CLASS),
obj.get(IMPL_DESC));
- }
+ }
if (e.getSource().equals(mHelp)) {
helpCallback();
}
@@ -125,7 +125,7 @@ public class ProfileImplTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -134,8 +134,8 @@ public class ProfileImplTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -219,7 +219,7 @@ public class ProfileImplTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -228,24 +228,24 @@ public class ProfileImplTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response = new NameValuePairs();
NameValuePairs response1;
@@ -342,18 +342,18 @@ public class ProfileImplTab extends CMSBaseUGTab {
obj.put(IMPL_DESC, value.substring(x + 1, x_end));
data.put(entry,obj);
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
mDataModel.processData(data.get(vals[y]));
}
-
+
data.clear();
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
index 6dbc1dceb..f06cea67b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileInstanceTab.java
@@ -42,7 +42,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "PROFILERULE";
-
+
protected JButton mOrder;
private final static String HELPINDEX = "configuration-certificateprofiles";
private ResourceBundle mResource;
@@ -59,7 +59,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
mScope = ScopeDef.SC_POLICY_RULES;
mDest = dest;
RULE_NAME = PolicyRuleDataModel.RULE_NAME;
- RULE_STAT = PolicyRuleDataModel.RULE_STAT;
+ RULE_STAT = PolicyRuleDataModel.RULE_STAT;
mResource = ResourceBundle.getBundle(
CMSAdminResources.class.getName());
@@ -71,7 +71,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new ProfileEditDialog(nvp,
parent,
@@ -84,7 +84,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new ProfileConfigDialog(nvp,
@@ -98,7 +98,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType
- )
+ )
{
return new ProfilePluginSelectionDialog(parent,conn,DestDef.DEST_REGISTRY_ADMIN, dest, pluginType);
}
@@ -107,9 +107,9 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(mEdit) || e.getSource().equals(mDelete)) {
- if(mTable.getSelectedRow()< 0)
- return;
- NameValuePairs data = (NameValuePairs)
+ if(mTable.getSelectedRow()< 0)
+ return;
+ NameValuePairs data = (NameValuePairs)
mDataModel.getObjectValueAt(mTable.getSelectedRow());
// dont check enable and disable here. We want to
// view profile even though it is enabled
@@ -121,12 +121,12 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
public void moreActionPerformed(ActionEvent e) {
if (e.getSource().equals(mOrder)) {
Debug.println("Order");
- PolicyRuleOrderDialog dialog =
- new PolicyRuleOrderDialog(mModel.getFrame(),
+ PolicyRuleOrderDialog dialog =
+ new PolicyRuleOrderDialog(mModel.getFrame(),
mConnection, mDestination);
- dialog.showDialog(mDataModel.getRules());
+ dialog.showDialog(mDataModel.getRules());
refresh();
- }
+ }
}
/**
@@ -148,7 +148,7 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
//set buttons
protected void setButtons() {
super.setButtons();
-
+
if (mDataModel.getRowCount()<=0) {
mOrder.setEnabled(false);
}
@@ -156,6 +156,6 @@ public class ProfileInstanceTab extends CMSPluginInstanceTab {
mOrder.setEnabled(true);
}
}
-
-
+
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
index 2e4633046..bb5d05591 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileListDataModel.java
@@ -37,7 +37,7 @@ import com.netscape.certsrv.common.*;
public class ProfileListDataModel extends DefaultListModel {
private Vector mObjectContainer = new Vector();
-
+
public Object getObjectValueAt(int row) {
return mObjectContainer.elementAt(row);
}
@@ -51,7 +51,7 @@ public class ProfileListDataModel extends DefaultListModel {
super.addElement(displayData);
mObjectContainer.addElement(extraData);
}
-
+
public void clear() {
super.clear();
mObjectContainer.clear();
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
index e597b242b..38b8d5664 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicyNewDialog.java
@@ -50,7 +50,7 @@ public class ProfileNonPolicyNewDialog extends CMSBaseConfigDialog
*==========================================================*/
public ProfileNonPolicyNewDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest, String scope, boolean new1) {
super(parent, dest);
@@ -59,7 +59,7 @@ public class ProfileNonPolicyNewDialog extends CMSBaseConfigDialog
mHelpToken = "configuration-certificateprofiles";
mImplName_token = Constants.PR_POLICY_IMPL_NAME;
mImplType = Constants.PR_EXT_PLUGIN_IMPLTYPE_POLICY;
- mIsNew = new1;
+ mIsNew = new1;
mScope = scope;
init(nvp,parent,conn,dest);
@@ -289,8 +289,8 @@ setLabelCellEditor(mTable, 1);
if (evt.getSource().equals(mOK)) {
try {
- if (mModel != null) {
- mModel.progressStart();
+ if (mModel != null) {
+ mModel.progressStart();
}
NameValuePairs nvp = new NameValuePairs();
@@ -312,21 +312,21 @@ setLabelCellEditor(mTable, 1);
if (mIsNew) {
String name = instanceName + ";" + id + ";" + mParamId;
- // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
+ // mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.add(mDest,
mScope, name, nvp);
//ScopeDef.SC_PROFILE_INPUT, name, nvp);
} else {
String name = instanceName + ";" + id;
- //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN,
+ //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.modify(mDest,
mScope, name, nvp);
//ScopeDef.SC_PROFILE_INPUT_CONFIG, name, nvp);
}
-
+
mIsOK = true;
- if (mModel != null) {
- mModel.progressStop();
+ if (mModel != null) {
+ mModel.progressStop();
}
this.dispose();
@@ -342,7 +342,7 @@ setLabelCellEditor(mTable, 1);
this.dispose();
}
- }
+ }
public void showDialog(NameValuePairs data, String profileId, String paramId) {
@@ -358,28 +358,28 @@ setLabelCellEditor(mTable, 1);
mModel.progressStart();
// retrieve profile information
- NameValuePairs response = null;
- NameValuePairs request = new NameValuePairs();
+ NameValuePairs response = null;
+ NameValuePairs request = new NameValuePairs();
try {
- if (mIsNew)
+ if (mIsNew)
response = mAdminConnection.read(DestDef.DEST_REGISTRY_ADMIN,
//ScopeDef.SC_PROFILE_INPUT,
mScope, paramId, request);
else
// response = mAdminConnection.read(DestDef.DEST_CA_PROFILE_ADMIN,
response = mAdminConnection.read(mDest,
- //ScopeDef.SC_PROFILE_INPUT_CONFIG,
+ //ScopeDef.SC_PROFILE_INPUT_CONFIG,
mScope, profileId+";"+mInputId, request);
- } catch (EAdminException e) {
-// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
- mModel.progressStop();
- }
+ } catch (EAdminException e) {
+// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
+ mModel.progressStop();
+ }
mModel.progressStop();
- Vector defcolNames = new Vector();
- defcolNames.addElement("Parameter");
- defcolNames.addElement("Value");
- Vector defdata = new Vector();
+ Vector defcolNames = new Vector();
+ defcolNames.addElement("Parameter");
+ defcolNames.addElement("Value");
+ Vector defdata = new Vector();
for (String entry : response.keySet()) {
entry = entry.trim();
@@ -397,7 +397,7 @@ setLabelCellEditor(mTable, 1);
syntaxVal = value.substring(start_pos+1, end_pos);
val = value.substring(end_pos+1);
- Vector row = new Vector();
+ Vector row = new Vector();
row.addElement(entry);
row.addElement(val);
defdata.addElement(row);
@@ -426,4 +426,4 @@ setLabelCellEditor(mTable, 1);
table.getColumnModel().getColumn(index).setCellEditor(
new DefaultCellEditor(new JTextField()));
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
index 8d97ffd13..99ec1abc1 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
@@ -74,9 +74,9 @@ public class ProfileNonPolicySelDialog extends JDialog
public ProfileNonPolicySelDialog (
String profileId,
- String prefix,
- JFrame parent,
- AdminConnection conn,
+ String prefix,
+ JFrame parent,
+ AdminConnection conn,
String dest, String extraDest, String scope)
{
this( profileId, prefix,
@@ -102,11 +102,11 @@ public class ProfileNonPolicySelDialog extends JDialog
*==========================================================*/
public ProfileNonPolicySelDialog(
String profileId,
- String prefix,
- JFrame parent,
- AdminConnection conn,
+ String prefix,
+ JFrame parent,
+ AdminConnection conn,
String dest, String extraDest, String scope,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(parent,true);
mProfileId = profileId;
@@ -172,7 +172,7 @@ public class ProfileNonPolicySelDialog extends JDialog
scope = ScopeDef.SC_PROFILE_OUTPUT;
}
- ProfileNonPolicyNewDialog dialog =
+ ProfileNonPolicyNewDialog dialog =
new ProfileNonPolicyNewDialog(
response,
mParentFrame,
@@ -182,7 +182,7 @@ public class ProfileNonPolicySelDialog extends JDialog
dialog.setModel(mModel);
String name = ((JLabel)mListModel.elementAt(mList.getSelectedIndex())).getText();
-
+
dialog.showDialog(response, mProfileId, getID(name));
if(!dialog.isOK()) {
@@ -272,7 +272,7 @@ public class ProfileNonPolicySelDialog extends JDialog
mListPanel.setLayout(gb);
//content.setBorder(CMSAdminUtil.makeEtchedBorder());
- JLabel label = CMSAdminUtil.makeJLabel(mResource, mPrefix,
+ JLabel label = CMSAdminUtil.makeJLabel(mResource, mPrefix,
"SELECT", null);
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
@@ -359,9 +359,9 @@ public class ProfileNonPolicySelDialog extends JDialog
// vals[i++] = ((String)e.nextElement()).trim();
Debug.println("PluginSelectionDialog::update() - adding '"+vals[i-1]+"'");
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
try {
mListModel.addElement(new JLabel(vals[y], JLabel.LEFT));
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
index ec3bb4c7c..2ed1f8bbd 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePluginSelectionDialog.java
@@ -45,9 +45,9 @@ public class ProfilePluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public ProfilePluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
mScope = ScopeDef.SC_PROFILE_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
index 34b95c0f1..c37a8e55a 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyEditDialog.java
@@ -50,7 +50,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
*==========================================================*/
public ProfilePolicyEditDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -300,7 +300,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
// setLabelCellRenderer(mDefaultTable,1);
//setLabelCellEditor(mDefaultTable, 1);
mDefaultTable.setDefaultRenderer(JComponent.class, new JComponentCellRenderer());
- mDefaultTable.setDefaultEditor(JComponent.class,
+ mDefaultTable.setDefaultEditor(JComponent.class,
new ProfileComponentCellEditor());
CMSAdminUtil.resetGBC(gbc);
@@ -363,7 +363,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
mConstraintTable.addMouseListener(this);
// setLabelCellRenderer(mConstraintTable,0);
mConstraintTable.setDefaultRenderer(JComponent.class, new JComponentCellRenderer());
- mConstraintTable.setDefaultEditor(JComponent.class,
+ mConstraintTable.setDefaultEditor(JComponent.class,
new ProfileComponentCellEditor());
CMSAdminUtil.resetGBC(gbc);
@@ -443,7 +443,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
String policyId = mDescField.getText() + ":" + mIdField.getText();
String name = instanceName + ";" + policyId;
-
+
/*
nvp.add("impl", mImplName.getText());
nvp.add("name", mNameField.getText());
@@ -464,7 +464,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
}
- //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN,
+ //mAdminConnection.modify(DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.modify(mDest,
ScopeDef.SC_PROFILE_DEFAULT_POLICY, name, nvp);
@@ -486,7 +486,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
nvp.put(name1, val);
}
instanceName = mPluginName.getText();
-//DestDef.DEST_CA_PROFILE_ADMIN,
+//DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.modify(mDest,
ScopeDef.SC_PROFILE_CONSTRAINT_POLICY, name, nvp);
@@ -503,7 +503,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
this.dispose();
}
- }
+ }
private String getHelpDescription(String value) {
int start_pos = value.indexOf(';');
@@ -562,32 +562,32 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
String pid = st1.nextToken();
// retrieve profile information
- NameValuePairs response = null;
- NameValuePairs request = new NameValuePairs();
+ NameValuePairs response = null;
+ NameValuePairs request = new NameValuePairs();
try {
//response = mAdminConnection.read(DestDef.DEST_CA_PROFILE_ADMIN,
response = mAdminConnection.read(mDest,
ScopeDef.SC_PROFILE_DEFAULT_POLICY,
name, request);
- } catch (EAdminException e) {
-// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
- mModel.progressStop();
- }
+ } catch (EAdminException e) {
+// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
+ mModel.progressStop();
+ }
mModel.progressStop();
- Vector defcolNames = new Vector();
- defcolNames.addElement("Parameter");
- defcolNames.addElement("Value");
- Vector defdata = new Vector();
+ Vector defcolNames = new Vector();
+ defcolNames.addElement("Parameter");
+ defcolNames.addElement("Value");
+ Vector defdata = new Vector();
for (String entry : response.keySet()) {
entry = entry.trim();
String value = response.get(entry);
Debug.println("ProfilePolicyEditDialog entry= "+entry);
- Debug.println("ProfilePolicyEditDialog value= "+value);
+ Debug.println("ProfilePolicyEditDialog value= "+value);
Object obj = getComponent(value);
- Vector row = new Vector();
+ Vector row = new Vector();
JLabel label = new JLabel(entry);
((Component)obj).addFocusListener(this);
mHelpDesc.put(obj, getHelpDescription(value));
@@ -620,22 +620,22 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
ScopeDef.SC_PROFILE_CONSTRAINT_POLICY,
name,
request);
- } catch (EAdminException e) {
-// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
- mModel.progressStop();
- }
- mModel.progressStop();
+ } catch (EAdminException e) {
+// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
+ mModel.progressStop();
+ }
+ mModel.progressStop();
- Vector colNames = new Vector();
- colNames.addElement("Parameter");
- colNames.addElement("Value");
- Vector d = new Vector();
+ Vector colNames = new Vector();
+ colNames.addElement("Parameter");
+ colNames.addElement("Value");
+ Vector d = new Vector();
for (String entry : response.keySet()) {
entry = entry.trim();
String value = response.get(entry);
Debug.println("entry= "+entry);
- Debug.println("value= "+value);
+ Debug.println("value= "+value);
Object obj = getComponent(value);
Vector row = new Vector();
@@ -649,7 +649,7 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
ProfilePolicyEditDataModel model = new ProfilePolicyEditDataModel();
model.setInfo(d, colNames);
mConstraintTable.setModel(model);
-
+
this.show();
}
@@ -668,8 +668,8 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
}
class JComponentCellRenderer implements TableCellRenderer {
- public Component getTableCellRendererComponent(JTable table,
- Object value, boolean isSelected, boolean hasFocus, int row,
+ public Component getTableCellRendererComponent(JTable table,
+ Object value, boolean isSelected, boolean hasFocus, int row,
int column) {
return (JComponent)value;
}
@@ -695,4 +695,4 @@ public class ProfilePolicyEditDialog extends CMSBaseConfigDialog
Debug.println("focusLost");
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
index 941917808..98706dfcb 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicyNewDialog.java
@@ -53,7 +53,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
*==========================================================*/
public ProfilePolicyNewDialog(String defSetId, NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -461,10 +461,10 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
// create policy
String policyId = policySetStr + ":" + policyIDStr;
String name = instanceName + ";" + policyId + ";" + mDefaultId + ";" + mConstraintId;
- //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
+ //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.add(mDest,
ScopeDef.SC_PROFILE_POLICIES, name, nvp);
-
+
/*
nvp.add("impl", mImplName.getText());
nvp.add("name", mNameField.getText());
@@ -485,7 +485,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
}
- //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
+ //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.add(mDest,
ScopeDef.SC_PROFILE_DEFAULT_POLICY, name, nvp);
@@ -506,7 +506,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
nvp.put(name1, val);
}
instanceName = mPluginName.getText();
- //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
+ //mAdminConnection.add(DestDef.DEST_CA_PROFILE_ADMIN,
mAdminConnection.add(mDest,
ScopeDef.SC_PROFILE_CONSTRAINT_POLICY, name, nvp);
@@ -523,7 +523,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
this.dispose();
}
- }
+ }
public void showDialog(NameValuePairs data, String name) {
@@ -539,29 +539,29 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
mConstraintId = conId;
// retrieve profile information
- NameValuePairs response = null;
- NameValuePairs request = new NameValuePairs();
+ NameValuePairs response = null;
+ NameValuePairs request = new NameValuePairs();
try {
name = profileId + ";" + defId;
response = mAdminConnection.read(DestDef.DEST_REGISTRY_ADMIN,
ScopeDef.SC_PROFILE_DEFAULT_POLICY,
defId, request);
- } catch (EAdminException e) {
-// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
- mModel.progressStop();
- }
+ } catch (EAdminException e) {
+// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
+ mModel.progressStop();
+ }
mModel.progressStop();
- Vector defcolNames = new Vector();
- defcolNames.addElement("Parameter");
- defcolNames.addElement("Value");
- Vector defdata = new Vector();
+ Vector defcolNames = new Vector();
+ defcolNames.addElement("Parameter");
+ defcolNames.addElement("Value");
+ Vector defdata = new Vector();
for (String entry : response.keySet()) {
entry = entry.trim();
String value = response.get(entry);
Debug.println("entry= "+entry);
- Debug.println("value= "+value);
+ Debug.println("value= "+value);
Object obj = getComponent(value);
Vector row = new Vector();
@@ -591,22 +591,22 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
ScopeDef.SC_PROFILE_CONSTRAINT_POLICY,
conId,
request);
- } catch (EAdminException e) {
-// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
- mModel.progressStop();
- }
- mModel.progressStop();
+ } catch (EAdminException e) {
+// CMSAdminUtil.showErrorDialog(mParentFrame, mResource, e.toString());
+ mModel.progressStop();
+ }
+ mModel.progressStop();
- Vector colNames = new Vector();
- colNames.addElement("Parameter");
- colNames.addElement("Value");
- Vector d = new Vector();
+ Vector colNames = new Vector();
+ colNames.addElement("Parameter");
+ colNames.addElement("Value");
+ Vector d = new Vector();
for (String entry : response.keySet()) {
entry = entry.trim();
String value = response.get(entry);
Debug.println("entry= "+entry);
- Debug.println("value= "+value);
+ Debug.println("value= "+value);
Object obj = getComponent(value);
Vector row = new Vector();
@@ -619,7 +619,7 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
ProfilePolicyEditDataModel model = new ProfilePolicyEditDataModel();
model.setInfo(d, colNames);
mConstraintTable.setModel(model);
-
+
String desc = mDescField.getText();
if (desc == null || desc.equals("")) {
if (mDefSetId != null) {
@@ -648,11 +648,11 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
}
private Object getComponent(String value) {
- int start_pos = value.indexOf(';');
- int end_pos = value.lastIndexOf(';');
+ int start_pos = value.indexOf(';');
+ int end_pos = value.lastIndexOf(';');
int end1_pos = value.lastIndexOf(';',end_pos-1);
- String syntax = null;
- String syntaxVal = null;
+ String syntax = null;
+ String syntaxVal = null;
String v = null;
syntax = value.substring(0,start_pos);
@@ -711,4 +711,4 @@ public class ProfilePolicyNewDialog extends CMSBaseConfigDialog
public void focusLost(FocusEvent f) {
Debug.println("focusLost");
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
index 44fe9886b..e601fbb9f 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
@@ -69,8 +69,8 @@ public class ProfilePolicySelectionDialog extends JDialog
String profileId,
String prefix,
JFrame parent,
- AdminConnection conn,
- String dest)
+ AdminConnection conn,
+ String dest)
{
this(defSetId, profileId, prefix, parent, conn, dest, null, null);
}
@@ -78,9 +78,9 @@ public class ProfilePolicySelectionDialog extends JDialog
public ProfilePolicySelectionDialog(
String defSetId,
String profileId,
- String prefix,
- JFrame parent,
- AdminConnection conn,
+ String prefix,
+ JFrame parent,
+ AdminConnection conn,
String dest, String extraDest)
{
this(defSetId, profileId, prefix,
@@ -100,18 +100,18 @@ public class ProfilePolicySelectionDialog extends JDialog
CMSPluginInstanceTab pluginType) {
this(defSetId, profileId, prefix, parent, conn, dest, null, pluginType);
}
-
+
/*==========================================================
* constructors
*==========================================================*/
public ProfilePolicySelectionDialog(
String defSetId,
String profileId,
- String prefix,
- JFrame parent,
- AdminConnection conn,
+ String prefix,
+ JFrame parent,
+ AdminConnection conn,
String dest, String extraDest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(parent,true);
mDefSetId = defSetId;
@@ -198,7 +198,7 @@ public class ProfilePolicySelectionDialog extends JDialog
String id = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText();
response.add(Constants.PR_POLICY_IMPL_NAME,id);
*/
- ProfilePolicyNewDialog dialog =
+ ProfilePolicyNewDialog dialog =
new ProfilePolicyNewDialog(
mDefSetId,
response,
@@ -213,8 +213,8 @@ public class ProfilePolicySelectionDialog extends JDialog
String defaultName = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText();
String conName = ((JLabel)mConstraintModel.elementAt(mConstraintList.getSelectedIndex())).getText();
-
- String namex = mProfileId + ";" + getID(defaultName, mDefaultData) +
+
+ String namex = mProfileId + ";" + getID(defaultName, mDefaultData) +
";" + getID(conName, mConstraintData);
dialog.showDialog(response,namex);
@@ -263,8 +263,8 @@ public class ProfilePolicySelectionDialog extends JDialog
GridBagConstraints gbc = new GridBagConstraints();
center.setLayout(gb);
- // default content panel
- mDefaultLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix,
+ // default content panel
+ mDefaultLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix,
"DEFAULTNAME", null);
center.add(mDefaultLabel);
@@ -279,7 +279,7 @@ public class ProfilePolicySelectionDialog extends JDialog
center.add(content);
// constraint content panel
- mConstraintLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix,
+ mConstraintLabel = CMSAdminUtil.makeJLabel(mResource, mPrefix,
"CONSTRAINTNAME", null);
center.add(mConstraintLabel);
@@ -408,10 +408,10 @@ public class ProfilePolicySelectionDialog extends JDialog
return;
String name = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText();
NameValuePairs response=null;
-
+
try {
- response = mConnection.read(mDestination,
- ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES,
+ response = mConnection.read(mDestination,
+ ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES,
getID(name, mDefaultData), new NameValuePairs());
Debug.println(response.toString());
} catch (Exception ex) {
@@ -424,7 +424,7 @@ public class ProfilePolicySelectionDialog extends JDialog
mConstraintList.invalidate();
mConstraintList.validate();
repaint();
- }
+ }
}
//=================================================
@@ -432,7 +432,7 @@ public class ProfilePolicySelectionDialog extends JDialog
//=================================================
//save order information to the server
- protected boolean update(String scope, DefaultListModel model,
+ protected boolean update(String scope, DefaultListModel model,
Hashtable data) {
NameValuePairs response;
@@ -471,18 +471,18 @@ public class ProfilePolicySelectionDialog extends JDialog
data.put(name, friendlyName);
Debug.println("PluginSelectionDialog::update() - adding '"+vals[i-1]+"'");
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
try {
- model.addElement(new JLabel(vals[y],
+ model.addElement(new JLabel(vals[y],
CMSAdminUtil.getImage(mImageName), JLabel.LEFT));
}
catch (Exception ex) {
Debug.println("PluginSelectionDialog could not get image for '"+
mImageName+"'. Adding without image");
- model.addElement(new JLabel(vals[y],
+ model.addElement(new JLabel(vals[y],
JLabel.LEFT));
}
}
@@ -492,15 +492,15 @@ public class ProfilePolicySelectionDialog extends JDialog
protected NameValuePairs getDefaultConfig() throws EAdminException {
String name = ((JLabel)mDefaultModel.elementAt(mDefaultList.getSelectedIndex())).getText();
NameValuePairs response;
- response = mConnection.read(mDestination,
- ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES, getID(name.trim(), mDefaultData),
+ response = mConnection.read(mDestination,
+ ScopeDef.SC_SUPPORTED_CONSTRAINTPOLICIES, getID(name.trim(), mDefaultData),
new NameValuePairs());
Debug.println(response.toString());
return response;
}
-
+
private String getID(String name, Hashtable t) {
Enumeration keys = t.keys();
while (keys.hasMoreElements()) {
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
index c576adbe6..912ea1944 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileRegisterDialog.java
@@ -124,7 +124,7 @@ public class ProfileRegisterDialog extends JDialog
}
if (evt.getSource().equals(mOK)) {
-
+
/* REPLACED BY PROACTIVE ENFORCEMENT
if (mNameField.getText().trim().equals("")) {
CMSAdminUtil.showMessageDialog(mParentFrame, mResource, mPrefix,
@@ -158,15 +158,15 @@ public class ProfileRegisterDialog extends JDialog
public void insertUpdate(DocumentEvent e) {
setButtons();
}
-
+
public void removeUpdate(DocumentEvent e){
setButtons();
}
-
+
public void changedUpdate(DocumentEvent e){
setButtons();
}
-
+
//==== MOUSELISTENER ======================
public void mouseClicked(MouseEvent e) {
setButtons();
@@ -176,13 +176,13 @@ public class ProfileRegisterDialog extends JDialog
public void mouseReleased(MouseEvent e) {}
public void mouseEntered(MouseEvent e) {}
public void mouseExited(MouseEvent e) {
- setButtons();
+ setButtons();
}
-
+
/*==========================================================
* protected methods
- *==========================================================*/
-
+ *==========================================================*/
+
protected void setDisplay() {
getContentPane().setLayout(new BorderLayout());
JPanel center = new JPanel();
@@ -215,18 +215,18 @@ public class ProfileRegisterDialog extends JDialog
/*==========================================================
* private methods
- *==========================================================*/
+ *==========================================================*/
//set arrow buttons
private void setButtons() {
if ( (mNameField.getText().trim().equals("")) ||
(mClassField.getText().trim().equals("")) ) {
- mOK.setEnabled(false);
+ mOK.setEnabled(false);
} else {
- mOK.setEnabled(true);
+ mOK.setEnabled(true);
}
- }
-
+ }
+
private JPanel makeActionPane() {
mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this);
mOK.setEnabled(false);
@@ -254,7 +254,7 @@ public class ProfileRegisterDialog extends JDialog
JLabel label2 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "CLASS", null);
mClassField = new JTextField();
mClassField.getDocument().addDocumentListener(this);
- mClassField.addMouseListener(this);
+ mClassField.addMouseListener(this);
CMSAdminUtil.addEntryField(content, label2, mClassField, gbc);
CMSAdminUtil.resetGBC(gbc);
@@ -262,7 +262,7 @@ public class ProfileRegisterDialog extends JDialog
JLabel label3 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "TYPE", null);
mTypeField = new JTextField();
mTypeField.getDocument().addDocumentListener(this);
- mTypeField.addMouseListener(this);
+ mTypeField.addMouseListener(this);
CMSAdminUtil.addEntryField(content, label3, mTypeField, gbc);
CMSAdminUtil.resetGBC(gbc);
@@ -270,9 +270,9 @@ public class ProfileRegisterDialog extends JDialog
JLabel label4 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "DESC", null);
mDescField = new JTextField();
mDescField.getDocument().addDocumentListener(this);
- mDescField.addMouseListener(this);
+ mDescField.addMouseListener(this);
CMSAdminUtil.addEntryField(content, label4, mDescField, gbc);
-
+
return content;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
index 7a3ba2827..ac4814fc3 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ProfileRuleDataModel.java
@@ -54,7 +54,7 @@ public class ProfileRuleDataModel extends CMSRuleDataModel
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
- v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL"));
+ v.addElement(mResource.getString("POLICYRULE_LABEL_ENABLED_LABEL"));
} else {
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
index 90d67ba9e..4c2497c67 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherConfigDialog.java
@@ -46,7 +46,7 @@ public class PublisherConfigDialog extends CMSBaseConfigDialog
*==========================================================*/
public PublisherConfigDialog(NameValuePairs nvp,
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest) {
super(parent, dest);
@@ -61,4 +61,4 @@ public class PublisherConfigDialog extends CMSBaseConfigDialog
init(nvp,parent,conn,dest);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
index aefa4b1cc..575f731d6 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplDataModel.java
@@ -40,7 +40,7 @@ public class PublisherImplDataModel extends CMSContentTableModel
public static final String IMPL_NAME = "NAME";
public static final String IMPL_CLASS = "CLASS";
public static final String IMPL_DESC = "DESC";
-
+
private static String[] mColumns = {PUBLISHER_IMPL, CLASSNAME};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
index 79fedfe5e..dd38c6a36 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
@@ -43,19 +43,19 @@ public class PublisherImplTab extends CMSBaseUGTab {
private static final String IMPL_NAME = PublisherImplDataModel.IMPL_NAME;
private static final String IMPL_CLASS = PublisherImplDataModel.IMPL_CLASS;
private static final String IMPL_DESC = PublisherImplDataModel.IMPL_DESC;
-
+
private static final String PANEL_NAME = "PUBLISHERIMPL";
private static final String DIALOG_PREFIX = "PUBLISHERREGISTERDIALOG";
-
+
private AdminConnection mConnection;
private String mDestination;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected PublisherImplDataModel mDataModel; //table model
protected PublisherRegisterDialog mEditor=null; //keep single copy
protected ViewDialog mViewer=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String RAHELPINDEX = "configuration-ra-publisherplugin-help";
private final static String CAHELPINDEX = "configuration-ca-publisherplugin-help";
@@ -111,13 +111,13 @@ public class PublisherImplTab extends CMSBaseUGTab {
if(mTable.getSelectedRow()< 0)
return;
NameValuePairs obj = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
if (mViewer==null)
mViewer = new ViewDialog(mModel.getFrame());
mViewer.showDialog(obj.get(IMPL_NAME),
obj.get(IMPL_CLASS),
obj.get(IMPL_DESC));
- }
+ }
if (e.getSource().equals(mHelp)) {
helpCallback();
}
@@ -129,7 +129,7 @@ public class PublisherImplTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -138,8 +138,8 @@ public class PublisherImplTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -223,7 +223,7 @@ public class PublisherImplTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -232,24 +232,24 @@ public class PublisherImplTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
@@ -281,18 +281,18 @@ public class PublisherImplTab extends CMSBaseUGTab {
obj.put(IMPL_DESC, value.substring(x + 1));
data.put(entry,obj);
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
mDataModel.processData(data.get(vals[y]));
}
-
+
data.clear();
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
index e9d3bdbb0..d6b7908cd 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherInstanceTab.java
@@ -42,7 +42,7 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "PUBLISHERRULE";
-
+
private final static String RAHELPINDEX = "configuration-ra-publisherinstances-help";
private final static String CAHELPINDEX = "configuration-ca-publisherinstances-help";
private final static String KRAHELPINDEX = "configuration-kra-publisherinstances-help";
@@ -58,9 +58,9 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab {
mDataModel = new PublisherRuleDataModel();
mScope = ScopeDef.SC_PUBLISHER_RULES;
RULE_NAME = PublisherRuleDataModel.RULE_NAME;
- RULE_STAT = PublisherRuleDataModel.RULE_STAT;
+ RULE_STAT = PublisherRuleDataModel.RULE_STAT;
- if (mDestination.equals(DestDef.DEST_RA_PUBLISHER_ADMIN))
+ if (mDestination.equals(DestDef.DEST_RA_PUBLISHER_ADMIN))
mHelpToken = RAHELPINDEX;
else
mHelpToken = CAHELPINDEX;
@@ -72,7 +72,7 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new PublisherConfigDialog(nvp,
@@ -86,7 +86,7 @@ public class PublisherInstanceTab extends CMSPluginInstanceTab {
AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType
- )
+ )
{
return new PublisherPluginSelectionDialog(parent,conn,dest,pluginType);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
index 536d9096f..4837295ca 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/PublisherPluginSelectionDialog.java
@@ -41,7 +41,7 @@ public class PublisherPluginSelectionDialog extends PluginSelectionDialog
* variables
*==========================================================*/
private static final String PREFIX = "PUBLISHERSELECTIONDIALOG";
- private static final String CAHELPINDEX =
+ private static final String CAHELPINDEX =
"configuration-ca-add-publisherrule-dbox-help";
private static final String RAHELPINDEX =
"configuration-ra-add-publisherrule-dbox-help";
@@ -51,9 +51,9 @@ public class PublisherPluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public PublisherPluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
mScope = ScopeDef.SC_PUBLISHER_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
index fe48419c7..51a1dece5 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RegisterDialog.java
@@ -114,7 +114,7 @@ public class RegisterDialog extends JDialog
}
if (evt.getSource().equals(mOK)) {
-
+
/* REPLACED BY PROACTIVE ENFORCEMENT
if (mNameField.getText().trim().equals("")) {
CMSAdminUtil.showMessageDialog(mParentFrame, mResource, mPrefix,
@@ -148,15 +148,15 @@ public class RegisterDialog extends JDialog
public void insertUpdate(DocumentEvent e) {
setButtons();
}
-
+
public void removeUpdate(DocumentEvent e){
setButtons();
}
-
+
public void changedUpdate(DocumentEvent e){
setButtons();
}
-
+
//==== MOUSELISTENER ======================
public void mouseClicked(MouseEvent e) {
setButtons();
@@ -166,13 +166,13 @@ public class RegisterDialog extends JDialog
public void mouseReleased(MouseEvent e) {}
public void mouseEntered(MouseEvent e) {}
public void mouseExited(MouseEvent e) {
- setButtons();
+ setButtons();
}
-
+
/*==========================================================
* protected methods
- *==========================================================*/
-
+ *==========================================================*/
+
protected void setDisplay() {
getContentPane().setLayout(new BorderLayout());
JPanel center = new JPanel();
@@ -205,18 +205,18 @@ public class RegisterDialog extends JDialog
/*==========================================================
* private methods
- *==========================================================*/
+ *==========================================================*/
//set arrow buttons
private void setButtons() {
if ( (mNameField.getText().trim().equals("")) ||
(mClassField.getText().trim().equals("")) ) {
- mOK.setEnabled(false);
+ mOK.setEnabled(false);
} else {
- mOK.setEnabled(true);
+ mOK.setEnabled(true);
}
- }
-
+ }
+
private JPanel makeActionPane() {
mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this);
mOK.setEnabled(false);
@@ -244,7 +244,7 @@ public class RegisterDialog extends JDialog
JLabel label2 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "CLASS", null);
mClassField = new JTextField();
mClassField.getDocument().addDocumentListener(this);
- mClassField.addMouseListener(this);
+ mClassField.addMouseListener(this);
CMSAdminUtil.addEntryField(content, label2, mClassField, gbc);
if (mType) {
@@ -253,10 +253,10 @@ public class RegisterDialog extends JDialog
JLabel label3 = CMSAdminUtil.makeJLabel(mResource, mPrefix, "TYPE", null);
mTypeField = new JTextField();
mTypeField.getDocument().addDocumentListener(this);
- mTypeField.addMouseListener(this);
+ mTypeField.addMouseListener(this);
CMSAdminUtil.addEntryField(content, label3, mTypeField, gbc);
}
-
+
return content;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
index 7f7cff092..0ce8c2ea4 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleConfigDialog.java
@@ -61,4 +61,4 @@ public class RuleConfigDialog extends CMSBaseConfigDialog
init(nvp,parent,conn,dest);
}
-}
+}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
index 86a4fa6d4..2337a698c 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleImplDataModel.java
@@ -40,7 +40,7 @@ public class RuleImplDataModel extends CMSContentTableModel
public static final String IMPL_NAME = "NAME";
public static final String IMPL_CLASS = "CLASS";
public static final String IMPL_DESC = "DESC";
-
+
private static String[] mColumns = {RULE_IMPL, CLASSNAME};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
index 098cbcbd1..c69cefd86 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
@@ -43,19 +43,19 @@ public class RuleImplTab extends CMSBaseUGTab {
private static final String IMPL_NAME = RuleImplDataModel.IMPL_NAME;
private static final String IMPL_CLASS = RuleImplDataModel.IMPL_CLASS;
private static final String IMPL_DESC = RuleImplDataModel.IMPL_DESC;
-
+
private static final String PANEL_NAME = "RULEIMPL";
private static final String DIALOG_PREFIX = "RULEREGISTERDIALOG";
-
+
private AdminConnection mConnection;
private String mDestination;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected RuleImplDataModel mDataModel; //table model
protected RuleRegisterDialog mEditor=null; //keep single copy
protected ViewDialog mViewer=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String RAHELPINDEX = "configuration-ra-ruleplugin-help";
private final static String CAHELPINDEX = "configuration-ca-ruleplugin-help";
@@ -111,13 +111,13 @@ public class RuleImplTab extends CMSBaseUGTab {
if(mTable.getSelectedRow()< 0)
return;
NameValuePairs obj = (NameValuePairs)
- mDataModel.getObjectValueAt(mTable.getSelectedRow());
+ mDataModel.getObjectValueAt(mTable.getSelectedRow());
if (mViewer==null)
mViewer = new ViewDialog(mModel.getFrame());
mViewer.showDialog(obj.get(IMPL_NAME),
obj.get(IMPL_CLASS),
obj.get(IMPL_DESC));
- }
+ }
if (e.getSource().equals(mHelp)) {
helpCallback();
}
@@ -129,7 +129,7 @@ public class RuleImplTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -138,8 +138,8 @@ public class RuleImplTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -223,7 +223,7 @@ public class RuleImplTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -232,24 +232,24 @@ public class RuleImplTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
@@ -280,18 +280,18 @@ public class RuleImplTab extends CMSBaseUGTab {
obj.put(IMPL_DESC, value.substring(x + 1));
data.put(entry,obj);
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
mDataModel.processData(data.get(vals[y]));
}
-
+
data.clear();
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
index 04a649ed0..dfc5f8159 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleInstanceTab.java
@@ -45,7 +45,7 @@ public class RuleInstanceTab extends CMSPluginInstanceTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "RULERULE";
-
+
private final static String RAHELPINDEX = "configuration-ra-ruleinstances-help";
private final static String CAHELPINDEX = "configuration-ca-ruleinstances-help";
@@ -60,9 +60,9 @@ public class RuleInstanceTab extends CMSPluginInstanceTab {
mDataModel = new RuleRuleDataModel();
mScope = ScopeDef.SC_RULE_RULES;
RULE_NAME = RuleRuleDataModel.RULE_NAME;
- RULE_STAT = RuleRuleDataModel.RULE_STAT;
+ RULE_STAT = RuleRuleDataModel.RULE_STAT;
- if (mDestination.equals(DestDef.DEST_RA_RULE_ADMIN))
+ if (mDestination.equals(DestDef.DEST_RA_RULE_ADMIN))
mHelpToken = RAHELPINDEX;
else
mHelpToken = CAHELPINDEX;
@@ -74,7 +74,7 @@ public class RuleInstanceTab extends CMSPluginInstanceTab {
JFrame parent,
AdminConnection conn,
String dest
- )
+ )
{
return new RuleConfigDialog(nvp,
@@ -88,7 +88,7 @@ public class RuleInstanceTab extends CMSPluginInstanceTab {
AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType
- )
+ )
{
return new RulePluginSelectionDialog(parent,conn,dest,pluginType);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
index f1021bc6c..cc7fb1076 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RulePluginSelectionDialog.java
@@ -41,7 +41,7 @@ public class RulePluginSelectionDialog extends PluginSelectionDialog
* variables
*==========================================================*/
private static final String PREFIX = "RULESELECTIONDIALOG";
- private static final String CAHELPINDEX =
+ private static final String CAHELPINDEX =
"configuration-ca-add-rulerule-dbox-help";
private static final String RAHELPINDEX =
"configuration-ra-add-rulerule-dbox-help";
@@ -51,9 +51,9 @@ public class RulePluginSelectionDialog extends PluginSelectionDialog
*==========================================================*/
public RulePluginSelectionDialog(
JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
- CMSPluginInstanceTab pluginType)
+ CMSPluginInstanceTab pluginType)
{
super(PREFIX, parent,conn, dest, pluginType);
mScope = ScopeDef.SC_RULE_IMPLS;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java b/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
index cee7727a1..776224c82 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/RuleRuleDataModel.java
@@ -55,7 +55,7 @@ public class RuleRuleDataModel extends CMSRuleDataModel
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE),
JLabel.LEFT));
- v.addElement(mResource.getString("RULERULE_LABEL_ENABLED_LABEL"));
+ v.addElement(mResource.getString("RULERULE_LABEL_ENABLED_LABEL"));
} else {
v.addElement(new JLabel(obj.get(RULE_NAME),
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_RULE_DISABLE),
diff --git a/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java b/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
index ac8b5e610..9a8bc2308 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
@@ -43,17 +43,17 @@ public class TKSKeysTab extends CMSBaseUGTab {
*==========================================================*/
private static final String PANEL_NAME = "TKSKEYS";
private CryptoManager mCryptoManager = null;
-
+
private AdminConnection mConnection;
private String mDestination;
private CMSBaseResourceModel mModel;
private ConsoleInfo mConsoleInfo;
- private JComboBox mToken;
+ private JComboBox mToken;
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected ListKeysModel mDataModel; //table model
protected KeyCreateDialog mEditor=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mHelp;
private final static String HELPINDEX = "configuration-log-plugin-help";
@@ -68,7 +68,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
mDataModel = new ListKeysModel();
mDestination = destination;
mHelpToken = HELPINDEX;
-
+
}
/*==========================================================
@@ -109,8 +109,8 @@ public class TKSKeysTab extends CMSBaseUGTab {
if(row < 0)
return;
-
-
+
+
}
//==== MOUSELISTENER ======================
@@ -119,7 +119,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -128,8 +128,8 @@ public class TKSKeysTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -142,8 +142,8 @@ public class TKSKeysTab extends CMSBaseUGTab {
protected JPanel createButtonPanel() {
//edit, add, delete, help buttons required
//actionlister to this object
-
-
+
+
mAdd = makeJButton("ADD");
JButton[] buttons = {mAdd};
@@ -181,9 +181,9 @@ public class TKSKeysTab extends CMSBaseUGTab {
CMSAdminUtil.COMPONENT_SPACE,
CMSAdminUtil.COMPONENT_SPACE,
CMSAdminUtil.COMPONENT_SPACE*30);
- gb.setConstraints(mToken, gbc);
+ gb.setConstraints(mToken, gbc);
mListPanel.add(mToken);
-
+
//center table
mTable = new JTable(mDataModel);
@@ -220,11 +220,11 @@ public class TKSKeysTab extends CMSBaseUGTab {
gbc.insets = EMPTY_INSETS;
gb.setConstraints(buttonPanel, gbc);
mListPanel.add(buttonPanel);
-
+
NameValuePairs response=null;
try {
response = mConnection.search(mDestination,
- ScopeDef.SC_TOKEN, new NameValuePairs());
+ ScopeDef.SC_TOKEN, new NameValuePairs());
} catch (EAdminException e) {
//display error dialog
showErrorDialog(e.getMessage());
@@ -237,7 +237,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
for (String entry : response.keySet()) {
vals[i++] = entry.trim();
}
-
+
int sindex = 0;
CMSAdminUtil.quickSort(vals, 0, response.size()-1);
for (i=0; i<vals.length; i++) {
@@ -245,7 +245,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
String entry = vals[i];
String value = response.get(entry);
// look for the comma separator
-
+
StringTokenizer st = new StringTokenizer(value, ",");
while (st.hasMoreTokens()) {
String currentToken= st.nextToken();
@@ -268,29 +268,29 @@ public class TKSKeysTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
-
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
-
+
NameValuePairs response;
NameValuePairs request;
request = new NameValuePairs();
request.put(Constants.PR_TOKEN_LIST, (String) mToken.getSelectedItem());
try {
response = mConnection.search(mDestination,
- ScopeDef.SC_TKSKEYSLIST, request);
+ ScopeDef.SC_TKSKEYSLIST, request);
} catch (EAdminException e) {
//display error dialog
showErrorDialog(e.getMessage());
@@ -308,7 +308,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
for (String entry : response.keySet()) {
vals[i++] = entry.trim();
}
-
+
int sindex = 0;
CMSAdminUtil.quickSort(vals, 0, response.size()-1);
for (i=0; i<vals.length; i++) {
@@ -348,7 +348,7 @@ public class TKSKeysTab extends CMSBaseUGTab {
(String)(mDataModel.getValueAt(row, 0));
String id = nickname+":SERIAL#<"+mDataModel.getValueAt(row, 1)+">"
+mDataModel.getValueAt(row, 2);
-
+
//send comment to server for the removal of user
try {
mConnection.delete(mDestination, ScopeDef.SC_USERCERTSLIST, id);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java b/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
index de0a075a1..ff8f06a4e 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
@@ -43,17 +43,17 @@ public class UserCertsTab extends CMSBaseUGTab {
* variables
*==========================================================*/
private static final String PANEL_NAME = "USERCERTS";
-
+
private AdminConnection mConnection;
private String mDestination;
private CMSBaseResourceModel mModel;
private ConsoleInfo mConsoleInfo;
-
+
protected JScrollPane mScrollPane;
protected JTable mTable; //table
protected ListCertsModel mDataModel; //table model
protected CertViewDialog mEditor=null; //keep single copy
-
+
protected JButton mRefresh, mAdd, mDelete, mView, mHelp;
private final static String HELPINDEX = "configuration-log-plugin-help";
@@ -119,7 +119,7 @@ public class UserCertsTab extends CMSBaseUGTab {
(String)(mTable.getValueAt(row, 0));
String serialno = (String)(mTable.getValueAt(row, 1));
String issuername = (String)(mTable.getValueAt(row, 2));
-
+
try {
NameValuePairs nvps = new NameValuePairs();
nvps.put(Constants.PR_NICK_NAME, nickname);
@@ -138,7 +138,7 @@ public class UserCertsTab extends CMSBaseUGTab {
CMSAdminUtil.showErrorDialog(mModel.getFrame(), mResource, ex.toString(),
CMSAdminUtil.ERROR_MESSAGE);
}
- }
+ }
}
//==== MOUSELISTENER ======================
@@ -147,7 +147,7 @@ public class UserCertsTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
@@ -156,8 +156,8 @@ public class UserCertsTab extends CMSBaseUGTab {
public void refresh() {
mDataModel.removeAllRows();
- update();
-
+ update();
+
setButtons();
mTable.invalidate();
mTable.validate();
@@ -241,7 +241,7 @@ public class UserCertsTab extends CMSBaseUGTab {
//set buttons
private void setButtons() {
-
+
//enable and diable buttons accordingly
//Debug.println("setButtons() - "+mTable.getSelectedRow());
//Debug.println("setButtons() - "+mTable.getSelectionModel().isSelectionEmpty());
@@ -250,29 +250,29 @@ public class UserCertsTab extends CMSBaseUGTab {
mView.setEnabled(false);
return;
}
-
+
if(mDataModel.getRowCount()<=0) {
mDelete.setEnabled(false);
mView.setEnabled(false);
return;
}
-
+
mDelete.setEnabled(true);
- mView.setEnabled(true);
-
+ mView.setEnabled(true);
+
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
private void update() {
//send request and parse data
-
+
mModel.progressStart();
NameValuePairs response;
try {
response = mConnection.search(mDestination,
- ScopeDef.SC_USERCERTSLIST, new NameValuePairs());
+ ScopeDef.SC_USERCERTSLIST, new NameValuePairs());
} catch (EAdminException e) {
//display error dialog
showErrorDialog(e.getMessage());
@@ -290,7 +290,7 @@ public class UserCertsTab extends CMSBaseUGTab {
for (String entry : response.keySet()) {
vals[i++] = entry.trim();
}
-
+
int sindex = 0;
String snickname = "";
CMSAdminUtil.quickSort(vals, 0, response.size()-1);
@@ -313,7 +313,7 @@ public class UserCertsTab extends CMSBaseUGTab {
}
mTable.setRowSelectionInterval(0,0);
}
-
+
mModel.progressStop();
}
@@ -324,7 +324,7 @@ public class UserCertsTab extends CMSBaseUGTab {
(String)(mDataModel.getValueAt(row, 0));
String id = nickname+":SERIAL#<"+mDataModel.getValueAt(row, 1)+">"
+mDataModel.getValueAt(row, 2);
-
+
//send comment to server for the removal of user
try {
mConnection.delete(mDestination, ScopeDef.SC_USERCERTSLIST, id);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
index 277b3d2be..e3c40a276 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ViewDialog.java
@@ -30,7 +30,7 @@ import javax.swing.table.*;
import com.netscape.certsrv.common.*;
/**
- * Policy Implementation Information viewer
+ * Policy Implementation Information viewer
*
* @author Jack Pan-Chen
* @version $Revision$, $Date$
@@ -148,7 +148,7 @@ public class ViewDialog extends JDialog
JLabel label1 = CMSAdminUtil.makeJLabel(mResource, PREFIX, "NAME", null);
mNameField = new JLabel();
CMSAdminUtil.addEntryField(content, label1, mNameField, gbc);
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel label2 = CMSAdminUtil.makeJLabel(mResource, PREFIX, "CLASS", null);
mClassField = new JLabel();
@@ -162,7 +162,7 @@ public class ViewDialog extends JDialog
CMSAdminUtil.COMPONENT_SPACE,0,0);
gb3.setConstraints(label3, gbc);
content.add(label3);
-
+
CMSAdminUtil.resetGBC(gbc);
mTextArea = new JTextArea("",30,10);
mTextArea.setFont(mClassField.getFont());
@@ -183,7 +183,7 @@ public class ViewDialog extends JDialog
gbc.weighty=1.0;
gb3.setConstraints(scrollPanel, gbc);
content.add(scrollPanel);
-
+
return content;
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java b/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
index 09d7892ef..fdd18b2f8 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/ViewSelfTestsDialog.java
@@ -31,7 +31,7 @@ import javax.swing.event.*;
import javax.swing.table.*;
/**
- * Self Tests Implementation Information viewer
+ * Self Tests Implementation Information viewer
*
* @author Matthew Harmsen
* @author Thomas Kwan
@@ -166,7 +166,7 @@ public class ViewSelfTestsDialog extends JDialog
gbc.weighty = 1.0;
gb3.setConstraints( scrollPanel, gbc );
content.add( scrollPanel );
-
+
return content;
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
index 6c92ed61e..c5ff4ce2b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertExtensionPage.java
@@ -48,7 +48,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
protected static final String DEFAULT_CERT_LEN = "100";
protected String mPanelName;
protected boolean mModified=false;
-
+
public WBaseCertExtensionPage(String panelName) {
super(panelName);
}
@@ -73,7 +73,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
setErrorMessage("INVALID");
return false;
}
-
+
}
if (mMIMECheckBox.isSelected()) {
@@ -100,7 +100,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
enableExtendedKey(extendedKey);
- if (derExt)
+ if (derExt)
enableMIMEExt(derExt, mActiveColor);
else
enableMIMEExt(derExt, getBackground());
@@ -111,15 +111,15 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
// If signed by self, no request will be generated
// check if a signing cert installed, make cmc note invisible
String type = wizardInfo.getCertType();
- if ((type.equals(Constants.PR_KRA_TRANSPORT_CERT) &&
+ if ((type.equals(Constants.PR_KRA_TRANSPORT_CERT) &&
wizardInfo.isKRACertLocalCA()) ||
- (type.equals(Constants.PR_SERVER_CERT) &&
+ (type.equals(Constants.PR_SERVER_CERT) &&
wizardInfo.isSSLCertLocalCA()) ||
type.equals(Constants.PR_OCSP_SIGNING_CERT) ||
(type.equals(Constants.PR_CA_SIGNING_CERT) &&
wizardInfo.isCACertLocalCA()) ||
(type.equals(Constants.PR_SERVER_CERT) ||
- type.equals(Constants.PR_KRA_TRANSPORT_CERT)) && (
+ type.equals(Constants.PR_KRA_TRANSPORT_CERT)) && (
(wizardInfo.isCAInstalled() &&
wizardInfo.isCACertInstalledDone()) ||
(wizardInfo.isRAInstalled() &&
@@ -220,7 +220,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
JPanel panel = new JPanel();
GridBagLayout gb1 = new GridBagLayout();
panel.setLayout(gb1);
-
+
mCertPathBox = makeJCheckBox("CERTPATHLENGTH");
CMSAdminUtil.resetGBC(gbc);
gbc.insets = new Insets(0, 0, 0, COMPONENT_SPACE);
@@ -289,7 +289,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
gbc.fill = gbc.NONE;
gbc.weightx = 1.0;
add(mSSLMail, gbc);
-
+
mObjectSigning = makeJCheckBox("OBJECTSIGNING");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
@@ -315,7 +315,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
gbc.fill = gbc.NONE;
gbc.weightx = 1.0;
add(mOCSPSigning, gbc);
-
+
mAIACheckBox = makeJCheckBox("AIA");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
@@ -380,7 +380,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
COMPONENT_SPACE);
gbc.fill = gbc.NONE;
add(mMIMECheckBox, gbc);
-
+
mMIMEText = new JTextArea("", 40, 70);
JScrollPane scrollPane = new JScrollPane(mMIMEText,
JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
@@ -400,7 +400,7 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
COMPONENT_SPACE);
add(scrollPane, gbc);
mActiveColor = mMIMEText.getBackground();
-
+
mPaste = makeJButton("PASTE");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHEAST;
@@ -421,17 +421,17 @@ public class WBaseCertExtensionPage extends WizardBasePanel {
if (source.equals(mPaste)) {
mMIMEText.paste();
} else if (source.equals(mBasicCheckBox)) {
- if (mBasicCheckBox.isSelected())
+ if (mBasicCheckBox.isSelected())
enableBasicConstraints(true, mActiveColor);
else
enableBasicConstraints(false, getBackground());
} else if (source.equals(mExtendedKeyCheckBox)) {
- if (mExtendedKeyCheckBox.isSelected())
+ if (mExtendedKeyCheckBox.isSelected())
enableExtendedKey(true);
else
enableExtendedKey(false);
} else if (source.equals(mMIMECheckBox)) {
- if (mMIMECheckBox.isSelected())
+ if (mMIMECheckBox.isSelected())
enableMIMEExt(true, mActiveColor);
else
enableMIMEExt(false, getBackground());
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
index 6b9a1667b..9eb63ca97 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseCertRequestPage.java
@@ -43,7 +43,7 @@ public class WBaseCertRequestPage extends WizardBasePanel {
protected JTextField mEmailText, mContactEmailTxt, mNameTxt, mContactPhoneTxt;
protected JLabel mContactPhoneLbl, mContactEmailLbl, mNameLbl;
protected JTextArea mContactText;
-
+
public WBaseCertRequestPage(String panelName) {
super(panelName);
}
@@ -135,10 +135,10 @@ public class WBaseCertRequestPage extends WizardBasePanel {
mEmailText = new JTextField(30);
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.WEST;
- gbc.insets = new Insets(COMPONENT_SPACE, 0, 0, COMPONENT_SPACE);
+ gbc.insets = new Insets(COMPONENT_SPACE, 0, 0, COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(mEmailText, gbc);
-
+
mURLBtn = makeJRadioButton("URL", false);
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.WEST;
@@ -154,7 +154,7 @@ public class WBaseCertRequestPage extends WizardBasePanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(mURLText, gbc);
-
+
ButtonGroup methodGroup = new ButtonGroup();
methodGroup.add(mEmailBtn);
methodGroup.add(mURLBtn);
@@ -169,7 +169,7 @@ public class WBaseCertRequestPage extends WizardBasePanel {
CMSAdminUtil.resetGBC(gbc);
gbc.weightx = 1.0;
gbc.anchor = gbc.NORTHWEST;
- gbc.gridwidth = gbc.REMAINDER;
+ gbc.gridwidth = gbc.REMAINDER;
gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE,
COMPONENT_SPACE,COMPONENT_SPACE);
add(mContactText, gbc);
@@ -187,7 +187,7 @@ public class WBaseCertRequestPage extends WizardBasePanel {
gbc.anchor = gbc.NORTHWEST;
gbc.insets = new Insets(COMPONENT_SPACE, 0, 0, 0);
add(panel, gbc);
-
+
mNameLbl = makeJLabel("NAME");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.EAST;
@@ -221,7 +221,7 @@ public class WBaseCertRequestPage extends WizardBasePanel {
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
panel.add(mContactEmailTxt, gbc);
-
+
mContactPhoneLbl = makeJLabel("PHONE");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.WEST;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
index 97774727b..44ad29fed 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNPage.java
@@ -98,7 +98,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
}
if (str.equals("") && !displayWarning) {
- String errorMsg =
+ String errorMsg =
mResource.getString(mPanelName+"_DIALOG_MISSINGO_MESSAGE");
JOptionPane.showMessageDialog(new JFrame(), errorMsg, "Warning",
JOptionPane.WARNING_MESSAGE,
@@ -184,7 +184,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
gbc.gridwidth = gbc.REMAINDER;
add(dnDesc, gbc);
*/
-
+
/*
JTextArea desc = createTextArea(
CMSAdminUtil.wrapText(mResource.getString(
@@ -210,7 +210,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(mDNComponents, gbc);
-
+
cnLabel = makeJLabel("CN");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.EAST;
@@ -219,7 +219,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
COMPONENT_SPACE);
add(cnLabel, gbc);
- mCNText = new JTextField(30);
+ mCNText = new JTextField(30);
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.WEST;
gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE, 0,
@@ -365,7 +365,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
mSubjectStringText = new JTextField(256);
/*
- mSubjectStringText = new JTextArea(null, null, 0, 0);
+ mSubjectStringText = new JTextArea(null, null, 0, 0);
mSubjectStringText.setBorder(BorderFactory.createLineBorder(Color.black));
JScrollPane scrollPane = new JScrollPane(mSubjectStringText,
JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
@@ -391,7 +391,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
gbc.gridheight = gbc.REMAINDER;
gbc.gridwidth = gbc.REMAINDER;
add(d1, gbc);
-
+
mCNText.getDocument().addDocumentListener((DocumentListener)mSubjectDNText);
mOUText.getDocument().addDocumentListener((DocumentListener)mSubjectDNText);
@@ -425,10 +425,10 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
CMSAdminUtil.repaintComp(cLabel);
CMSAdminUtil.repaintComp(subjectDNLabel);
if (enable)
- CMSAdminUtil.enableJTextField(mSubjectStringText, !enable,
+ CMSAdminUtil.enableJTextField(mSubjectStringText, !enable,
getBackground());
else
- CMSAdminUtil.enableJTextField(mSubjectStringText, !enable,
+ CMSAdminUtil.enableJTextField(mSubjectStringText, !enable,
mActiveColor);
}
@@ -437,10 +437,10 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
enableFields(true, mActiveColor);
} else {
enableFields(false, getBackground());
- }
+ }
}
- public class SubjectDNTextArea extends JTextArea implements
+ public class SubjectDNTextArea extends JTextArea implements
DocumentListener {
public SubjectDNTextArea(int rows, int columns) {
@@ -454,7 +454,7 @@ public class WBaseDNPage extends WizardBasePanel implements IWizardPanel {
public void removeUpdate(DocumentEvent e) {
super.setText(updateStr());
}
-
+
public void changedUpdate(DocumentEvent e) {
super.setText(updateStr());
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
index 3a5837624..202b42dae 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseDNValidityPage.java
@@ -66,9 +66,9 @@ public class WBaseDNValidityPage extends WizardBasePanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(desc, gbc);
-
+
JLabel cnLabel = makeJLabel("CN");
- mCNText = new JTextField(30);
+ mCNText = new JTextField(30);
/*
JTextArea dummy = createTextArea(" ", 1, 1);
CMSAdminUtil.addComponents(this, cnLabel, mCNText, dummy, gbc);
@@ -136,7 +136,7 @@ public class WBaseDNValidityPage extends WizardBasePanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(desc1, gbc);
-
+
validityLbl = makeJLabel("VALIDITY");
mValidityText = new JTextField(5);
mUnitBox = makeJComboBox("VALIDITY");
@@ -154,7 +154,7 @@ public class WBaseDNValidityPage extends WizardBasePanel {
super.init();
}
- public class SubjectDNTextArea extends JTextArea implements
+ public class SubjectDNTextArea extends JTextArea implements
DocumentListener {
public SubjectDNTextArea(int rows, int columns) {
@@ -168,7 +168,7 @@ public class WBaseDNValidityPage extends WizardBasePanel {
public void removeUpdate(DocumentEvent e) {
super.setText(updateStr());
}
-
+
public void changedUpdate(DocumentEvent e) {
super.setText(updateStr());
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
index 1266099b1..cd5ebfc25 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseKeyPage.java
@@ -32,13 +32,13 @@ import com.netscape.certsrv.common.*;
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config.install
*/
-public class WBaseKeyPage extends WizardBasePanel {
+public class WBaseKeyPage extends WizardBasePanel {
protected JComboBox mKeyTypeBox;
protected JComboBox mKeyLengthBox;
//protected JComboBox mTokenBox;
//protected JPasswordField mPasswordText;
protected JTextField mKeyLengthText;
-
+
public WBaseKeyPage(String panelName) {
super(panelName);
}
@@ -59,7 +59,7 @@ public class WBaseKeyPage extends WizardBasePanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(desc, gbc);
-
+
/*
JTextArea desc1 = createTextArea(
CMSAdminUtil.wrapText(mResource.getString(
@@ -93,7 +93,7 @@ public class WBaseKeyPage extends WizardBasePanel {
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);
@@ -133,7 +133,7 @@ public class WBaseKeyPage extends WizardBasePanel {
/*
JLabel keyTypeLbl = makeJLabel("KEYTYPE");
- mKeyTypeBox = makeJComboBox("KEYTYPE");
+ mKeyTypeBox = makeJComboBox("KEYTYPE");
//JTextArea dummy2 = createTextArea(" ", 1, 10);
//CMSAdminUtil.addComponents(this, keyTypeLbl, mKeyTypeBox, dummy2, gbc);
CMSAdminUtil.addComponents(this, keyTypeLbl, mKeyTypeBox, gbc);
@@ -147,15 +147,15 @@ public class WBaseKeyPage extends WizardBasePanel {
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);
@@ -190,7 +190,7 @@ public class WBaseKeyPage extends WizardBasePanel {
JPanel panel1 = new JPanel();
GridBagLayout gb2 = new GridBagLayout();
panel1.setLayout(gb2);
-
+
JLabel keyLengthCustomLbl = makeJLabel("KEYLENGTH");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHEAST;
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
index 195979f9c..7c36571d8 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseManualCertRequestPage.java
@@ -59,14 +59,14 @@ public class WBaseManualCertRequestPage extends WizardBasePanel {
protected String mPanelName, mDir;
protected JTextArea mFileName;
protected JTextArea mDesc;
-
+
protected JTextField mHostText, mPortText;
protected JLabel mHostLbl, mPortLbl;
protected JLabel mSSLText;
protected JCheckBox mSSL; // ssl or not
protected String mHost, mPort;
protected JLabel mSendNowText;
- protected JCheckBox mSendNowBox;
+ protected JCheckBox mSendNowBox;
protected Color mActiveColor;
public static final int MAX_PORT = 65535;
public static final int MIN_PORT = 1;
@@ -105,7 +105,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel {
mReq = wizardInfo.getCertRequest();
}
if (mReqFormat.equals(ConfigConstants.PR_REQUEST_PKCS10)){
-
+
// Break the long single line:header,64 byte lines,trailer
// Assuming this is the only format we generate.
String CERT_NEW_REQUEST_HEADER = "-----BEGIN NEW CERTIFICATE REQUEST-----";
@@ -136,7 +136,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel {
mReq = str;
}
- if (mReq == null)
+ if (mReq == null)
return false;
mText.setText(mReq);
@@ -158,7 +158,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel {
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);
@@ -177,7 +177,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel {
}
mDesc.setText(desc);
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -220,7 +220,7 @@ public class WBaseManualCertRequestPage extends WizardBasePanel {
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
@@ -280,10 +280,10 @@ public class WBaseManualCertRequestPage extends WizardBasePanel {
wizardInfo.setX509RequestError(reqError);
// rejected request should not be saved as requestSuccStage!!
- if ( (reqID != null) && !reqID.equals("") &&
+ if ( (reqID != null) && !reqID.equals("") &&
(wizardInfo.getRequestError() == null) &&
- (reqStatus.equals(Constants.PR_REQUEST_SUCCESS)
- || reqStatus.equals(Constants.PR_REQUEST_PENDING)
+ (reqStatus.equals(Constants.PR_REQUEST_SUCCESS)
+ || reqStatus.equals(Constants.PR_REQUEST_PENDING)
|| reqStatus.equals(Constants.PR_REQUEST_SVC_PENDING)) ) {
data = new Hashtable();
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java b/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
index 61d9506e6..2af0c5a89 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WBaseValidityPage.java
@@ -152,7 +152,7 @@ January 2038.
JLabel dayLbl = makeJLabel("DAY");
add(dayLbl, gbc);
-
+
JLabel hourLbl = makeJLabel("HOUR");
add(hourLbl, gbc);
@@ -187,7 +187,7 @@ January 2038.
gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE, 0,
COMPONENT_SPACE);
add(mBYear, gbc);
-
+
mBMonth = new JTextField(""+(nowDate.get(Calendar.MONTH)+1));
mBMonth.setColumns(3);
add(mBMonth, gbc);
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
index 425eddaaa..4480e4de0 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNNewAgent.java
@@ -48,7 +48,7 @@ class WMNNewAgent extends WizardBasePanel
private NewAgentModel mDataModel;
private JTable mTable;
protected JScrollPane mScrollPane;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-kra-wizard-newagentpwd-keyscheme-help";
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java b/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
index 07973f6c9..4c5a6182b 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNOldAgent.java
@@ -48,7 +48,7 @@ class WMNOldAgent extends WizardBasePanel
private AutoRecoveryModel mDataModel;
private JTable mTable;
protected JScrollPane mScrollPane;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-kra-wizard-agentpwd-keyscheme-help";
/*==========================================================
@@ -65,7 +65,7 @@ class WMNOldAgent extends WizardBasePanel
/*==========================================================
* public methods
- *==========================================================*/
+ *==========================================================*/
public boolean initializePanel(WizardInfo info) {
//let's set the values
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
index 55b1d1ccf..db1d7eadc 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNResultPage.java
@@ -43,7 +43,7 @@ class WMNResultPage extends WizardBasePanel
*==========================================================*/
private static final String PANELNAME = "WMNRESULTPAGE";
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-kra-wizard-newagentpwd-keyscheme-help";
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java b/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
index db7753b1d..f3e7fd53e 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMNSelection.java
@@ -78,7 +78,7 @@ class WMNSelection extends WizardBasePanel
if ((mMField.getText().trim().equals("")) ||
(mNField.getText().trim().equals("")) ) {
setErrorMessage("CANNOTBEBLANK");
- return false;
+ return false;
}
String str = mMField.getText().trim();
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
index ce0ced102..568566a88 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WMessageDigestPage.java
@@ -47,7 +47,7 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
protected String mCAKeyType;
protected JTextArea mSignedByTypeLbl;
private static final String HELPINDEX = "install-cert-mda-wizard-help";
-
+
public WMessageDigestPage(String panelName) {
super(panelName);
mPanelName = panelName;
@@ -62,23 +62,23 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
setBorder(makeTitledBorder(mPanelName));
if (mCAKeyType.equals("RSA")) {
- mECCHashTypeBox.setVisible(false);
+ mECCHashTypeBox.setVisible(false);
mDSAHashTypeBox.setVisible(false);
mRSAHashTypeBox.setVisible(true);
String sha1 = mResource.getString(mPanelName+"_COMBOBOX_RSAHASHTYPE_VALUE_2");
mRSAHashTypeBox.setSelectedItem(sha1);
} else if (mCAKeyType.equals("ECC")) {
- mECCHashTypeBox.setVisible(true);
+ mECCHashTypeBox.setVisible(true);
mDSAHashTypeBox.setVisible(false);
mRSAHashTypeBox.setVisible(false);
} else {
- mECCHashTypeBox.setVisible(false);
+ mECCHashTypeBox.setVisible(false);
mDSAHashTypeBox.setVisible(true);
mRSAHashTypeBox.setVisible(false);
}
mHelpIndex = HELPINDEX;
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -93,7 +93,7 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
mSignedByTypeLbl.setVisible(false);
return;
}
-
+
if (mCAKeyType.equals("RSA")) {
mRSASignedByTypeBox.setVisible(true);
mDSASignedByTypeBox.setVisible(false);
@@ -107,7 +107,7 @@ public class WMessageDigestPage extends WizardBasePanel implements IWizardPanel
mDSASignedByTypeBox.setVisible(true);
mRSASignedByTypeBox.setVisible(false);
}
-
+
mSignedByTypeLbl.setVisible(true);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java b/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
index bedf0b67f..4cb157411 100644
--- a/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/config/WarningDialog.java
@@ -62,12 +62,12 @@ public class WarningDialog extends JDialog
getRootPane().setDoubleBuffered(true);
setDisplay();
}
-
+
public void actionPerformed(ActionEvent evt) {
if (evt.getSource().equals(mClose)) {
this.hide();
this.dispose();
- }
+ }
}
private void setDisplay() {
@@ -110,9 +110,9 @@ public class WarningDialog extends JDialog
}
private JPanel makeActionPane() {
- mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE",
+ mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE",
null, this);
-
+
Dimension d = mClose.getMinimumSize();
if (d.width < CMSAdminUtil.DEFAULT_BUTTON_SIZE) {
d.width = CMSAdminUtil.DEFAULT_BUTTON_SIZE;
@@ -150,7 +150,7 @@ public class WarningDialog extends JDialog
desc.setBackground(getBackground());
desc.setEditable(false);
desc.setCaretColor(getBackground());
- JScrollPane scrollPane = new JScrollPane(desc,
+ JScrollPane scrollPane = new JScrollPane(desc,
JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
CMSAdminUtil.resetGBC(gbc);
@@ -164,7 +164,7 @@ public class WarningDialog extends JDialog
gbc.gridwidth = gbc.REMAINDER;
gbc.gridheight = gbc.REMAINDER;
content.add(scrollPane, gbc);
-
+
return content;
}
}
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;
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
index acb023132..090b16e1d 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/AdminConnection.java
@@ -45,7 +45,7 @@ public class AdminConnection {
*==========================================================*/
public static int NO_TIMEOUT = 0;
public static int DEFAULT_TIMEOUT = 600000; //600 sec
-
+
private IConnectionFactory mFactory= null;
private IConnection mConn = null;
private IAuthenticator mAuth = null;
@@ -80,7 +80,7 @@ public class AdminConnection {
IConnectionFactory factory,
String host, int port, String path) {
if (mPM == null) {
- mPM = new FilePreferenceManager(Framework.IDENTIFIER,
+ mPM = new FilePreferenceManager(Framework.IDENTIFIER,
Framework.VERSION);
}
Preferences p = mPM.getPreferences(
@@ -88,7 +88,7 @@ public class AdminConnection {
int timeout = p.getInt("CMSConnTimeout", 600000);
setDefaultTimeout(timeout);
setCurrentTimeout(timeout);
- Debug.println("AdminConnection: " + timeout + " " +
+ Debug.println("AdminConnection: " + timeout + " " +
mPM.getClass().getName());
mAuth = auth;
@@ -117,7 +117,7 @@ public class AdminConnection {
boolean enableKeepAlive,
String host, int port, String path) {
if (mPM == null) {
- mPM = new FilePreferenceManager(Framework.IDENTIFIER,
+ mPM = new FilePreferenceManager(Framework.IDENTIFIER,
Framework.VERSION);
}
Preferences p = mPM.getPreferences(
@@ -125,7 +125,7 @@ public class AdminConnection {
int timeout = p.getInt("CMSConnTimeout", 600000);
setDefaultTimeout(timeout);
setCurrentTimeout(timeout);
- Debug.println("AdminConnection: " + timeout + " " +
+ Debug.println("AdminConnection: " + timeout + " " +
mPM.getClass().getName());
mAuth = auth;
@@ -172,14 +172,14 @@ public class AdminConnection {
b64.append('\n');
return b64.toString();
- }
+ }
/*==========================================================
* public methods
*==========================================================*/
/**
- * Set the listener.
+ * Set the listener.
*/
public void setConnectionListener(IConnectionListener l) {
mConnectionListener = l;
@@ -217,7 +217,7 @@ public class AdminConnection {
* @param timeout time in ms
*/
public void setCurrentTimeout(int timeout) {
- mCurrentTimeout = timeout;
+ mCurrentTimeout = timeout;
}
@@ -514,7 +514,7 @@ public class AdminConnection {
throw new EAdminException(response.getErrorMessage(), true);
}
- public void validate(String dest, String scope, NameValuePairs pairs)
+ public void validate(String dest, String scope, NameValuePairs pairs)
throws EAdminException {
Request request = new Request(mPath + "/" + dest);
request.set(Constants.OP_TYPE, OpDef.OP_VALIDATE);
@@ -577,7 +577,7 @@ public class AdminConnection {
return;
} else if (response.getReturnCode() == Response.RESTART) {
mConnectionListener.restartCallback();
- return;
+ return;
}
throw new EAdminException(response.getErrorMessage(), true);
}
@@ -661,17 +661,17 @@ public class AdminConnection {
}
try {
- return processRequest(request, useGET);
+ return processRequest(request, useGET);
//all errors will set the connection to null
//to force re-connection and avoid null ptr exception
} catch (Exception e) {
retryConnection();
-
+
try {
return processRequest(request, useGET);
} catch (InterruptedIOException ex) {
-
+
//timeout occurred
mConn = null;
@@ -681,7 +681,7 @@ public class AdminConnection {
} catch (SocketException ex) {
mConn = null;
throw new EAdminException(CMSAdminResources.SERVER_UNREACHABLE, false);
- } catch (IOException ex) {
+ } catch (IOException ex) {
if (Debug.isEnabled()) {
ex.printStackTrace();
}
@@ -736,12 +736,12 @@ public class AdminConnection {
}
sb.append("Content-length: " + sb1.toString().length() + "\n");
}
-
+
sb.append("Pragma: no-cache\n");
if (mIsKeepAlive) {
sb.append("Connection: Keep-Alive\n");
}
-
+
if (mAuthType.equals("") || mAuthType.equals("pwd")) {
BasicAuthenticator auth = (BasicAuthenticator)mAuth;
// sun.misc.BASE64Encoder encoder = new sun.misc.BASE64Encoder();
@@ -761,7 +761,7 @@ public class AdminConnection {
sb.append(sb1.toString());
}
//Debug.println(sb.toString());
-
+
//System.out.println("AdminConnection: sendRequest() - sending");
int timeout = mDefaultTimeout;
if (mCurrentTimeout > mDefaultTimeout)
@@ -770,18 +770,18 @@ public class AdminConnection {
mConn.sendRequest(sb.toString());
Response resp = new Response(mConn.getResponse());
-
+
if (!mIsKeepAlive) {
mConn.disconnect();
mConn = null;
}
-
+
//set time out back to original
mConn.setSoTimeout(mDefaultTimeout);
mCurrentTimeout = mDefaultTimeout;
return resp;
}
-
+
private void checkParams(String dest,String scope,String id)
{
NameValuePairs pairs = new NameValuePairs();
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java b/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
index 1d3796968..f0c7d5f0e 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/BasicAuthenticator.java
@@ -39,7 +39,7 @@ public class BasicAuthenticator implements IAuthenticator {
public String getUserid() {
return mUserid;
}
-
+
public String getPassword() {
return mPassword;
}
@@ -47,7 +47,7 @@ public class BasicAuthenticator implements IAuthenticator {
public void setUserId(String userid) {
mUserid = userid;
}
-
+
public void setPassword(String password) {
mPassword = password;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
index 0643e50eb..3e4f76c1b 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/IConnection.java
@@ -45,11 +45,11 @@ public interface IConnection {
* Close the connection
*/
public void disconnect();
-
+
/**
* SetTimeout
*/
public void setSoTimeout(int timeout) throws SocketException;
-
-
+
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
index 27292b3d9..e606cd5c4 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java
@@ -48,7 +48,7 @@ import java.awt.*;
* @author Christine Ho
* @version $Revision$, $Date$
*/
-public class JSSConnection implements IConnection, SSLCertificateApprovalCallback,
+public class JSSConnection implements IConnection, SSLCertificateApprovalCallback,
SSLClientCertificateSelectionCallback {
/*==========================================================
@@ -92,7 +92,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
UtilConsoleGlobals.initJSS();
cf = UtilConsoleGlobals.getX509CertificateFactory();
try {
- cryptoManager = CryptoManager.getInstance();
+ cryptoManager = CryptoManager.getInstance();
} catch (Exception e) {
}
@@ -100,19 +100,19 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
// to get the ciphers
SSLSocket.enableSSL2Default(false);
SSLSocket.enableSSL3Default(true);
- int TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005;
- int TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A;
+ int TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005;
+ int TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A;
int ciphers[] = SSLSocket.getImplementedCipherSuites();
for (int i = 0; ciphers != null && i < ciphers.length; i++) {
// make sure SSLv2 ciphers are not enabled
if ((ciphers[i] & 0xfff0) !=0xff00) {
- Debug.println("JSSConnection Debug: non-SSL2 NSS Cipher Supported '0x" +
- Integer.toHexString(ciphers[i]) + "'");
+ Debug.println("JSSConnection Debug: non-SSL2 NSS Cipher Supported '0x" +
+ Integer.toHexString(ciphers[i]) + "'");
SSLSocket.setCipherPreferenceDefault(ciphers[i], true);
} else {
- Debug.println("JSSConnection Debug: SSL2 (turned off) NSS Cipher Supported '0x" +
- Integer.toHexString(ciphers[i]) + "'");
+ Debug.println("JSSConnection Debug: SSL2 (turned off) NSS Cipher Supported '0x" +
+ Integer.toHexString(ciphers[i]) + "'");
SSLSocket.setCipherPreferenceDefault(ciphers[i], false);
}
@@ -192,12 +192,12 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
if (!(promptForTrustDialog.isAcceptedForOneSession())) {
try {
String nickname = serverCert.getNickname();
-
- CryptoToken internalToken =
+
+ CryptoToken internalToken =
cryptoManager.getInternalKeyStorageToken();
if (!internalToken.passwordIsInitialized()) {
- InitPasswordDialog initPasswordDialog =
+ InitPasswordDialog initPasswordDialog =
new InitPasswordDialog(internalToken);
initPasswordDialog.setVisible(true);
if (initPasswordDialog.isCancel()) {
@@ -223,11 +223,11 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
mCertAccepted = false;
return false;
}
- InternalCertificate internalCert =
- cryptoManager.importCertToPerm(serverCert,
+ InternalCertificate internalCert =
+ cryptoManager.importCertToPerm(serverCert,
(nickname==null)?serverCert.getSubjectDN().toString():nickname);
internalCert.setSSLTrust(
- org.mozilla.jss.crypto.InternalCertificate.TRUSTED_PEER |
+ org.mozilla.jss.crypto.InternalCertificate.TRUSTED_PEER |
org.mozilla.jss.crypto.InternalCertificate.VALID_PEER);
} catch (Exception e) {
mServerCertImported = false;
@@ -236,7 +236,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
e.printStackTrace();
}
return false;
- }
+ }
}
}
@@ -258,7 +258,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
public boolean isClientAuth() {
return mClientAuth;
}
-
+
public boolean isCertAccepted() {
return mCertAccepted;
}
@@ -271,8 +271,8 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
return mServerCertImported;
}
- public String select(Vector nicknames)
- {
+ public String select(Vector nicknames)
+ {
selectCertDialog = null;
mClientAuth = true;
if (nicknames == null || nicknames.size() == 0) {
@@ -312,11 +312,11 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
abort = true;
throw new PasswordCallback.GiveUpException();
}
-
+
return getPasswordDialog.getPassword();
}
- public Password getPasswordAgain(PasswordCallbackInfo info)
+ public Password getPasswordAgain(PasswordCallbackInfo info)
throws GiveUpException
{
@@ -445,9 +445,9 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
*/
public void setSoTimeout(int timeout) throws SocketException {
//System.out.println("JSSConnection: setSoTimeout() - "+timeout);
- s.setSoTimeout(timeout);
+ s.setSoTimeout(timeout);
}
-
+
/*==========================================================
* private methods
*==========================================================*/
@@ -465,12 +465,12 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
readBody();
}
- private int readLineFromStream(InputStream is, byte line[],
+ private int readLineFromStream(InputStream is, byte line[],
int startpos, int len) throws IOException {
//return is.readLine(line, startpos, len);
int pos = startpos;
int count = 0;
- while (len > 0)
+ while (len > 0)
{
int nRead = httpIn.read(line, pos, 1);
if (nRead == -1)
@@ -581,7 +581,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
CryptoToken mToken;
boolean tokenPasswdInit = true;
boolean pwdSame = true;
-
+
public InitPasswordDialog(CryptoToken token) {
super(null,"",true, OK|CANCEL);
setMinimumSize(300, 150);
@@ -636,7 +636,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
mToken.initPassword(null, getPassword());
dispose();
} catch (Exception e) {
- tokenPasswdInit = false;
+ tokenPasswdInit = false;
}
}
@@ -653,7 +653,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
pwd.grabFocus();
super.setVisible(visible);
}
-
+
public Password getPassword() {
Password jssPwd = new Password(pwd.getText().toCharArray());
return jssPwd;
@@ -663,7 +663,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
class GetPasswordDialog extends AbstractDialog {
MultilineLabel enterPwdLabel = new MultilineLabel();
- protected ResourceBundle mResource =
+ protected ResourceBundle mResource =
ResourceBundle.getBundle(CMSAdminResources.class.getName());
SingleBytePasswordField pwd;
public GetPasswordDialog() {
@@ -694,7 +694,7 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
pwd.grabFocus();
super.setVisible(visible);
}
-
+
public void setPasswordInfo(PasswordCallbackInfo info, boolean getPwdAgain) {
if (getPwdAgain)
enterPwdLabel.setText(mResource.getString(
@@ -756,6 +756,6 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac
return certList.getSelectedItem().toString();
}
- }
+ }
}
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java b/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
index 868eccc1b..59ce0eb33 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/PromptForTrustDialog.java
@@ -273,21 +273,21 @@ public class PromptForTrustDialog extends AbstractDialog implements SuiConstants
private JPanel createActionButtons() {
JPanel buttonPanel = new JPanel();
buttonPanel.setLayout(new GridBagLayout());
-
+
accept = JButtonFactory.create(
mResource.getString("SSLCLIENT_TRUST_DIALOG_ACCEPT"),
buttonActionListener, "ACCEPT");
accept.registerKeyboardAction(buttonActionListener, "ACCEPT",
KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),
JComponent.WHEN_IN_FOCUSED_WINDOW);
-
+
JButton reject = JButtonFactory.create(
mResource.getString("SSLCLIENT_TRUST_DIALOG_REJECT"),
buttonActionListener, "REJECT");
reject.registerKeyboardAction(buttonActionListener, "REJECT",
KeyStroke.getKeyStroke(KeyEvent.VK_R, 0),
JComponent.WHEN_IN_FOCUSED_WINDOW);
-
+
JButton viewCert = JButtonFactory.create(
mResource.getString("SSLCLIENT_TRUST_DIALOG_VIEWCERT"), buttonActionListener, "VIEWCERT");
viewCert.registerKeyboardAction(buttonActionListener, "VIEWCERT",
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/Request.java b/base/console/src/com/netscape/admin/certsrv/connection/Request.java
index 8ed61e998..eb134b5a3 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/Request.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/Request.java
@@ -22,7 +22,7 @@ import java.util.*;
/**
* A class represents a connection to certificate server.
- *
+ *
* @author thomask
* @author Jack Pan-Chen
* @version $Revision$, $Date$
@@ -30,10 +30,10 @@ import java.util.*;
public class Request {
private String mPrefix = null;
-
+
//internal structure is changed to vector to maintain
//the ordering
-
+
private Vector mName = new Vector();
private Vector mValue = new Vector();
@@ -55,14 +55,14 @@ public class Request {
try {
return (String) mValue.elementAt(i);
} catch (ArrayIndexOutOfBoundsException e) {
- return "";
+ return "";
}
}
public Enumeration getElements() {
return mName.elements();
}
-
+
public void removeAll() {
mName.removeAllElements();
mValue.removeAllElements();
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/Response.java b/base/console/src/com/netscape/admin/certsrv/connection/Response.java
index bbb511443..57958a28b 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/Response.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/Response.java
@@ -39,10 +39,10 @@ public class Response {
private int mRetcode;
private String mErrorMsg;
-
+
//internal structure is changed to vector to maintain
//the ordering
-
+
private Vector mName = new Vector();
private Vector mValue = new Vector();
@@ -70,7 +70,7 @@ public class Response {
}
if (mContents != null) {
String resultStr = new String(mContents);
- StringTokenizer st = new StringTokenizer(resultStr,
+ StringTokenizer st = new StringTokenizer(resultStr,
"&");
while (st.hasMoreTokens()) {
String p = st.nextToken();
@@ -86,12 +86,12 @@ public class Response {
}
}
- public int getReturnCode() {
- return mRetcode;
+ public int getReturnCode() {
+ return mRetcode;
}
- public String getErrorMessage() {
- return mErrorMsg;
+ public String getErrorMessage() {
+ return mErrorMsg;
}
/**
@@ -126,7 +126,7 @@ public class Response {
try {
value = (String) mValue.elementAt(i);
} catch (ArrayIndexOutOfBoundsException e) {
- value = "";
+ value = "";
}
return value;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java b/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
index 7c74a239d..86f7b998e 100644
--- a/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
+++ b/base/console/src/com/netscape/admin/certsrv/connection/SSLConnectionFactory.java
@@ -74,7 +74,7 @@ public class SSLConnectionFactory implements IConnectionFactory {
if (mType.equals(JSS_CONNECTION))
return new JSSConnection(host, port);
- return new JSSConnection(host, port);
+ return new JSSConnection(host, port);
//return new SSLConnection(host, port);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
index 81ffc2d0e..66a2b2bd4 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/CertSetupWizardInfo.java
@@ -215,10 +215,10 @@ public class CertSetupWizardInfo extends WizardInfo {
return (String)get(Constants.PR_ISSUER_NAME);
}
- public String getSerialNumber() {
+ public String getSerialNumber() {
return (String)get(Constants.PR_SERIAL_NUMBER);
}
-
+
public String getNotBefore() {
return (String)get(Constants.PR_BEFORE_VALIDDATE);
}
@@ -306,7 +306,7 @@ public class CertSetupWizardInfo extends WizardInfo {
public String getHashType() {
return (String)get(ConfigConstants.PR_HASH_TYPE);
}
-
+
public void setHashType(String type) {
put(ConfigConstants.PR_HASH_TYPE, type);
}
@@ -314,7 +314,7 @@ public class CertSetupWizardInfo extends WizardInfo {
public String getSignedByType() {
return (String)get(ConfigConstants.PR_SIGNEDBY_TYPE);
}
-
+
public void setSignedByType(String type) {
put(ConfigConstants.PR_SIGNEDBY_TYPE, type);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
index fe5ebd2d7..3a1b9dd23 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCACertRequest1Page.java
@@ -45,7 +45,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "CACERTREQUESTWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WCACertRequest1Page() {
super(PANELNAME);
init();
@@ -59,7 +59,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel {
if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT))
return true;
- return false;
+ return false;
}
public boolean validatePanel() {
@@ -91,7 +91,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel {
gbc.insets = new Insets(COMPONENT_SPACE,COMPONENT_SPACE,
COMPONENT_SPACE,COMPONENT_SPACE);
add(caLbl, gbc);
-
+
mCABtn = makeJRadioButton("SELFSIGN", true);
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
@@ -109,7 +109,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(mSubBtn, gbc);
-
+
ButtonGroup caGroup = new ButtonGroup();
caGroup.add(mCABtn);
caGroup.add(mSubBtn);
@@ -196,7 +196,7 @@ class WCACertRequest1Page extends WizardBasePanel implements IWizardPanel {
public void getUpdateInfo(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
-
+
if (mCABtn.isSelected())
wizardInfo.addEntry(wizardInfo.CA_TYPE, wizardInfo.SELF_SIGNED);
else if (mSubBtn.isSelected())
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
index fe06a6313..c16e3268c 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCAKeyPage.java
@@ -37,7 +37,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel {
private static final String PANELNAME = "CAKEYWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WCAKeyPage() {
super(PANELNAME);
init();
@@ -49,7 +49,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel {
// (wizardInfo.isNewKey()))
return false;
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -61,7 +61,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
AdminConnection connection = wizardInfo.getAdminConnection();
NameValuePairs nvps = new NameValuePairs();
-
+
nvps.add(Constants.PR_TOKEN_NAME, wizardInfo.getTokenName());
nvps.add(Constants.PR_KEY_LENGTH, (String)mKeyLengthBox.getSelectedItem());
nvps.add(Constants.PR_KEY_TYPE, (String)mKeyTypeBox.getSelectedItem());
@@ -69,7 +69,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel {
try {
NameValuePairs response = connection.process(
DestDef.DEST_SERVER_ADMIN,
- ScopeDef.SC_CA_SIGNINGCERT,
+ ScopeDef.SC_CA_SIGNINGCERT,
Constants.PR_CERT_REQUEST, nvps);
} catch (EAdminException e) {
showErrorDialog(e.toString());
@@ -94,7 +94,7 @@ class WCAKeyPage extends WBaseKeyPage implements IWizardPanel {
public void getUpdateInfo(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
- wizardInfo.addEntry(Constants.PR_KEY_LENGTH,
+ wizardInfo.addEntry(Constants.PR_KEY_LENGTH,
(String)mKeyLengthBox.getSelectedItem());
wizardInfo.addEntry(Constants.PR_KEY_TYPE,
(String)mKeyTypeBox.getSelectedItem());
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
index 1c2268bb2..975a09c3d 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNPage.java
@@ -39,7 +39,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel {
"configuration-keycert-wizard-subjectdn-help";
private String certType = "";
-
+
WCertDNPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -98,7 +98,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel {
//enableFields(true, mActiveColor);
if (subjectName != null)
populateDN(subjectName);
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -118,7 +118,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel {
} else {
str = str2;
}
-
+
if (str.equals("")) {
setErrorMessage("BLANKFIELD");
return false;
@@ -135,7 +135,7 @@ class WCertDNPage extends WBaseDNPage implements IWizardPanel {
wizardInfo.addEntry(Constants.PR_SUBJECT_NAME, str);
try {
- connection.validate(DestDef.DEST_SERVER_ADMIN,
+ connection.validate(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_SUBJECT_NAME, nvps);
} catch (EAdminException e) {
//showErrorDialog(e.toString());
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
index d6359cf6c..9a6d17ec8 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertDNValidityPage.java
@@ -37,7 +37,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel {
private static final String PANELNAME = "CERTDNVALIDWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WCertDNValidityPage() {
super(PANELNAME);
init();
@@ -53,7 +53,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel {
(wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA)))
return false;
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -62,7 +62,7 @@ class WCertDNValidityPage extends WBaseDNValidityPage implements IWizardPanel {
public boolean concludePanel(WizardInfo info) {
String str = mSubjectDNText.getText().trim();
-
+
if (str.equals("")) {
setErrorMessage("BLANKFIELD");
return false;
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
index f7505be2e..8b71f6932 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertExtensionPage.java
@@ -32,12 +32,12 @@ import com.netscape.admin.certsrv.config.*;
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.config.install
*/
-class WCertExtensionPage extends WBaseCertExtensionPage implements
+class WCertExtensionPage extends WBaseCertExtensionPage implements
IWizardPanel {
private static final String PANELNAME = "CERTEXTENSION1WIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-extension-help";
-
+
WCertExtensionPage(JDialog parent) {
super(PANELNAME);
mPanelName = PANELNAME;
@@ -68,7 +68,7 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements
return false;
String title = "";
-
+
if (!mModified) {
String certType = wizardInfo.getCertType();
if (certType.equals(Constants.PR_CA_SIGNING_CERT)) {
@@ -195,13 +195,13 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements
if (mMIMECheckBox.isSelected())
nvps.put(Constants.PR_DER_EXTENSION, mMIMEText.getText().trim());
- wizardInfo.addEntry(wizardInfo.ALL_INFO, nvps);
+ wizardInfo.addEntry(wizardInfo.ALL_INFO, nvps);
mModified = true;
return true;
}
- private void addValidityPeriod(CertSetupWizardInfo wizardInfo,
+ private void addValidityPeriod(CertSetupWizardInfo wizardInfo,
NameValuePairs nvps) {
nvps.put(Constants.PR_BEGIN_YEAR, wizardInfo.getBeginYear());
nvps.put(Constants.PR_BEGIN_MONTH, wizardInfo.getBeginMonth());
@@ -229,7 +229,7 @@ class WCertExtensionPage extends WBaseCertExtensionPage implements
private void addExtendedKey(NameValuePairs nvps) {
- if (mSSLClient.isSelected())
+ if (mSSLClient.isSelected())
nvps.put(Constants.PR_SSL_CLIENT_BIT, Constants.TRUE);
if (mSSLServer.isSelected())
nvps.put(Constants.PR_SSL_SERVER_BIT, Constants.TRUE);
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
index a378e91d3..bc5875589 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertMessageDigestPage.java
@@ -39,7 +39,7 @@ import com.netscape.admin.certsrv.task.*;
* @see com.netscape.admin.certsrv.config.install
*/
class WCertMessageDigestPage extends WMessageDigestPage {
-
+
private static final String PANELNAME = "CERTMESSAGEDIGESTWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-messagedigest-help";
@@ -63,9 +63,9 @@ class WCertMessageDigestPage extends WMessageDigestPage {
if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE))
return false;
-
+
if ((wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA))
- && !(wizardInfo.isSSLCertLocalCA()))
+ && !(wizardInfo.isSSLCertLocalCA()))
return false;
if (!wizardInfo.isNewKey())
@@ -85,15 +85,15 @@ class WCertMessageDigestPage extends WMessageDigestPage {
// non-signing cert, algorithm specified by CA
return false;
}
-
- return super.initializePanel(info);
+
+ return super.initializePanel(info);
}
public void getUpdateInfo(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
- if (mDSAHashTypeBox.isVisible())
+ if (mDSAHashTypeBox.isVisible())
wizardInfo.setHashType((String)mDSAHashTypeBox.getSelectedItem());
- else if (mECCHashTypeBox.isVisible())
+ else if (mECCHashTypeBox.isVisible())
wizardInfo.setHashType((String)mECCHashTypeBox.getSelectedItem());
else if (mRSAHashTypeBox.isVisible())
wizardInfo.setHashType((String)mRSAHashTypeBox.getSelectedItem());
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
index 8fa126148..2099a736f 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertRequestPage.java
@@ -36,7 +36,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel {
private static final String PANELNAME = "COPYCERTREQUESTWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WCertRequestPage() {
super(PANELNAME);
init();
@@ -48,7 +48,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel {
public boolean initializePanel(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
-
+
if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE) ||
wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED))
return false;
@@ -57,7 +57,7 @@ class WCertRequestPage extends WBaseCertRequestPage implements IWizardPanel {
// mText.setText(CMSAdminUtil.certRequestWrapText(str, 40));
mText.setText(str);
setBorder(makeTitledBorder("COPYCERTREQUESTWIZARD"));
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
index 88350fc32..71226f9d7 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertTypePage.java
@@ -49,7 +49,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
private static final String PANELNAME = "CERTTYPEWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-certtype-help";
-
+
WCertTypePage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -87,10 +87,10 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
for (String name : response.keySet()) {
String type = response.get(name);
- if (type.equals(Constants.PR_RA_INSTANCE))
+ if (type.equals(Constants.PR_RA_INSTANCE))
mRASigningCert = mResource.getString(
"CERTTYPEWIZARD_LABEL_RASIGNINGCERT_LABEL");
- else if (type.equals(Constants.PR_CA_INSTANCE))
+ else if (type.equals(Constants.PR_CA_INSTANCE))
mCASigningCert = mResource.getString(
"CERTTYPEWIZARD_LABEL_CASIGNINGCERT_LABEL");
else if (type.equals(Constants.PR_KRA_INSTANCE))
@@ -175,7 +175,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
CMSAdminUtil.repaintComp(mCALbl);
CMSAdminUtil.repaintComp(mCertType);
CMSAdminUtil.repaintComp(mCertTypeText);
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -202,23 +202,23 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
else if (mRASigningCert != null && item.equals(mRASigningCert.trim()))
wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
Constants.PR_RA_SIGNING_CERT);
- else if (mKRATransportCert != null &&
+ else if (mKRATransportCert != null &&
item.equals(mKRATransportCert.trim()))
wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
Constants.PR_KRA_TRANSPORT_CERT);
else if (mServerCert != null && item.equals(mServerCert.trim()))
- wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
+ wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
Constants.PR_SERVER_CERT);
else if (mServerCertRadm != null && item.equals(mServerCertRadm.trim()))
- wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
+ wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
Constants.PR_SERVER_CERT_RADM);
else if (mOCSPSigningCert != null && item.equals(mOCSPSigningCert.trim()))
- wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
+ wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
Constants.PR_OCSP_SIGNING_CERT);
- else if (mOtherCert != null && item.equals(mOtherCert.trim()))
- wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
+ else if (mOtherCert != null && item.equals(mOtherCert.trim()))
+ wizardInfo.put(Constants.PR_CERTIFICATE_TYPE,
Constants.PR_OTHER_CERT);
-
+
if (item.equals(mOtherCert.trim())) {
try {
NameValuePairs response = null;
@@ -295,7 +295,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
gbc.weightx = 1.0;
gbc.gridwidth = gbc.REMAINDER;
add(dummy, gbc);
-
+
mCertType = createTextArea(mResource.getString(
PANELNAME+"_LABEL_CERTTYPE_LABEL"));
CMSAdminUtil.resetGBC(gbc);
@@ -304,7 +304,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(mCertType, gbc);
-
+
/*
JLabel dummy1 = new JLabel(" ");
CMSAdminUtil.resetGBC(gbc);
@@ -321,7 +321,7 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
COMPONENT_SPACE,COMPONENT_SPACE);
add(mCertTypeText, gbc);
mActiveColor = mCertTypeText.getBackground();
-
+
JLabel dummy2 = new JLabel(" ");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
@@ -463,21 +463,21 @@ class WCertTypePage extends WizardBasePanel implements IWizardPanel,
mResource.getString("CERTTYPEWIZARD_TEXT_CATYPE_LABEL");
b1 =
mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SELFSIGN_LABEL");
- b2 =
+ b2 =
mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SUBORDINATE_LABEL");
} else if (type.equals("server")) {
label =
mResource.getString("CERTTYPEWIZARD_TEXT_SERVERTYPE_LABEL");
b1 =
mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SERVER_SELFSIGN_LABEL");
- b2 =
+ b2 =
mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SERVER_SUBORDINATE_LABEL");
} else if (type.equals("ocspsigning")) {
label =
mResource.getString("CERTTYPEWIZARD_TEXT_OCSPTYPE_LABEL");
b1 =
mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SELFSIGNOCSP_LABEL");
- b2 =
+ b2 =
mResource.getString("CERTTYPEWIZARD_RADIOBUTTON_SUBORDINATEOCSP_LABEL");
}
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
index 8567703d4..11476e046 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WCertValidityPage.java
@@ -40,7 +40,7 @@ class WCertValidityPage extends WBaseValidityPage implements IWizardPanel {
private String mCertType = "";
private static final String HELPINDEX =
"configuration-keycert-wizard-validityperiod-help";
-
+
WCertValidityPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -81,7 +81,7 @@ class WCertValidityPage extends WBaseValidityPage implements IWizardPanel {
title = mResource.getString("CERTVALIDWIZARD_BORDER_SERVER_LABEL");
setBorder(new TitledBorder(title));
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
index a7fe56352..3e1f557d5 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WDisplayCertPage.java
@@ -44,7 +44,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel {
private JTextArea mTextArea;
private JTextField mCertNameField;
private Color mActiveColor;
-
+
WDisplayCertPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -84,7 +84,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel {
mCertNameField.setText(certName);
CMSAdminUtil.repaintComp(mCertNameField);
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -94,7 +94,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel {
setErrorMessage("EMPTYCERTNAME");
return false;
}
- }
+ }
return true;
}
@@ -150,7 +150,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel {
}
wizardInfo.addEntry(Constants.PR_ADD_CERT, new Boolean(true));
/*
- CMSAdminUtil.showMessageDialog(mResource, PANELNAME,
+ CMSAdminUtil.showMessageDialog(mResource, PANELNAME,
"INSTALL", JOptionPane.INFORMATION_MESSAGE);
*/
return true;
@@ -182,7 +182,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel {
COMPONENT_SPACE, COMPONENT_SPACE);
add(mCertNameField, gbc);
mActiveColor = mCertNameField.getBackground();
-
+
mCertNameField.setEditable(false);
mCertNameField.setBackground(getBackground());
mCertNameField.setEnabled(false);
@@ -245,7 +245,7 @@ class WDisplayCertPage extends WizardBasePanel implements IWizardPanel {
}
private String[] parseStr(String dn) {
- StringTokenizer tokenizer = new StringTokenizer(dn, ",");
+ StringTokenizer tokenizer = new StringTokenizer(dn, ",");
int numTokens = tokenizer.countTokens();
String[] results = new String[numTokens];
int i=0;
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
index d13bca6e4..c505219b9 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecute1Page.java
@@ -37,7 +37,7 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel {
private static final String HELPINDEX =
"configuration-keycert-wizard-certrequest-help";
private JTextArea desc;
-
+
WExecute1Page(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -58,8 +58,8 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel {
public boolean initializePanel(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) &&
-// !wizardInfo.isNewKey() &&
- wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA) &&
+// !wizardInfo.isNewKey() &&
+ wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA) &&
!(wizardInfo.isSSLCertLocalCA())) {
String title = "";
@@ -78,7 +78,7 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel {
else if (certType.equals(Constants.PR_OTHER_CERT))
title = mResource.getString("EXECUTE1WIZARD_BORDER_OTHER_LABEL");
setBorder(new TitledBorder(title));
-
+
String str = "";
if (wizardInfo.isNewKey()) {
str = mResource.getString("EXECUTE1WIZARD_TEXT_NEWKEY_LABEL");
@@ -88,8 +88,8 @@ class WExecute1Page extends WizardBasePanel implements IWizardPanel {
desc.setText(str);
return true;
}
-
- return false;
+
+ return false;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
index a3ce14257..7543b54e6 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WExecutePage.java
@@ -36,7 +36,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel {
private static final String HELPINDEX =
"configuration-keycert-wizard-selfsignedcert-help";
private JTextArea desc;
-
+
WExecutePage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -57,34 +57,34 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel {
public boolean initializePanel(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) &&
-// !wizardInfo.isNewKey() &&
+// !wizardInfo.isNewKey() &&
((wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) &&
wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED))
||
- (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT) &&
+ (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT) &&
wizardInfo.isSSLCertLocalCA())
||
- (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT) &&
+ (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT) &&
wizardInfo.isSSLCertLocalCA())
||
- (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT_RADM) &&
+ (wizardInfo.getCertType().equals(Constants.PR_SERVER_CERT_RADM) &&
wizardInfo.isSSLCertLocalCA()))) {
-
+
setBorder(makeTitledBorder(PANELNAME));
if (wizardInfo.isNewKey()) {
String str = mResource.getString(
"EXECUTEWIZARD_TEXT_NEWKEY_LABEL");
desc.setText(str);
- } else {
+ } else {
String str = mResource.getString(
"EXECUTEWIZARD_TEXT_OLDKEY_LABEL");
desc.setText(str);
}
return true;
}
-
- return false;
+
+ return false;
}
public boolean validatePanel() {
@@ -98,7 +98,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel {
CMSServerInfo serverInfo = wizardInfo.getServerInfo();
String dir = "";
- if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT))
+ if (wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT))
dir = "prevCACert.txt";
else if (wizardInfo.getCertType().equals(Constants.PR_OCSP_SIGNING_CERT))
dir = "prevOCSPCert.txt";
@@ -110,7 +110,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel {
NameValuePairs nvps = wizardInfo.getNameValuePairs();
if (wizardInfo.isNewKey()) {
- if (wizardInfo.getHashType() != null)
+ if (wizardInfo.getHashType() != null)
nvps.put(ConfigConstants.PR_HASH_TYPE, wizardInfo.getHashType());
if (wizardInfo.getSignedByType() != null)
nvps.put(ConfigConstants.PR_SIGNEDBY_TYPE, wizardInfo.getSignedByType());
@@ -126,7 +126,7 @@ class WExecutePage extends WizardBasePanel implements IWizardPanel {
endProgressStatus();
return false;
}
-
+
endProgressStatus();
return true;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
index b2a0005b6..ea8a6b191 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WGenerateReqPage.java
@@ -34,7 +34,7 @@ class WGenerateReqPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "GENERATEREQWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WGenerateReqPage() {
super(PANELNAME);
init();
@@ -48,7 +48,7 @@ class WGenerateReqPage extends WizardBasePanel implements IWizardPanel {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE))
return false;
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
index 0ea476b6a..39edb1666 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallCertChainPage.java
@@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*;
import com.netscape.certsrv.common.*;
/**
- * This page allows the user to do such selections as the installation of
+ * This page allows the user to do such selections as the installation of
* certificates, server certificate chain, or trusted CA.
*
* @author Christine Ho
@@ -40,7 +40,7 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "INSTALLCERTCHAINWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-installcerttype-help";
-
+
WInstallCertChainPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -109,11 +109,11 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(opLbl, gbc);
-
+
mCertBox = makeJComboBox("CERTCHAINTYPE");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
- gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE,
+ gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE,
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.weighty = 1.0;
add(mCertBox, gbc);
@@ -134,7 +134,7 @@ class WInstallCertChainPage extends WizardBasePanel implements IWizardPanel {
String str = (String)(mCertBox.getSelectedItem());
if (str.startsWith("Trusted")) {
wizardInfo.addEntry(wizardInfo.INSTALLCERTTYPE, Constants.PR_TRUSTED_CA_CERT);
- } else if (str.startsWith("Untrusted")) {
+ } else if (str.startsWith("Untrusted")) {
wizardInfo.addEntry(wizardInfo.INSTALLCERTTYPE, Constants.PR_SERVER_CERT_CHAIN);
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
index 5b4d2d340..1cdc6f8d5 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallOpPage.java
@@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*;
import com.netscape.certsrv.common.*;
/**
- * This page allows the user to do such selections as the installation of
+ * This page allows the user to do such selections as the installation of
* certificates, server certificate chain, or trusted CA.
*
* @author Christine Ho
@@ -45,7 +45,7 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "INSTALLOPWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-installcerttype-help";
-
+
WInstallOpPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -138,12 +138,12 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel {
}
if (mCrossCert != null) {
- mCertBox.addItem(mCrossCert);
+ mCertBox.addItem(mCrossCert);
mCerts.addElement(Constants.PR_CROSS_CERT);
}
if (mOtherCert != null) {
- mCertBox.addItem(mOtherCert);
+ mCertBox.addItem(mOtherCert);
mCerts.addElement(Constants.PR_OTHER_CERT);
}
@@ -154,7 +154,7 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel {
}
mCertBox.setSelectedIndex(0);
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -193,11 +193,11 @@ class WInstallOpPage extends WizardBasePanel implements IWizardPanel {
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.gridwidth = gbc.REMAINDER;
add(opLbl, gbc);
-
+
mCertBox = makeJComboBox("CERTTYPE");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
- gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE,
+ gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE,
COMPONENT_SPACE,COMPONENT_SPACE);
gbc.weighty = 1.0;
add(mCertBox, gbc);
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
index 25022bbb9..86eedad78 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WInstallStatusPage.java
@@ -36,7 +36,7 @@ class WInstallStatusPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "INSTALLSTATUSWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-installcertstatus-help";
-
+
WInstallStatusPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -61,13 +61,13 @@ class WInstallStatusPage extends WizardBasePanel implements IWizardPanel {
if (wizardInfo.isCertAdded().booleanValue())
mDesc.setText(mResource.getString(
"INSTALLSTATUSWIZARD_TEXT_SUCCESS_LABEL"));
- else
+ else
mDesc.setText(mResource.getString(
"INSTALLSTATUSWIZARD_TEXT_FAIL_LABEL"));
setBorder(makeTitledBorder(PANELNAME));
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
index 18c6ef068..549c5aa2b 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroInstallCertPage.java
@@ -35,7 +35,7 @@ class WIntroInstallCertPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "INTROINSTALLCERTWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WIntroInstallCertPage() {
super(PANELNAME);
init();
@@ -49,7 +49,7 @@ class WIntroInstallCertPage extends WizardBasePanel implements IWizardPanel {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE))
return false;
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
index abcec63f3..116f3a496 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIntroPage.java
@@ -35,7 +35,7 @@ class WIntroPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "INTROKEYCERTWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-introduction-help";
-
+
WIntroPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -51,7 +51,7 @@ class WIntroPage extends WizardBasePanel implements IWizardPanel {
public boolean initializePanel(WizardInfo info) {
setBorder(makeTitledBorder(PANELNAME));
- return true;
+ return true;
}
public boolean isLastPage() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
index 65e02ddd7..3807a1824 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WIssueImportStatusPage.java
@@ -36,7 +36,7 @@ class WIssueImportStatusPage extends WizardBasePanel implements IWizardPanel {
private static final String HELPINDEX =
"configuration-keycert-wizard-selfsignedstatus-help";
private JTextArea desc;
-
+
WIssueImportStatusPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -61,8 +61,8 @@ class WIssueImportStatusPage extends WizardBasePanel implements IWizardPanel {
str = mResource.getString(
"ISSUEIMPORTSTATUSWIZARD_TEXT_DESC_LABEL");
desc.setText(str);
- return true;
- }
+ return true;
+ }
return false;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
index 40d601c1d..6c9038ffa 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WKeyPage.java
@@ -54,7 +54,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
private CertSetupWizardInfo wizardInfo;
private static final String HELPINDEX =
"configuration-keycert-wizard-key-help";
-
+
WKeyPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -79,7 +79,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
String title = "";
String certType = wizardInfo.getCertType();
- if (certType.equals(Constants.PR_CA_SIGNING_CERT))
+ if (certType.equals(Constants.PR_CA_SIGNING_CERT))
title = mResource.getString("KEYWIZARD_BORDER_CASIGNING_LABEL");
else if (certType.equals(Constants.PR_RA_SIGNING_CERT))
title = mResource.getString("KEYWIZARD_BORDER_RASIGNING_LABEL");
@@ -92,7 +92,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
title = mResource.getString("KEYWIZARD_BORDER_SERVER_LABEL");
else if (certType.equals(Constants.PR_OTHER_CERT))
title = mResource.getString("KEYWIZARD_BORDER_OTHER_LABEL");
-
+
setBorder(new TitledBorder(title));
if (certType.equals(Constants.PR_OTHER_CERT)) {
mNicknamePanel.setVisible(true);
@@ -101,7 +101,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
if (mNicknameBox.getItemCount() <= 0) {
String str = wizardInfo.getNicknames();
StringTokenizer tokenizer1 = new StringTokenizer(str, ",");
- while (tokenizer1.hasMoreTokens()) {
+ while (tokenizer1.hasMoreTokens()) {
mNicknameBox.addItem((String)tokenizer1.nextToken());
}
}
@@ -179,7 +179,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
CMSAdminUtil.repaintComp(mNicknameLbl);
CMSAdminUtil.repaintComp(mNicknameBox);
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -208,7 +208,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
if (str.equals("")) {
setErrorMessage("BLANKCURVE");
return false;
- }
+ }
}*/
return true;
@@ -232,11 +232,11 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
if (val.equals("Custom")) {
if (mKeyCurveBox.isVisible()) { // ECC
- wizardInfo.addEntry(Constants.PR_KEY_CURVENAME,
+ wizardInfo.addEntry(Constants.PR_KEY_CURVENAME,
mKeyCurveText.getText().trim());
nvps.put(Constants.PR_KEY_CURVENAME, mKeyCurveText.getText().trim());
} else {
- wizardInfo.addEntry(Constants.PR_KEY_LENGTH,
+ wizardInfo.addEntry(Constants.PR_KEY_LENGTH,
mKeyLengthText.getText().trim());
nvps.put(Constants.PR_KEY_LENGTH, mKeyLengthText.getText().trim());
}
@@ -249,7 +249,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
nvps.put(Constants.PR_KEY_LENGTH, val.trim());
}
}
-
+
if (mKeyTypeBox.isVisible()) {
wizardInfo.addEntry(Constants.PR_KEY_TYPE,
(String)mKeyTypeBox.getSelectedItem());
@@ -285,13 +285,13 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
nvps.put(Constants.PR_NICKNAME, nicknameStr);
response = connection.process(
DestDef.DEST_SERVER_ADMIN,
- ScopeDef.SC_SUBJECT_NAME,
+ ScopeDef.SC_SUBJECT_NAME,
wizardInfo.getCertType(), nvps);
wizardInfo.addEntry(Constants.PR_NICKNAME, nicknameStr);
} else {
response = connection.read(
DestDef.DEST_SERVER_ADMIN,
- ScopeDef.SC_SUBJECT_NAME,
+ ScopeDef.SC_SUBJECT_NAME,
wizardInfo.getCertType(), nvps);
}
@@ -301,13 +301,13 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
if (mNewKeyBtn.isSelected()) {
String tokenName = (String)mTokenBox.getSelectedItem();
- if (tokenName.equals("internal"))
+ if (tokenName.equals("internal"))
tokenName = Constants.PR_INTERNAL_TOKEN_NAME;
nvps.clear();
nvps.put(Constants.PR_TOKEN_NAME, tokenName);
response = connection.process(DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_TOKEN_STATUS, Constants.RS_ID_CONFIG, nvps);
-
+
String value = response.get(Constants.PR_LOGGED_IN);
wizardInfo.addEntry(Constants.PR_LOGGED_IN, value);
wizardInfo.addEntry(Constants.PR_TOKEN_NAME, tokenName);
@@ -342,7 +342,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE,
COMPONENT_SPACE, COMPONENT_SPACE);
add(panel, gbc);
-
+
JTextArea selectTokenLbl = createTextArea(mResource.getString(
PANELNAME+"_LABEL_SELECTTOKEN_LABEL"));
CMSAdminUtil.resetGBC(gbc);
@@ -350,7 +350,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
gbc.gridwidth = gbc.REMAINDER;
gbc.insets = new Insets(0, 0, COMPONENT_SPACE,0);
panel.add(selectTokenLbl, gbc);
-
+
mTokenLbl = makeJLabel("TOKEN");
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.CENTER;
@@ -386,7 +386,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
gbc.gridwidth = gbc.REMAINDER;
add(createKeyLbl, gbc);
- mExistingKeyBtn = makeJRadioButton("OLDKEY", true);
+ mExistingKeyBtn = makeJRadioButton("OLDKEY", true);
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTHWEST;
gbc.weightx = 1.0;
@@ -403,7 +403,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
gbc.anchor = gbc.NORTHWEST;
gbc.gridwidth = gbc.REMAINDER;
gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE,
- COMPONENT_SPACE, COMPONENT_SPACE);
+ COMPONENT_SPACE, COMPONENT_SPACE);
gbc.fill = gbc.BOTH;
gbc.weightx = 1.0;
add(mNicknamePanel, gbc);
@@ -704,18 +704,18 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
public void itemStateChanged(ItemEvent e) {
if (e.getSource().equals(mKeyLengthBox) ||
- e.getSource().equals(mKeyCurveBox) ||
+ e.getSource().equals(mKeyCurveBox) ||
e.getSource().equals(mDSAKeyLengthBox)) {
enableKeyLengthFields();
- } else if (e.getSource().equals(mKeyTypeBox) ||
+ } else if (e.getSource().equals(mKeyTypeBox) ||
e.getSource().equals(mDSAKeyTypeBox)) {
String type = "";
if (mKeyTypeBox.isVisible())
type = (String)mKeyTypeBox.getSelectedItem();
else if (mDSAKeyTypeBox.isVisible())
type = (String)mDSAKeyTypeBox.getSelectedItem();
-
- setLengthCurveFields(type);
+
+ setLengthCurveFields(type);
enableKeyLengthFields();
CMSAdminUtil.repaintComp(this);
}
@@ -723,10 +723,10 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
private void enableKeyLengthFields() {
String value = "";
-
+
if (mKeyLengthBox.isVisible())
value = (String)mKeyLengthBox.getSelectedItem();
- else if (mKeyCurveBox.isVisible())
+ else if (mKeyCurveBox.isVisible())
value = (String)mKeyCurveBox.getSelectedItem();
else
value = (String)mDSAKeyLengthBox.getSelectedItem();
@@ -750,7 +750,7 @@ class WKeyPage extends WizardBasePanel implements IWizardPanel, ItemListener {
}
}
- protected void enableFields(JComponent comp1, JTextComponent comp2,
+ protected void enableFields(JComponent comp1, JTextComponent comp2,
boolean enable, Color color) {
if (comp1 != null) {
comp1.setEnabled(enable);
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
index 4ad069133..ebbbd6be2 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WManualCertRequestPage.java
@@ -50,7 +50,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza
private static final String PANELNAME = "MANUALCERTREQUESTWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-displaycertrequest-help";
-
+
WManualCertRequestPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -70,7 +70,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza
public boolean initializePanel(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
-
+
if (wizardInfo.getOperationType().equals(wizardInfo.INSTALLTYPE) ||
wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED))
return false;
@@ -120,7 +120,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza
if (port != null && !port.equals(""))
mPortText.setText(port);
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -135,7 +135,7 @@ class WManualCertRequestPage extends WBaseManualCertRequestPage implements IWiza
if (mHost != null && !mHost.equals(""))
wizardInfo.setCMHost(mHost);
if (mPort != null && !mPort.equals(""))
- wizardInfo.setCMEEPort(mPort);
+ wizardInfo.setCMEEPort(mPort);
if (mSSL.isSelected())
wizardInfo.setCMEEType("https");
else
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
index f2cdeff3d..c9d867466 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOperationSelectionPage.java
@@ -78,7 +78,7 @@ class WOperationSelectionPage extends WizardBasePanel implements IWizardPanel {
startProgressStatus();
if (mRequestBtn.isSelected())
info.addEntry(wizardInfo.OPTYPE, wizardInfo.REQUESTTYPE);
- else
+ else
info.addEntry(wizardInfo.OPTYPE, wizardInfo.INSTALLTYPE);
endProgressStatus();
return true;
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
index 1dbd614d1..aa4b32ff1 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WOtherCertRequest1Page.java
@@ -40,7 +40,7 @@ class WOtherCertRequest1Page extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "CACERTREQUESTWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WOtherCertRequest1Page() {
super(PANELNAME);
init();
@@ -59,7 +59,7 @@ class WOtherCertRequest1Page extends WizardBasePanel implements IWizardPanel {
if (type.equals(Constants.PR_CA_SIGNING_CERT))
return false;
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
index 50e14a50e..65aca8241 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WPasteCertPage.java
@@ -27,8 +27,8 @@ import com.netscape.admin.certsrv.wizard.*;
import com.netscape.certsrv.common.*;
/**
- * This page is to install the certificate in the internal token. The user can
- * import the cert from the file or paste the Base 64 encoded blob in the
+ * This page is to install the certificate in the internal token. The user can
+ * import the cert from the file or paste the Base 64 encoded blob in the
* text area.
*
* @author Christine Ho
@@ -48,7 +48,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "PASTECERTWIZARD";
private static final String HELPINDEX =
"configuration-keycert-wizard-pastecert-help";
-
+
WPasteCertPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -71,7 +71,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel {
if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE))
return false;
setBorder(makeTitledBorder(PANELNAME));
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -114,7 +114,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel {
NameValuePairs response = connection.process(
DestDef.DEST_SERVER_ADMIN,
ScopeDef.SC_CERTINFO, wizardInfo.getInstallCertType(), nvps);
-
+
for (String name : response.keySet()) {
String str = response.get(name);
wizardInfo.addEntry(name, str);
@@ -198,7 +198,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel {
mBase64Text = new JTextArea(null, null, 0, 0);
Font f = new Font("Monospaced", Font.PLAIN, 12);
if (f != null) mBase64Text.setFont(f);
- JScrollPane scrollPane = new JScrollPane(mBase64Text,
+ JScrollPane scrollPane = new JScrollPane(mBase64Text,
JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
scrollPane.setPreferredSize(new Dimension(50, 20));
@@ -206,7 +206,7 @@ class WPasteCertPage extends WizardBasePanel implements IWizardPanel {
gbc.anchor = gbc.NORTHWEST;
gbc.weightx = 1.0;
gbc.weighty = 1.0;
- gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, 0,
+ gbc.insets = new Insets(COMPONENT_SPACE, 4*COMPONENT_SPACE, 0,
COMPONENT_SPACE);
gbc.fill = gbc.BOTH;
gbc.gridwidth = gbc.REMAINDER;
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
index 616deb74f..e18488696 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRAKeyPage.java
@@ -37,7 +37,7 @@ class WRAKeyPage extends WBaseKeyPage implements IWizardPanel {
private static final String PANELNAME = "RAKEYWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WRAKeyPage() {
super(PANELNAME);
init();
@@ -48,7 +48,7 @@ class WRAKeyPage extends WBaseKeyPage implements IWizardPanel {
}
public boolean initializePanel(WizardInfo info) {
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
index a52def44a..124a819d6 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WRequestStatusPage.java
@@ -37,9 +37,9 @@ class WRequestStatusPage extends WizardBasePanel implements IWizardPanel {
private static final String HELPINDEX =
"configuration-keycert-wizard-certrequeststatus-help";
protected JTextArea mDesc;
-
+
protected String mRequestId;
-
+
WRequestStatusPage(JDialog parent) {
super(PANELNAME);
mParent = parent;
@@ -78,15 +78,15 @@ class WRequestStatusPage extends WizardBasePanel implements IWizardPanel {
mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_REJECT_LABEL") + error + "\n\n"+ mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str + mResource.getString("REQUESTRESULTWIZARD_TEXT_REJECTEND_LABEL"));
} else {
// success
- mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") +
- mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str +
+ mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") +
+ mResource.getString("REQUESTRESULTWIZARD_TEXT_ID_LABEL") + str +
mResource.getString("REQUESTRESULTWIZARD_TEXT_END_LABEL"));
}
}
else if (error != null)
mDesc.setText(error);
else
- mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") +
+ mDesc.setText(mResource.getString("REQUESTRESULTWIZARD_TEXT_DESC_LABEL") +
mResource.getString("REQUESTRESULTWIZARD_TEXT_NOID_LABEL"));
}
return true;
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
index 7065f68b6..36c626751 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WSSLKeyPage.java
@@ -37,7 +37,7 @@ class WSSLKeyPage extends WBaseKeyPage implements IWizardPanel {
private static final String PANELNAME = "SSLKEYWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WSSLKeyPage() {
super(PANELNAME);
init();
@@ -48,7 +48,7 @@ class WSSLKeyPage extends WBaseKeyPage implements IWizardPanel {
}
public boolean initializePanel(WizardInfo info) {
- return true;
+ return true;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
index 53a623d0a..b1fd2031c 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenLogonPage.java
@@ -26,7 +26,7 @@ import com.netscape.admin.certsrv.wizard.*;
import com.netscape.certsrv.common.*;
/**
- * This panel asks for the user to logon to the keycert token .
+ * This panel asks for the user to logon to the keycert token .
*
* @author Christine Ho
* @version $Revision$, $Date$
@@ -69,7 +69,7 @@ class WTokenLogonPage extends WizardBasePanel implements IWizardPanel {
mDesc.setText(mResource.getString(mPanelName+"_TEXT_HEADING_LABEL"));
mTokenNameText.setText(wizardInfo.getTokenName());
- return true;
+ return true;
}
public boolean validatePanel() {
@@ -154,7 +154,7 @@ class WTokenLogonPage extends WizardBasePanel implements IWizardPanel {
gbc.insets = new Insets(0, COMPONENT_SPACE, COMPONENT_SPACE,
COMPONENT_SPACE);
add(passwordLabel, gbc);
-
+
CMSAdminUtil.resetGBC(gbc);
mPasswordText = makeJPasswordField(30);
gbc.anchor = gbc.NORTHWEST;
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
index b595e1ffd..4f5f7c6de 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WTokenSelectionPage.java
@@ -67,7 +67,7 @@ class WTokenSelectionPage extends WizardBasePanel implements IWizardPanel {
info.addEntry(wizardInfo.TOKENNAME, (String)mToken.getSelectedItem());
if (mRequestBtn.isSelected())
info.addEntry(wizardInfo.OPTYPE, wizardInfo.REQUESTTYPE);
- else
+ else
info.addEntry(wizardInfo.OPTYPE, wizardInfo.INSTALLTYPE);
return true;
}
@@ -138,7 +138,7 @@ class WTokenSelectionPage extends WizardBasePanel implements IWizardPanel {
gbc.weightx = 1.0;
gbc.fill = gbc.NONE;
gbc.weighty = 0.0;
- gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE,
+ gbc.insets = new Insets(COMPONENT_SPACE, COMPONENT_SPACE,
COMPONENT_SPACE,COMPONENT_SPACE);
add(mToken, gbc);
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
index be844576c..d2e0b3c58 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecute1Page.java
@@ -38,7 +38,7 @@ class WWarningExecute1Page extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "WARNINGEXECUTE1WIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WWarningExecute1Page() {
super(PANELNAME);
init();
@@ -51,12 +51,12 @@ class WWarningExecute1Page extends WizardBasePanel implements IWizardPanel {
public boolean initializePanel(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) &&
- wizardInfo.isNewKey() &&
+ wizardInfo.isNewKey() &&
wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) &&
wizardInfo.getCAType().equals(wizardInfo.SUBORDINATE_CA))
return true;
-
- return false;
+
+ return false;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
index a64f67188..a0559f6fb 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningExecutePage.java
@@ -38,7 +38,7 @@ class WWarningExecutePage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "WARNINGEXECUTEWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WWarningExecutePage() {
super(PANELNAME);
init();
@@ -51,12 +51,12 @@ class WWarningExecutePage extends WizardBasePanel implements IWizardPanel {
public boolean initializePanel(WizardInfo info) {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) &&
- wizardInfo.isNewKey() &&
+ wizardInfo.isNewKey() &&
wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT) &&
wizardInfo.getCAType().equals(wizardInfo.SELF_SIGNED))
return true;
-
- return false;
+
+ return false;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
index 7a4eabe57..c20cbb8ea 100644
--- a/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
+++ b/base/console/src/com/netscape/admin/certsrv/keycert/WWarningPage.java
@@ -38,7 +38,7 @@ class WWarningPage extends WizardBasePanel implements IWizardPanel {
private static final String PANELNAME = "WARNINGWIZARD";
private static final String HELPINDEX =
"configuration-kra-wizard-change-keyscheme-help";
-
+
WWarningPage() {
super(PANELNAME);
init();
@@ -52,11 +52,11 @@ class WWarningPage extends WizardBasePanel implements IWizardPanel {
CertSetupWizardInfo wizardInfo = (CertSetupWizardInfo)info;
if (wizardInfo.getOperationType().equals(wizardInfo.REQUESTTYPE) &&
- wizardInfo.isNewKey() &&
+ wizardInfo.isNewKey() &&
wizardInfo.getCertType().equals(Constants.PR_CA_SIGNING_CERT))
return true;
-
- return false;
+
+ return false;
}
public boolean validatePanel() {
diff --git a/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
index 3a5c43705..f9779c5e5 100644
--- a/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
@@ -46,7 +46,7 @@ public class CertificateInfoDialog extends JDialog
private String mCertName;
private String mCertDate;
private JButton mActionBtn;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-managecert-wizard-trustcert-help";
JLabel changeLbl = null;
@@ -61,7 +61,7 @@ public class CertificateInfoDialog extends JDialog
getRootPane().setDoubleBuffered(true);
setDisplay();
}
-
+
public void showDialog(String name, String content, String trust) {
mCertNameField.setText(name);
mTextArea.setText(content);
@@ -69,13 +69,13 @@ public class CertificateInfoDialog extends JDialog
String statusStr = "";
if (trust.equals("Trust")) {
//mTrust.setText(" Trust ");
- actionStr = mResource.getString(PREFIX+"_BUTTON_UNTRUST_LABEL");
+ actionStr = mResource.getString(PREFIX+"_BUTTON_UNTRUST_LABEL");
statusStr = mResource.getString(PREFIX+"_LABEL_TRUSTSTATUS_LABEL");
mActionBtn.setText(actionStr);
mStatusLbl.setText(statusStr);
} else if (trust.equals("Untrust")){
//mTrust.setText(trust);
- actionStr = mResource.getString(PREFIX+"_BUTTON_TRUST_LABEL");
+ actionStr = mResource.getString(PREFIX+"_BUTTON_TRUST_LABEL");
statusStr = mResource.getString(PREFIX+"_LABEL_UNTRUSTSTATUS_LABEL");
mActionBtn.setText(actionStr);
mStatusLbl.setText(statusStr);
@@ -89,7 +89,7 @@ public class CertificateInfoDialog extends JDialog
}
this.show();
}
-
+
public void showDialog(String name, String content, String trust,
String date, AdminConnection conn) {
mConn = conn;
@@ -117,9 +117,9 @@ public class CertificateInfoDialog extends JDialog
NameValuePairs nvps = new NameValuePairs();
String value = mCertName+";"+mCertDate;
nvps.put("certName0", value);
-
+
try {
- mConn.modify(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_TRUST,
+ mConn.modify(DestDef.DEST_SERVER_ADMIN, ScopeDef.SC_TRUST,
trust, nvps);
String actionStr = "";
String statusStr = "";
@@ -194,9 +194,9 @@ public class CertificateInfoDialog extends JDialog
}
private JPanel makeActionPane() {
- mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE",
+ mClose = CMSAdminUtil.makeJButton(mResource, PREFIX, "CLOSE",
null, this);
-
+
mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
Dimension d = mClose.getMinimumSize();
if (d.width < CMSAdminUtil.DEFAULT_BUTTON_SIZE) {
diff --git a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
index 4fd902584..253e62a05 100644
--- a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
@@ -29,7 +29,7 @@ import com.netscape.certsrv.common.*;
/**
* This class lists out all the CA certificates from the internal token.
- *
+ *
* @author chrisho
* @version $Revision$, $Date$
* @see com.netscape.admin.certsrv.managecert
@@ -46,7 +46,7 @@ public class ManageCertDialog extends JDialog implements ActionListener,
private ManageCertModel mDataModel;
private JButton mClose, mDelete, mEdit, mHelp;
private AdminConnection mConn;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"configuration-managecert-wizard-certlists-help";
public ManageCertDialog(JFrame parent) {
@@ -90,7 +90,7 @@ public class ManageCertDialog extends JDialog implements ActionListener,
CMSAdminUtil.bubbleSort(vals);
- for (i=0; i<vals.length; i++) {
+ for (i=0; i<vals.length; i++) {
String entry = vals[i];
String value = response.get(entry);
addRows(entry, value);
@@ -152,7 +152,7 @@ public class ManageCertDialog extends JDialog implements ActionListener,
public JPanel makeActionPane() {
JPanel panel = new JPanel();
-
+
mClose = new JButton();
mClose.setText(mResource.getString(
"MANAGECERTDIALOG_BUTTON_CLOSE_LABEL"));
@@ -180,7 +180,7 @@ public class ManageCertDialog extends JDialog implements ActionListener,
public JPanel makeContentPane() {
JPanel content = new JPanel();
- content.setBorder(CMSAdminUtil.makeTitledBorder(mResource,
+ content.setBorder(CMSAdminUtil.makeTitledBorder(mResource,
"MANAGECERTDIALOG", "CERT"));
GridBagLayout gb = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
@@ -208,7 +208,7 @@ public class ManageCertDialog extends JDialog implements ActionListener,
gbc.weighty = 1.0;
gbc.fill = gbc.BOTH;
gbc.gridheight = gbc.REMAINDER;
- gbc.insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,
+ gbc.insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,
CMSAdminUtil.COMPONENT_SPACE,
CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE);
gb.setConstraints(scrollPane, gbc);
diff --git a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
index 2cae90759..85cbc7dde 100644
--- a/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertModel.java
@@ -37,8 +37,8 @@ public class ManageCertModel extends CMSTableModel
*==========================================================*/
public static final String COL1 = "CERTNAME";
public static final String COL2 = "EXPIRED";
- public static final String COL3 = "TRUST";
-
+ public static final String COL3 = "TRUST";
+
private static String[] mColumns = {COL1, COL2, COL3};
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java b/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
index f52a7f1a6..81024603d 100644
--- a/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
+++ b/base/console/src/com/netscape/admin/certsrv/menu/RefreshTabPane.java
@@ -51,7 +51,7 @@ public class RefreshTabPane implements IMenuAction {
/*==========================================================
* constructors
*==========================================================*/
-
+
/**
* Default Constructor that creates the refresh menu
* call back item.
@@ -63,7 +63,7 @@ public class RefreshTabPane implements IMenuAction {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* perform the refresh function on the selected
* tab panel, if the tab panel support the IRefreshTab
@@ -80,10 +80,10 @@ public class RefreshTabPane implements IMenuAction {
}
}
}
-
+
/*==========================================================
* EVNET HANDLER METHODS
- *==========================================================*/
+ *==========================================================*/
/**
* Accepts the selection notification from the
diff --git a/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
index c01407193..2bc3543ce 100644
--- a/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestCompletePanel.java
@@ -32,9 +32,9 @@ import java.awt.event.*;
* @version $Revision$, $Date$
*/
public class RequestCompletePanel extends CMSBaseTab implements ItemListener {
- private static final String RA_HELPINDEX =
+ private static final String RA_HELPINDEX =
"notification-ra-certissued-help";
- private static final String CA_HELPINDEX =
+ private static final String CA_HELPINDEX =
"notification-ca-certissued-help";
private JTextField mEmailFormText;
private JTextField mEmailSubjectText;
@@ -75,7 +75,7 @@ public class RequestCompletePanel extends CMSBaseTab implements ItemListener {
GridBagLayout gb = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
mCenterPanel.setLayout(gb);
-
+
//add the enable checkbox
mEnable = makeJCheckBox("ENABLE");
mEnable.setSelected(true);
@@ -84,13 +84,13 @@ public class RequestCompletePanel extends CMSBaseTab implements ItemListener {
gbc.fill = gbc.NONE;
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
- gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
+ gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
DIFFERENT_COMPONENT_SPACE,
0,
DIFFERENT_COMPONENT_SPACE);
gb.setConstraints(mEnable, gbc);
mCenterPanel.add(mEnable);
-
+
//add the setting panel
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
@@ -104,7 +104,7 @@ public class RequestCompletePanel extends CMSBaseTab implements ItemListener {
GridBagLayout gb1 = new GridBagLayout();
emailInfo.setLayout(gb1);
emailInfo.setBorder(makeTitledBorder("EMAILINFO"));
-
+
// add sender email label and text field
CMSAdminUtil.resetGBC(gbc);
mSenderEmailLabel = makeJLabel("SENDER");
diff --git a/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
index aa37ed149..e2b02d77e 100644
--- a/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestInQPanel.java
@@ -32,9 +32,9 @@ import java.awt.event.*;
* @version $Revision$, $Date$
*/
public class RequestInQPanel extends CMSBaseTab implements ItemListener {
- private static final String RA_HELPINDEX =
+ private static final String RA_HELPINDEX =
"notification-ra-reqinq-help";
- private static final String CA_HELPINDEX =
+ private static final String CA_HELPINDEX =
"notification-ca-reqinq-help";
private JTextField mEmailFormText;
private JTextField mEmailSubjectText;
@@ -76,7 +76,7 @@ public class RequestInQPanel extends CMSBaseTab implements ItemListener {
GridBagLayout gb = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
mCenterPanel.setLayout(gb);
-
+
//add the enable checkbox
mEnable = makeJCheckBox("ENABLE");
mEnable.setSelected(true);
@@ -85,13 +85,13 @@ public class RequestInQPanel extends CMSBaseTab implements ItemListener {
gbc.fill = gbc.NONE;
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
- gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
+ gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
DIFFERENT_COMPONENT_SPACE,
0,
DIFFERENT_COMPONENT_SPACE);
gb.setConstraints(mEnable, gbc);
mCenterPanel.add(mEnable);
-
+
//add the setting panel
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
@@ -113,7 +113,7 @@ public class RequestInQPanel extends CMSBaseTab implements ItemListener {
mActiveColor = mSenderEmailText.getBackground();
CMSAdminUtil.addEntryField(emailInfo,
mSenderEmailLabel, mSenderEmailText, gbc);
-
+
// add email subject label and text field
CMSAdminUtil.resetGBC(gbc);
mEmailSubjectLabel = makeJLabel("SUBJECT");
diff --git a/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java b/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
index 60b0e2949..9a22cd91c 100644
--- a/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/notification/RequestRevokedPanel.java
@@ -32,9 +32,9 @@ import java.awt.event.*;
* @version $Revision$, $Date$
*/
public class RequestRevokedPanel extends CMSBaseTab implements ItemListener {
- private static final String RA_HELPINDEX =
+ private static final String RA_HELPINDEX =
"configuration-notifications";
- private static final String CA_HELPINDEX =
+ private static final String CA_HELPINDEX =
"configuration-notifications";
private JTextField mEmailFormText;
private JTextField mEmailSubjectText;
@@ -75,7 +75,7 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener {
GridBagLayout gb = new GridBagLayout();
GridBagConstraints gbc = new GridBagConstraints();
mCenterPanel.setLayout(gb);
-
+
//add the enable checkbox
mEnable = makeJCheckBox("ENABLE");
mEnable.setSelected(true);
@@ -84,13 +84,13 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener {
gbc.fill = gbc.NONE;
gbc.gridwidth = gbc.REMAINDER;
gbc.weightx = 1.0;
- gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
+ gbc.insets = new Insets(DIFFERENT_COMPONENT_SPACE,
DIFFERENT_COMPONENT_SPACE,
0,
DIFFERENT_COMPONENT_SPACE);
gb.setConstraints(mEnable, gbc);
mCenterPanel.add(mEnable);
-
+
//add the setting panel
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
@@ -104,7 +104,7 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener {
GridBagLayout gb1 = new GridBagLayout();
emailInfo.setLayout(gb1);
emailInfo.setBorder(makeTitledBorder("EMAILINFO"));
-
+
// add sender email label and text field
CMSAdminUtil.resetGBC(gbc);
mSenderEmailLabel = makeJLabel("SENDER");
@@ -238,7 +238,7 @@ public class RequestRevokedPanel extends CMSBaseTab implements ItemListener {
String senderEmail = mSenderEmailText.getText().trim();
if (mEnable.isSelected() && (emailForm.equals("") ||
- senderEmail.equals("") ||
+ senderEmail.equals("") ||
emailSubject.equals(""))) {
showMessageDialog("BLANKFIELD");
return false;
diff --git a/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java b/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
index 5329b1148..25511cee5 100644
--- a/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
@@ -131,7 +131,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
if (e.getSource().equals(mRefresh)) {
Debug.println("AccessLogPanel: Refresh Log");
refresh();
- }else if (e.getSource().equals(mView)) {
+ }else if (e.getSource().equals(mView)) {
if (mDataModel.getRowCount() == 0) {
refresh();
} else {
@@ -142,7 +142,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
} else if (e.getSource().equals(mLevel) || e.getSource().equals(mSource)
|| e.getSource().equals(mFile)) {
Debug.println("AccessLogPanel: Changed Log Level or Source or File");
- refresh();
+ refresh();
}
}
@@ -153,19 +153,19 @@ public abstract class CMSLogPanel extends CMSBasePanel
//==== MOUSELISTENER ======================
public void mouseClicked(MouseEvent e) {
//Debug.println("CertRepositoryPanel: mouseClicked() -"+e.toString());
-
+
//we track the double click action on the table entry - View op
if(e.getClickCount() == 2) {
//Debug.println("View Detail");
viewDetail();
}
}
-
+
public void mousePressed(MouseEvent e) { }
public void mouseReleased(MouseEvent e) { }
public void mouseEntered(MouseEvent e) { }
public void mouseExited(MouseEvent e) { }
-
+
/**
* refresh the table data
*/
@@ -189,7 +189,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
/*==========================================================
* protected methods
*==========================================================*/
-
+
/**
* View the log entry in a dialog box
* (no assumption of validity)
@@ -197,7 +197,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
protected void viewDetail() {
//check item selected
if (mTable.getSelectedRow()>= 0) {
- if (mViewer == null)
+ if (mViewer == null)
mViewer = new LogEntryViewDialog(mModel.getFrame());
mViewer.showDialog(
(String)mDataModel.getValueAt(mTable.getSelectedRow(),0),
@@ -258,7 +258,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
col.setMinWidth(400);
col.setResizable( true );
}
-
+
/**
* create filter criteria panel
*/
@@ -285,7 +285,7 @@ public abstract class CMSLogPanel extends CMSBasePanel
CMSAdminUtil.addEntryField(panel, label1, mSource, label2, mLevel, gbc);
mLevel.addActionListener(this);
mSource.addActionListener(this);
-
+
//file
CMSAdminUtil.resetGBC(gbc);
diff --git a/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java b/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
index 61d127524..4faa7c893 100644
--- a/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/LogDataModel.java
@@ -28,7 +28,7 @@ import com.netscape.admin.certsrv.*;
/**
* LogDataModel to be displayed at the right hand side
- *
+ *
* We need the log order in REVERSE.
*
* @author Jack Pan-Chen
@@ -54,7 +54,7 @@ public class LogDataModel extends CMSTableModel
super();
init(mColumns);
}
-
+
public LogDataModel(ILogParser parser) {
this();
mParser = parser;
@@ -87,7 +87,7 @@ public class LogDataModel extends CMSTableModel
}
addRow(row);
}
-
+
/**
* NEED TO OVERWRITE THE TABLE MODEL ADD FUNCTION
* SINCE WE ARE PROVIDING REVERSE ORDER ENTRIES IN
@@ -102,6 +102,6 @@ public class LogDataModel extends CMSTableModel
row = v.size() - 1;
}
fireTableDataChanged();
- }
+ }
}
diff --git a/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java b/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
index c86ff02ff..3be2bf296 100644
--- a/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/LogEntryViewDialog.java
@@ -186,7 +186,7 @@ public class LogEntryViewDialog extends JDialog
scrollPanel.setAlignmentX(LEFT_ALIGNMENT);
scrollPanel.setAlignmentY(TOP_ALIGNMENT);
scrollPanel.setBackground(getBackground());
- scrollPanel.setBorder(BorderFactory.createEmptyBorder());
+ scrollPanel.setBorder(BorderFactory.createEmptyBorder());
scrollPanel.setPreferredSize(new Dimension(500, 200));
//gbc.fill = gbc.VERTICAL;
gbc.fill = gbc.BOTH;
diff --git a/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java b/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
index dc6a8da27..139d9388a 100644
--- a/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/LogInstancePanel.java
@@ -63,7 +63,7 @@ public class LogInstancePanel extends CMSLogPanel {
mHelpToken = SYSTEMHELPINDEX;
else if (name.equals("error"))
mHelpToken = ERRORHELPINDEX;
- else
+ else
mHelpToken = HELPINDEX;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java b/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
index 431d0d61f..d0a33569a 100644
--- a/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
@@ -106,9 +106,9 @@ public class StatusPanel extends CMSBasePanel
}
public CMSBasePanel getSelectedTab() {
- return this;
+ return this;
}
-
+
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(mRefresh)) {
@@ -174,7 +174,7 @@ public class StatusPanel extends CMSBasePanel
JLabel label5 = makeJLabel("INSTALLDATE");
mInstallDate = new JLabel();
CMSAdminUtil.addEntryField(panel, label5, mInstallDate, gbc);
-
+
CMSAdminUtil.resetGBC(gbc);
JLabel label3 = makeJLabel("SERVERSTARTUP");
mServerStart = new JLabel();
@@ -228,10 +228,10 @@ public class StatusPanel extends CMSBasePanel
//display error dialog
CMSAdminUtil.showErrorDialog(mModel.getFrame(), mResource,
e.toString(), ERROR_MESSAGE);
- mModel.progressStop();
+ mModel.progressStop();
return;
}
-
+
mModel.progressStop();
Debug.println("StatusPanel: refresh() "+ response.toString());
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CGITask.java b/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
index 8406e1005..5f6871ea1 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CGITask.java
@@ -41,8 +41,8 @@ public class CGITask extends CMSTaskObject
/*==========================================================
* variables
*==========================================================*/
- private static final String PREFIX = "CGITASK";
-
+ private static final String PREFIX = "CGITASK";
+
protected boolean mFinished = false;
protected String mCmd = null;
protected String mAdminURL = null;
@@ -264,7 +264,7 @@ public class CGITask extends CMSTaskObject
{
int code = Integer.parseInt(sValue);
mSuccess = (code == 0);
- Debug.println("Parse input: code=" + code + " mSuccess=" +
+ Debug.println("Parse input: code=" + code + " mSuccess=" +
mSuccess);
} else if (sName.equalsIgnoreCase("NMC_ERRINFO")) {
mErrorMsg = sValue;
@@ -308,7 +308,7 @@ public class CGITask extends CMSTaskObject
return "bin/" + s;
return null;
}
-
+
/**
* pass the username to the admin server
*/
@@ -325,7 +325,7 @@ public class CGITask extends CMSTaskObject
Debug.println( "password = " +
(String)_consoleInfo.get( "AdminUserPassword" ) );
return (String)_consoleInfo.get( "AdminUserPassword" );
- }
+ }
/*
protected void showDialog( JFrame frame, String msg, String item,
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java b/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
index bf391c4e4..fd949e97c 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSCertRequest.java
@@ -47,11 +47,11 @@ public class CMSCertRequest extends CGITask {
/*==========================================================
* variables
*==========================================================*/
- private static final String PREFIX = "CGITASK";
+ private static final String PREFIX = "CGITASK";
private String mCgiTask = null; // CGI task to call
private CertSetupWizardInfo mWizardInfo;
private String mPolicyMsg = null;
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -66,18 +66,18 @@ public class CMSCertRequest extends CGITask {
Debug.println("CMSRequestCert: initialize()");
_consoleInfo = info.getAdminConsoleInfo();
- // the results coming back from the daemon will be added to the
+ // the results coming back from the daemon will be added to the
// wizard information.
mWizardInfo = info;
}
-
+
/**
- * Collect the data in name value pairs format and then send them to the
+ * Collect the data in name value pairs format and then send them to the
* cgi process.
*/
public boolean requestCert(Hashtable data) {
boolean status = false; // return value
-
+
try {
status = run(data);
} catch (Exception e) {
@@ -89,7 +89,7 @@ public class CMSCertRequest extends CGITask {
return mSuccess;
}
-
+
/**
* the operation is finished after we receive the http stream
*/
@@ -134,13 +134,13 @@ public class CMSCertRequest extends CGITask {
} catch (Exception e) {
Debug.println("RequestCert.Exception : " + e.toString());
}
-
+
Debug.println("RequestCert.replyHandler: finished, mSuccess=" +
mSuccess);
finish();
}
-
+
private void parse2(String s)
{
int iIndex;
@@ -202,7 +202,7 @@ public class CMSCertRequest extends CGITask {
+ sValue + " index=" + iIndex);
if (sValue != null && !sValue.equals("")) {
mWizardInfo.setRequestStatus(sValue);
- if (sValue.equals("2") || sValue.equals("3")
+ if (sValue.equals("2") || sValue.equals("3")
|| sValue.equals("4"))
// success, pending, svcPending
mSuccess = true;
@@ -286,7 +286,7 @@ public class CMSCertRequest extends CGITask {
mPolicyMsg = mPolicyMsg + "\n " + sValue;
}
}
-
+
Debug.println("Parse finished");
}
@@ -307,7 +307,7 @@ public class CMSCertRequest extends CGITask {
try {
mSuccess = false;
mFinished = false;
-
+
ByteArrayInputStream data = null;
if (args != null && !args.isEmpty())
data = encode(args);
@@ -369,11 +369,11 @@ public class CMSCertRequest extends CGITask {
(detail.indexOf("Connection timed out") > -1) ) {
// java.net.NoRouteToHostException: Connection timed out
// double insurance
- mErrorMsg =
+ mErrorMsg =
mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE");
} else {
// need to determine case by case
- mErrorMsg =
+ mErrorMsg =
mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")+ " java.net.SocketException: " + detail;
}
@@ -404,7 +404,7 @@ public class CMSCertRequest extends CGITask {
} else {
// need to determine case by case
mErrorMsg =
- mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")
+ mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")
+ " Exception: " + detail;
}
Debug.println( "Command " + fullCmd + " failed: " + e );
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
index 7d85d161f..572c0b609 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSConfigCert.java
@@ -49,14 +49,14 @@ public class CMSConfigCert extends CGITask {
* variables
*==========================================================*/
private static final String PREFIX = "CMSCONFIGCERT";
-
+
public static final String CONFIG_CERT_CGI = "Tasks/Operation/config-cert";
-
+
//private boolean mSuccess = false; // status of last executed CGI
//private Hashtable mCgiResponse = null; // holds parsed contents of CGI return
private String mCgiTask = null; // CGI task to call
private InstallWizardInfo mWizardInfo;
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -70,15 +70,15 @@ public class CMSConfigCert extends CGITask {
public void initialize(InstallWizardInfo info) {
_consoleInfo = info.getAdminConsoleInfo();
- // the results coming back from the daemon will be added to the
+ // the results coming back from the daemon will be added to the
// wizard information.
mWizardInfo = info;
setForceBasicAuth(true);
}
-
+
/**
- * Collect the data in name value pairs format and then send them to the
+ * Collect the data in name value pairs format and then send them to the
* cgi process.
*/
public boolean configCert(Hashtable data) {
@@ -90,15 +90,15 @@ public class CMSConfigCert extends CGITask {
if (_consoleInfo.get("AdminUserPassword") == null)
_consoleInfo.put("AdminUserPassword",
_consoleInfo.getAuthenticationPassword());
- Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword"));
+ Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword"));
data.put("AdminUserPassword", _consoleInfo.getAuthenticationPassword());
_consoleInfo.put("arguments", data);
- // Send Random value for RNG entropy
+ // Send Random value for RNG entropy
data.put(ConfigConstants.PR_CMS_SEED, new Long(WizardBasePanel.mSeed).toString());
-
+
boolean status = false; // return value
-
+
Cursor cursor = mActiveFrame.getCursor();
int type = cursor.getType();
cursor = new Cursor(Cursor.WAIT_CURSOR);
@@ -132,7 +132,7 @@ public class CMSConfigCert extends CGITask {
return mSuccess;
}
-
+
/**
* the operation is finished after we receive the http stream
*/
@@ -142,7 +142,7 @@ public class CMSConfigCert extends CGITask {
if (mCgiResponse != null)
mCgiResponse.clear();
*/
-
+
try {
BufferedReader rspStream =
new BufferedReader(new InputStreamReader(response, "UTF8"));
@@ -164,13 +164,13 @@ public class CMSConfigCert extends CGITask {
} catch (Exception e) {
Debug.println("ConfigCert.Exception : " + e.toString());
}
-
+
Debug.println("ConfigCert.replyHandler: finished, mSuccess=" +
mSuccess);
finish();
}
-
+
/**
* return the value for the given keyword in the reply
*/
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
index b285b2284..bd95041e4 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSImportCert.java
@@ -47,15 +47,15 @@ public class CMSImportCert extends CGITask {
/*==========================================================
* variables
*==========================================================*/
- private static final String PREFIX = "CGITASK";
+ private static final String PREFIX = "CGITASK";
private String mCgiTask = null; // CGI task to call
private InstallWizardInfo mWizardInfo;
private String mPolicyMsg = null;
-
+
// To support Thawte's header and footer
- public static final String BEGIN_PKCS7_HEADER =
+ public static final String BEGIN_PKCS7_HEADER =
"-----BEGIN PKCS #7 SIGNED DATA-----";
- public static final String END_PKCS7_HEADER =
+ public static final String END_PKCS7_HEADER =
"-----END PKCS #7 SIGNED DATA-----";
public static final String BEGIN_HEADER = "-----BEGIN CERTIFICATE-----";
public static final String END_HEADER = "-----END CERTIFICATE-----";
@@ -74,13 +74,13 @@ public class CMSImportCert extends CGITask {
Debug.println("CMSImportCert: initialize()");
_consoleInfo = info.getAdminConsoleInfo();
- // the results coming back from the daemon will be added to the
+ // the results coming back from the daemon will be added to the
// wizard information.
mWizardInfo = info;
}
-
+
/**
- * Collect the data in name value pairs format and then send them to the
+ * Collect the data in name value pairs format and then send them to the
* cgi process.
*/
public boolean importCert(Hashtable data) {
@@ -97,7 +97,7 @@ public class CMSImportCert extends CGITask {
return mSuccess;
}
-
+
/**
* the operation is finished after we receive the http stream
*/
@@ -130,13 +130,13 @@ public class CMSImportCert extends CGITask {
} catch (Exception e) {
Debug.println("ImportCert.Exception : " + e.toString());
}
-
+
Debug.println("ImportCert.replyHandler: finished, mSuccess=" +
mSuccess);
finish();
}
-
+
/**
* return the value for the given keyword in the reply
*/
@@ -160,8 +160,8 @@ public class CMSImportCert extends CGITask {
sValue.equals(ConfigConstants.APPROVED_STRING) ||
sValue.equals(ConfigConstants.SVC_PENDING_STRING)) {
mWizardInfo.setImportError("Request " +
- mWizardInfo.getRequestID() +
- " is " + sValue +
+ mWizardInfo.getRequestID() +
+ " is " + sValue +
".\nYou can contact an authorized agent or local administrator for further assistance by referring to the request ID.");
mSuccess = true;
} else if (sValue.equals(ConfigConstants.CANCELED_STRING) ||
@@ -171,8 +171,8 @@ public class CMSImportCert extends CGITask {
if (stage != null)
mWizardInfo.put(stage, ConfigConstants.FALSE);
mWizardInfo.setImportError("Request " +
- mWizardInfo.getRequestID() +
- " is " + sValue +
+ mWizardInfo.getRequestID() +
+ " is " + sValue +
".\nYou can contact an authorized agent or local administrator for further assistance by referring to the request ID." + "\nYou will be able to regenerate a new request if you click back." );
mSuccess = true;
}
@@ -191,9 +191,9 @@ public class CMSImportCert extends CGITask {
String result = normalizeCertStr(val);
Debug.println("After removing all the carriage returns:");
Debug.println(result);
- mWizardInfo.setPKCS10(result);
+ mWizardInfo.setPKCS10(result);
mSuccess = true;
-
+
}
}
else if ((iIndex=s.indexOf("unexpectedError = ")) != (-1))
@@ -261,7 +261,7 @@ public class CMSImportCert extends CGITask {
mPolicyMsg = mPolicyMsg + "\n " + sValue;
}
}
-
+
Debug.println("Parse finished");
}
@@ -282,7 +282,7 @@ public class CMSImportCert extends CGITask {
try {
mSuccess = false;
mFinished = false;
-
+
ByteArrayInputStream data = null;
if (args != null && !args.isEmpty())
data = encode(args);
@@ -344,11 +344,11 @@ public class CMSImportCert extends CGITask {
(detail.indexOf("Connection timed out") > -1) ) {
// java.net.NoRouteToHostException: Connection timed out
// double insurance
- mErrorMsg =
+ mErrorMsg =
mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE");
} else {
// need to determine case by case
- mErrorMsg =
+ mErrorMsg =
mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")+ " java.net.SocketException: " + detail;
}
@@ -379,7 +379,7 @@ public class CMSImportCert extends CGITask {
} else {
// need to determine case by case
mErrorMsg =
- mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")
+ mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")
+ " Exception: " + detail;
}
Debug.println( "Command " + fullCmd + " failed: " + e );
@@ -388,7 +388,7 @@ public class CMSImportCert extends CGITask {
}
String getStage(String reqType){
- if (reqType.equals(Constants.PR_CA_SIGNING_CERT)){
+ if (reqType.equals(Constants.PR_CA_SIGNING_CERT)){
return ConfigConstants.STAGE_CA_REQ_SUCCESS;
}else if (reqType.equals(Constants.PR_SERVER_CERT)){
return ConfigConstants.STAGE_SSL_REQ_SUCCESS;
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java b/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
index c7ff02c36..bc71dd152 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSMigrateCreate.java
@@ -49,13 +49,13 @@ public class CMSMigrateCreate extends CGITask
* variables
*==========================================================*/
private static final String PREFIX = "CMSMIGRATECREATE";
-
+
private static final String CREATE_CGI_NAME = "Tasks/Operation/Create";
-
+
//private boolean mSuccess = false; // status of last executed CGI
private Hashtable mCgiResponse = null; // holds parsed contents of CGI return
private String mCgiTask = null; // CGI task to call
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -70,17 +70,17 @@ public class CMSMigrateCreate extends CGITask
Debug.println("CMSMigrateCreate: initialize()");
_consoleInfo = info;
}
-
+
public boolean migrate(String serverRoot,
String server,
String targetDN,
boolean flag) {
-
- Debug.println("CMSMigrateCreate: migrate()");
-
+
+ Debug.println("CMSMigrateCreate: migrate()");
+
return false;
- }
-
+ }
+
/**
* Starts the server specific creation code, providing the DN for the
* target admin group. The method returns true or false depending
@@ -94,7 +94,7 @@ public class CMSMigrateCreate extends CGITask
public boolean createNewInstance(String targetDN) {
//Debug.println("CMSMigrateCreate: createNewInstance()- "+targetDN);
//targetDN: cn=Server Group, cn=cynthiar.mcom.com, ou=mcom.com, o=NetscapeRoot
-
+
JFrame mActiveFrame = UtilConsoleGlobals.getActivatedFrame();
boolean status = false; // return value
//show dialog
@@ -104,54 +104,54 @@ public class CMSMigrateCreate extends CGITask
if (dialog.isCancel()) {
return status;
}
-
+
//construct the rest of the configuration parameters
//serverName=cynthiar.mcom.com
- //sieURL=ldap://laiking.mcom.com:389/o=netscapeRoot
- //adminUID=admin
- //adminPWD=admin
- //instanceID=cert-data
- //serverRoot=/u/thomask/s4
- //adminDomain=mcom.com
-
+ //sieURL=ldap://laiking.mcom.com:389/o=netscapeRoot
+ //adminUID=admin
+ //adminPWD=admin
+ //instanceID=cert-data
+ //serverRoot=/u/thomask/s4
+ //adminDomain=mcom.com
+
Hashtable configParams = new Hashtable();
-
+
configParams.put("instanceID",dialog.getInstanceName());
-
+
String[] entries = LDAPDN.explodeDN(targetDN, false);
String DN = entries[entries.length-3] + ", " +
entries[entries.length-2] + ", " +
entries[entries.length-1];
-
+
//DN: cn=cynthiar.mcom.com, ou=mcom.com, o=NetscapeRoot
configParams.put("machineName", getValue(DN, "serverHostName",
LDAPConnection.SCOPE_BASE, null));
configParams.put("serverRoot", getValue(targetDN, "nsconfigroot",
- LDAPConnection.SCOPE_BASE, null));
+ LDAPConnection.SCOPE_BASE, null));
LDAPConnection ldc = _consoleInfo.getLDAPConnection();
String ssdn = ldc.getAuthenticationDN();
String[] avas = LDAPDN.explodeDN(ssdn, false);
String uid = avas[0];
if (!uid.startsWith("uid")) {
- CMSAdminUtil.showMessageDialog(mActiveFrame,
- mResource, PREFIX, "RESTARTADMINERROR",
+ CMSAdminUtil.showMessageDialog(mActiveFrame,
+ mResource, PREFIX, "RESTARTADMINERROR",
CMSAdminUtil.ERROR_MESSAGE);
return false;
}
configParams.put("adminUID", uid.substring(4,uid.length()));
-
- configParams.put("adminPWD",ldc.getAuthenticationPassword());
- String ldapUrl = "ldap://" + ldc.getHost() + ":" +
- Integer.toString(ldc.getPort()) + "/" +
+
+ configParams.put("adminPWD",ldc.getAuthenticationPassword());
+ String ldapUrl = "ldap://" + ldc.getHost() + ":" +
+ Integer.toString(ldc.getPort()) + "/" +
(String)_consoleInfo.get("BaseDN");
configParams.put("sieURL", ldapUrl);
-
+
String searchDN = entries[entries.length-2];
configParams.put("adminDomain", searchDN.substring(3,searchDN.length()));
-
+
Debug.println("CMSMigrateCreate: createNewInstance()- "+configParams.toString());
-
+
// set the arguments for the CGI call
_consoleInfo.put("arguments", configParams);
_consoleInfo.put(CREATE_CGI_NAME, "cert");
@@ -162,8 +162,8 @@ public class CMSMigrateCreate extends CGITask
if (_consoleInfo.get("AdminUserPassword") == null)
_consoleInfo.put("AdminUserPassword",
_consoleInfo.getAuthenticationPassword());
- Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword"));
-
+ Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword"));
+
// call the CGI program
Debug.println("CMSMigrateCreate: createNewInstance() before run task="+CREATE_CGI_NAME);
mCgiTask = CREATE_CGI_NAME;
@@ -191,7 +191,7 @@ public class CMSMigrateCreate extends CGITask
"SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE);
else
JOptionPane.showMessageDialog(mActiveFrame, errorMsg,
- "Error", CMSAdminUtil.ERROR_MESSAGE,
+ "Error", CMSAdminUtil.ERROR_MESSAGE,
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON));
}
@@ -200,7 +200,7 @@ public class CMSMigrateCreate extends CGITask
return mSuccess;
}
-
+
/**
* the operation is finished after we receive the http stream
*/
@@ -208,7 +208,7 @@ public class CMSMigrateCreate extends CGITask
mSuccess = false;
if (mCgiResponse != null)
mCgiResponse.clear();
-
+
try {
BufferedReader rspStream =
new BufferedReader(new InputStreamReader(response, "UTF8"));
@@ -230,13 +230,13 @@ public class CMSMigrateCreate extends CGITask
} catch (Exception e) {
Debug.println("MigrateCreate.replyHandler: " + e.toString());
}
-
+
Debug.println("MigrateCreate.replyHandler: finished, mSuccess=" +
mSuccess);
finish();
}
-
+
/**
* return the value for the given keyword in the reply
*/
@@ -266,7 +266,7 @@ public class CMSMigrateCreate extends CGITask
Debug.println("Parse finished");
}
-
+
/**
* Get one value for one specified attribute from the given DN.
* If there is more than 1 entry which matches the given criteria, the
@@ -289,7 +289,7 @@ public class CMSMigrateCreate extends CGITask
return null;
}
-
+
/**
* Get the values for several specified attributes from the given DN.
* If there is more than 1 entry which matches the given criteria, the
@@ -335,6 +335,6 @@ public class CMSMigrateCreate extends CGITask
}
return values;
- }
-
+ }
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
index 8b3cfef6b..1ef7f87de 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSRequestCert.java
@@ -47,11 +47,11 @@ public class CMSRequestCert extends CGITask {
/*==========================================================
* variables
*==========================================================*/
- private static final String PREFIX = "CGITASK";
+ private static final String PREFIX = "CGITASK";
private String mCgiTask = null; // CGI task to call
private InstallWizardInfo mWizardInfo;
private String mPolicyMsg = null;
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -66,18 +66,18 @@ public class CMSRequestCert extends CGITask {
Debug.println("CMSRequestCert: initialize()");
_consoleInfo = info.getAdminConsoleInfo();
- // the results coming back from the daemon will be added to the
+ // the results coming back from the daemon will be added to the
// wizard information.
mWizardInfo = info;
}
-
+
/**
- * Collect the data in name value pairs format and then send them to the
+ * Collect the data in name value pairs format and then send them to the
* cgi process.
*/
public boolean requestCert(Hashtable data) {
boolean status = false; // return value
-
+
try {
status = run(data);
} catch (Exception e) {
@@ -89,7 +89,7 @@ public class CMSRequestCert extends CGITask {
return mSuccess;
}
-
+
/**
* the operation is finished after we receive the http stream
*/
@@ -134,7 +134,7 @@ public class CMSRequestCert extends CGITask {
} catch (Exception e) {
Debug.println("RequestCert.Exception : " + e.toString());
}
-
+
Debug.println("RequestCert.replyHandler: finished, mSuccess=" +
mSuccess);
@@ -182,7 +182,7 @@ public class CMSRequestCert extends CGITask {
}
-
+
/**
* return the value for the given keyword in the reply
*/
@@ -203,7 +203,7 @@ public class CMSRequestCert extends CGITask {
+ sValue + " index=" + iIndex);
if (sValue != null && !sValue.equals("")) {
mWizardInfo.setRequestStatus(sValue);
- if (sValue.equals("2") || sValue.equals("3")
+ if (sValue.equals("2") || sValue.equals("3")
|| sValue.equals("4")){
//mSuccess = true;
}
@@ -289,7 +289,7 @@ public class CMSRequestCert extends CGITask {
}
else if ((iIndex=s.indexOf("/HTML")) != (-1))
mSuccess = true; // no need to parse further
-
+
Debug.println("Parse finished");
}
@@ -310,7 +310,7 @@ public class CMSRequestCert extends CGITask {
try {
mSuccess = false;
mFinished = false;
-
+
ByteArrayInputStream data = null;
if (args != null && !args.isEmpty())
data = encode(args);
@@ -372,11 +372,11 @@ public class CMSRequestCert extends CGITask {
(detail.indexOf("Connection timed out") > -1) ) {
// java.net.NoRouteToHostException: Connection timed out
// double insurance
- mErrorMsg =
+ mErrorMsg =
mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE");
} else {
// need to determine case by case
- mErrorMsg =
+ mErrorMsg =
mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")+ " java.net.SocketException: " + detail;
}
@@ -407,7 +407,7 @@ public class CMSRequestCert extends CGITask {
} else {
// need to determine case by case
mErrorMsg =
- mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")
+ mResource.getString("CGITASK_DIALOG_CMSDOWN_MESSAGE")
+ " Exception: " + detail;
}
Debug.println( "Command " + fullCmd + " failed: " + e );
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
index fa9d59ddd..9c52d80c6 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSRestart.java
@@ -74,7 +74,7 @@ public class CMSRestart extends CGITask
Hashtable configParams = new Hashtable();
configParams.put("serverRoot",_consoleInfo.get("serverRoot"));
-
+
String servid = (String)_consoleInfo.get("servid");
int index = servid.indexOf("-");
if (index != -1) {
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
index 2122145c3..c47cbd164 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStart.java
@@ -145,7 +145,7 @@ public class CMSStart extends CGITask
UtilConsoleGlobals.getActivatedFrame(),
mResource, PREFIX, "SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE);
else {
- String errorMsg =
+ String errorMsg =
mResource.getString("STARTRESULTDIALOG_FAILED_TEXT")+mErrorMsg;
Icon icon = CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON);
JOptionPane.showMessageDialog(UtilConsoleGlobals.getActivatedFrame(),
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
index 510bf0661..1d8dd2ef7 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStartDaemon.java
@@ -47,13 +47,13 @@ public class CMSStartDaemon extends CGITask {
* variables
*==========================================================*/
private static final String PREFIX = "CMSSTARTDAEMON";
-
+
public static final String START_DAEMON_CGI = "Tasks/Operation/start-daemon";
-
+
private boolean mSuccess = false; // status of last executed CGI
private Hashtable mCgiResponse = null; // holds parsed contents of CGI return
private String mCgiTask = null; // CGI task to call
-
+
/*==========================================================
* constructors
*==========================================================*/
@@ -68,7 +68,7 @@ public class CMSStartDaemon extends CGITask {
Debug.println("CMSStartDaemon: initialize()");
_consoleInfo = info;
}
-
+
/**
* Starts the server specific creation code, providing the DN for the
* target admin group. The method returns true or false depending
@@ -80,7 +80,7 @@ public class CMSStartDaemon extends CGITask {
* or failed (false).
*/
public boolean runDaemon(Hashtable configParams) {
- String response = null;
+ String response = null;
/*
LDAPConnection ldc = _consoleInfo.getLDAPConnection();
String ssdn = ldc.getAuthenticationDN();
@@ -101,7 +101,7 @@ public class CMSStartDaemon extends CGITask {
if (_consoleInfo.get("AdminUserPassword") == null)
_consoleInfo.put("AdminUserPassword",
_consoleInfo.getAuthenticationPassword());
- Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword"));
+ Debug.println("AdminUserPassword = " + _consoleInfo.get("AdminUserPassword"));
Debug.println("Current DN = "+_consoleInfo.getCurrentDN());
boolean status = false; // return value
@@ -114,11 +114,11 @@ public class CMSStartDaemon extends CGITask {
}
Debug.println("CMSStartDaemon: startDaemon() after run status=" +
status + " mSuccess=" + mSuccess);
-again:
+again:
if (!mSuccess) {
response = (String) mCgiResponse.get("NMC_ERRINFO");
if ((response != null) && response.equalsIgnoreCase("daemon found lock file")) {
- int result = CMSAdminUtil.showConfirmDialog(mResource, "CMSSTARTDAEMON"/*PREFIX*/,
+ int result = CMSAdminUtil.showConfirmDialog(mResource, "CMSSTARTDAEMON"/*PREFIX*/,
"LOCKDELETECONFIRM", CMSAdminUtil.WARNING_MESSAGE);
if (result == CMSAdminUtil.OK_OPTION) {
Debug.println("User wants to delete lock file.");
@@ -135,10 +135,10 @@ again:
"SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE);
}
}
-
+
return mSuccess;
}
-
+
/**
* the operation is finished after we receive the http stream
*/
@@ -146,7 +146,7 @@ again:
mSuccess = false;
if (mCgiResponse != null)
mCgiResponse.clear();
-
+
try {
BufferedReader rspStream =
new BufferedReader(new InputStreamReader(response, "UTF8"));
@@ -168,13 +168,13 @@ again:
} catch (Exception e) {
Debug.println("StartDaemon.replyHandler: " + e.toString());
}
-
+
Debug.println("StartDaemon.replyHandler: finished, mSuccess=" +
mSuccess);
finish();
}
-
+
/**
* return the value for the given keyword in the reply
*/
@@ -203,14 +203,14 @@ again:
Debug.println("Parse finished");
}
-
+
/**
* return the value for the response
*/
public Hashtable getResponse() {
- return mCgiResponse;
+ return mCgiResponse;
}
-
+
/**
* Get one value for one specified attribute from the given DN.
* If there is more than 1 entry which matches the given criteria, the
@@ -233,7 +233,7 @@ again:
return null;
}
-
+
/**
* Get the values for several specified attributes from the given DN.
* If there is more than 1 entry which matches the given criteria, the
@@ -279,6 +279,6 @@ again:
}
return values;
- }
-
+ }
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
index edd80b5b2..e052e157e 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStatus.java
@@ -112,7 +112,7 @@ public class CMSStatus extends CGITask
configDN);
}
_consoleInfo.put("arguments", configParams);
-
+
if (_consoleInfo.get("AdminUsername") == null)
_consoleInfo.put("AdminUsername", _consoleInfo.getAuthenticationDN()
);
@@ -132,7 +132,7 @@ public class CMSStatus extends CGITask
status = false;
}
Debug.println("CMSStatus: status() after run status="+status);
-
+
if (!status) {
Debug.println("Status task returned false");
} else {
@@ -143,10 +143,10 @@ public class CMSStatus extends CGITask
/**
- * Send an http request to the server.
- * if the admin serever is down do
+ * Send an http request to the server.
+ * if the admin serever is down do
* Return true if we're sure it
- * succeeded, otherwise false.
+ * succeeded, otherwise false.
*
* @param viewInstance The calling page
* @param cmd Command to execute
@@ -158,22 +158,22 @@ public class CMSStatus extends CGITask
Debug.println( "Could not get adminURL for " + getDN() );
return false;
}
-
+
// Allow specifying e.g. "slapd-install" for instance
String instance = (String)_consoleInfo.get( cmd );
-
+
if ( instance == null )
instance = (String)_consoleInfo.get( "ServerInstance" );
String fullCmd = mAdminURL + instance + "/" + cmd;
-
+
HttpManager h = new HttpManager();
// tell the http manager to use UTF8 encoding
h.setSendUTF8(true);
-
+
try {
mSuccess = false;
mFinished = false;
-
+
// _consoleInfo.get("arguments") is a hashtable of key/value pairs
// to use as the arguments to the CGI
Hashtable args = (Hashtable)_consoleInfo.get("arguments");
@@ -199,7 +199,7 @@ public class CMSStatus extends CGITask
mSuccess = cmsAdmin.getStatusFromAgentPort();
}
Debug.println( "Falling back to get status by connecting to the server");
-
+
}
return mSuccess;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java b/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
index b2a909633..7bbf7472d 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/CMSStop.java
@@ -142,7 +142,7 @@ public class CMSStop extends CGITask
UtilConsoleGlobals.getActivatedFrame(),
mResource, PREFIX, "SYSTEMERROR", CMSAdminUtil.ERROR_MESSAGE);
else {
- String errorMsg =
+ String errorMsg =
mResource.getString("STOPRESULTDIALOG_FAILED_TEXT")+mErrorMsg;
Icon icon = CMSAdminUtil.getImage(CMSAdminResources.IMAGE_ERROR_ICON);
JOptionPane.showMessageDialog(UtilConsoleGlobals.getActivatedFrame(),
diff --git a/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java b/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
index 0cd11beb5..a959262f7 100644
--- a/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/task/StatusDialog.java
@@ -30,7 +30,7 @@ import javax.swing.table.*;
import com.netscape.certsrv.common.*;
/**
- * Policy Implementation Information viewer
+ * Policy Implementation Information viewer
*
* @author Jack Pan-Chen
* @version $Revision$, $Date$
@@ -160,7 +160,7 @@ public class StatusDialog extends JDialog
gbc.insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,CMSAdminUtil.COMPONENT_SPACE, CMSAdminUtil.COMPONENT_SPACE,CMSAdminUtil.COMPONENT_SPACE);
gb3.setConstraints(mDetails, gbc);
content.add(mDetails);
-
+
CMSAdminUtil.resetGBC(gbc);
mTextArea = new JTextArea("",3,50);
mTextArea.setFont(mTitle.getFont());
@@ -180,7 +180,7 @@ public class StatusDialog extends JDialog
gbc.weighty=1.0;
gb3.setConstraints(scrollPanel, gbc);
content.add(scrollPanel);
-
+
return content;
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
index 6656b3abb..fcfc0b912 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
@@ -79,9 +79,9 @@ public class AuthBaseDialog extends JDialog
* @param users list of current groups
*/
// Changed by beomsuk
- /*public void showDialog(NameValuePairs data, String name,
+ /*public void showDialog(NameValuePairs data, String name,
boolean pinDirExist, boolean userDirExist) {*/
- public void showDialog(NameValuePairs data, String name,
+ public void showDialog(NameValuePairs data, String name,
boolean pinDirExist, boolean userDirExist, boolean portalExist) {
// Change end
mDataModel.removeAllRows();
@@ -172,7 +172,7 @@ public class AuthBaseDialog extends JDialog
mTable.setValueAt(str, row, col);
}
}
-
+
try {
if (mAuthName.isVisible())
addPolicyRule(getData(), getRuleName());
@@ -323,8 +323,8 @@ public class AuthBaseDialog extends JDialog
super(x);
}
- public Component getTableCellRendererComponent(JTable table,
- Object value, boolean isSelected, boolean hasFocus, int row,
+ public Component getTableCellRendererComponent(JTable table,
+ Object value, boolean isSelected, boolean hasFocus, int row,
int column) {
if(value == null) {
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
index aa756b388..6844e911c 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthConfigDialog.java
@@ -84,8 +84,8 @@ public class AuthConfigDialog extends CMSBaseConfigDialog
Debug.println("Returning instance name "+instanceName);
return instanceName;
-
+
}
-
+
}
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
index 0cc964c60..8170944ee 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
@@ -56,7 +56,7 @@ public class AuthImplTab extends CMSBaseUGTab {
protected AuthImplDataModel mDataModel; //table model
protected AuthRegisterDialog mEditor=null; //keep single copy
protected JButton mRefresh, mAdd, mDelete, mHelp;
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"authentication-certsrv-authplugin-help";
/*==========================================================
@@ -111,9 +111,9 @@ public class AuthImplTab extends CMSBaseUGTab {
public void mouseClicked(MouseEvent e) {
setButtons();
}
-
+
public void mouseReleased(MouseEvent e) {
- setButtons();
+ setButtons();
}
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
index 929f99aef..d35dc1909 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthInstanceTab.java
@@ -40,7 +40,7 @@ public class AuthInstanceTab extends CMSPluginInstanceTab {
private static final String ADMINRULE = "adminAuth";
private static final String AGENTRULE = "agentAuth";
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"authentication-certsrv-authrules-help";
private static final String DEST = DestDef.DEST_AUTH_ADMIN;
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
index 8721363d1..b550c4cfb 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthPluginSelectionDialog.java
@@ -61,7 +61,7 @@ public class AuthPluginSelectionDialog extends PluginSelectionDialog
* constructors
*==========================================================*/
public AuthPluginSelectionDialog(JFrame parent,
- AdminConnection conn,
+ AdminConnection conn,
String dest,
CMSPluginInstanceTab pluginType) {
@@ -69,7 +69,7 @@ public class AuthPluginSelectionDialog extends PluginSelectionDialog
mScope = ScopeDef.SC_AUTH_IMPLS;
mInstanceScope = ScopeDef.SC_AUTH_MGR_INSTANCE;
mImageName = CMSAdminResources.IMAGE_RULE_PLUGIN;
-
+
mHelpToken = "authentication-certsrv-add-authrule-dbox-help";
setDisplay();
/****
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
index 6f3ed575a..94216eeb4 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/AuthViewDialog.java
@@ -44,7 +44,7 @@ public class AuthViewDialog extends AuthBaseDialog
* variables
*==========================================================*/
private static final String PREFIX = "AUTHVIEWDIALOG";
- private static final String HELPINDEX =
+ private static final String HELPINDEX =
"authentication-certsrv-view-authrule-dbox-help";
/*==========================================================
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
index 758dda109..843f12a23 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CertImportDialog.java
@@ -105,12 +105,12 @@ public class CertImportDialog extends JDialog
//=== ACTIONLISTENER =====================
public void actionPerformed(ActionEvent evt) {
-
+
if (evt.getSource().equals(mPaste)) {
mTextArea.paste();
return;
}
-
+
if (evt.getSource().equals(mCancel)) {
this.hide();
}
@@ -229,7 +229,7 @@ public class CertImportDialog extends JDialog
gbc.weightx=1.0;
gb3.setConstraints(mPaste, gbc);
content.add(mPaste);
-
+
CMSAdminUtil.resetGBC(gbc);
mTextArea = new JTextArea("",40,70);
Font f = new Font("Monospaced", Font.PLAIN, 12);
@@ -241,7 +241,7 @@ public class CertImportDialog extends JDialog
JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
scrollPanel.setAlignmentX(LEFT_ALIGNMENT);
scrollPanel.setAlignmentY(TOP_ALIGNMENT);
- scrollPanel.setBorder(BorderFactory.createLoweredBevelBorder());
+ scrollPanel.setBorder(BorderFactory.createLoweredBevelBorder());
scrollPanel.setPreferredSize(new Dimension(300, 500));
gbc.fill = gbc.BOTH;
gbc.gridwidth = gbc.REMAINDER;
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
index 82083649e..0f3585591 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
@@ -33,7 +33,7 @@ import com.netscape.certsrv.common.*;
* The administrator can use this dialog to management the
* certificates of specific user. This allows the import of
* new certificates and delete/view of existing certificates.
- *
+ *
* This dialog is launched by clicking on the certificate button
* on the main user management tab.
*
@@ -64,7 +64,7 @@ public class CertManagementDialog extends JDialog
private JList mList;
private JButton mOK, mCancel, mAdd, mDelete, mView, mHelp;
- private final static String HELPINDEX =
+ private final static String HELPINDEX =
"usersgroups-certsrv-manage-usercert-dbox-help";
/*==========================================================
@@ -94,7 +94,7 @@ public class CertManagementDialog extends JDialog
*/
public void showDialog(String uid) {
mUID = uid;
-
+
if (!refresh())
return;
setButtons();
@@ -154,7 +154,7 @@ public class CertManagementDialog extends JDialog
/*==========================================================
* private methods
*==========================================================*/
-
+
/**
* Setup the initial UI components
*/
@@ -278,10 +278,10 @@ public class CertManagementDialog extends JDialog
//refresh the table content
private boolean refresh() {
-
+
mDataModel.clear();
mPPData.removeAllElements();
-
+
NameValuePairs response;
try {
response = mConnection.read(DestDef.DEST_USER_ADMIN,
@@ -290,19 +290,19 @@ public class CertManagementDialog extends JDialog
} catch (EAdminException e) {
CMSAdminUtil.showErrorDialog(mParentFrame, mResource,
e.getMessage(), CMSAdminUtil.ERROR_MESSAGE);
- return false;
+ return false;
}
-
+
//parse data
String[] vals = new String[response.size()];
int i=0;
-
+
for (String entry : response.keySet()) {
vals[i++] = entry.trim();
}
-
+
CMSAdminUtil.bubbleSort(vals);
-
+
for (int y=0; y< vals.length ; y++) {
String str = reformat(vals[y]);
mDataModel.addElement(new JLabel(str,
@@ -310,7 +310,7 @@ public class CertManagementDialog extends JDialog
JLabel.LEFT));
mPPData.addElement(response.get(vals[y]));
}
-
+
return true;
}
@@ -334,7 +334,7 @@ public class CertManagementDialog extends JDialog
String serial = val.substring(9, subject_pos).trim();
long num = CMSAdminUtil.hexToLong(serial);
try {
- return "-1;" +
+ return "-1;" +
num + ";" +
val.substring(issuer_pos+7).trim() + ";" +
val.substring(subject_pos+8, issuer_pos).trim();
@@ -356,20 +356,20 @@ public class CertManagementDialog extends JDialog
String issuer=null;
String subject=null;
- try {
+ try {
version = st.nextToken();
serial = st.nextToken();
issuer = st.nextToken();
subject = st.nextToken();
} catch (Exception e) {}
-
+
try {
if (serial != null) {
String hexserial = Integer.toHexString(Integer.parseInt(serial));
name = name + "Serial:0x"+hexserial;
}
} catch (Exception e) {}
-
+
if (subject != null) {
name = name + " Subject:"+subject;
@@ -381,7 +381,7 @@ public class CertManagementDialog extends JDialog
return name;
}
-
+
private void addCert(String B64E) {
//send comment to server for the removal of user
NameValuePairs config = new NameValuePairs();
@@ -397,8 +397,8 @@ public class CertManagementDialog extends JDialog
e.getMessage(), CMSAdminUtil.ERROR_MESSAGE);
return;
}
- }
-
+ }
+
/**
* routine to cleanup the certificate data
* this removes end of line embedded in the
@@ -415,15 +415,15 @@ public class CertManagementDialog extends JDialog
buff.append(c);
}
return buff.toString();
- }
-
+ }
+
private void deleteCert() {
//get entry name
String dn = ((JLabel)mDataModel.elementAt(mList.getSelectedIndex())).getText();
dn = toServerFormat(dn);
NameValuePairs config = new NameValuePairs();
config.put(Constants.PR_USER_CERT, dn);
-
+
//send comment to server for the removal of user
try {
mConnection.modify(DestDef.DEST_USER_ADMIN,
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
index e9693b15d..5617398b7 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
@@ -58,10 +58,10 @@ public class GroupEditor extends JDialog
private JButton mOK, mCancel, mHelp, mAddUser, mDelete;
private JTextField mGroupNameField, mGroupDescField;
private JLabel mGroupNameLabel;
-
- private static final String ADDHELPINDEX =
+
+ private static final String ADDHELPINDEX =
"usersgroups-certsrv-add-group-dbox-help";
- private static final String EDITHELPINDEX =
+ private static final String EDITHELPINDEX =
"usersgroups-certsrv-edit-group-dbox-help";
private String mHelpToken;
@@ -149,7 +149,7 @@ public class GroupEditor extends JDialog
"NOGROUPNAME", CMSAdminUtil.ERROR_MESSAGE);
return;
}
-
+
try {
mGroupName = mGroupNameField.getText().trim();
addGroup();
@@ -190,13 +190,13 @@ public class GroupEditor extends JDialog
if (evt.getSource().equals(mAddUser)) {
//bring up the list for selection
-
+
//create vector here
Vector currentUser = new Vector();
for (int i=0; i<mDataModel.getSize(); i++) {
currentUser.addElement((String)mDataModel.getElementAt(i));
}
-
+
NameValuePairs response;
try {
response = mConnection.search(DestDef.DEST_USER_ADMIN,
@@ -220,18 +220,18 @@ public class GroupEditor extends JDialog
if (mUserDialog==null)
mUserDialog = new UserListDialog(mParentFrame, mConnection);
-
+
mUserDialog.showDialog(currentUser);
//get selection
if (!mUserDialog.isOK())
return;
-
+
//create user NVP data object and add user entry
Vector selectedUser = mUserDialog.getSelectedUser();
//Debug.println("Selected User = "+selectedUser.toString());
-
+
for(int i=0; i<selectedUser.size(); i++) {
String name = ((String) selectedUser.elementAt(i)).trim();
if (!isDuplicate(name))
@@ -356,7 +356,7 @@ public class GroupEditor extends JDialog
gbc. insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,
CMSAdminUtil.COMPONENT_SPACE,0,0);
top.add(label1, gbc);
-
+
gbc.anchor = gbc.WEST;
gbc.fill = gbc.HORIZONTAL;
gbc.weightx = 1.0;
@@ -365,7 +365,7 @@ public class GroupEditor extends JDialog
0,CMSAdminUtil.DIFFERENT_COMPONENT_SPACE);
top.add( mGroupNameLabel, gbc );
top.add( mGroupNameField, gbc );
-
+
JLabel dummy = new JLabel();
dummy.setVisible(false);
gbc.gridwidth = gbc.REMAINDER;
@@ -388,7 +388,7 @@ public class GroupEditor extends JDialog
CMSAdminUtil.DIFFERENT_COMPONENT_SPACE,
CMSAdminUtil.COMPONENT_SPACE,0);
top.add(label3, gbc );
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.NORTH;
gbc.gridwidth = gbc.REMAINDER;
@@ -407,8 +407,8 @@ public class GroupEditor extends JDialog
resizeButtons();
//group membership table
-
-
+
+
mList = makeJList(mDataModel,9);
mList.addListSelectionListener(this);
mScrollPane = new JScrollPane(mList,
@@ -506,7 +506,7 @@ public class GroupEditor extends JDialog
String user_str = tokenizer.nextToken().trim();
mDataModel.addElement(user_str);
}
-
+
}
//add new group information
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
index e80cc7047..84e9fe0b0 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
@@ -81,14 +81,14 @@ public class GroupTab extends CMSBaseUGTab {
Debug.println("Edit Groups "+mTable.getSelectedRow());
String groupName = (String) mDataModel.getObjectValueAt(mTable.getSelectedRow());
-
+
if (mEditor==null){
- mEditor = new GroupEditor(mModel.getFrame(), mConnection);
- }
+ mEditor = new GroupEditor(mModel.getFrame(), mConnection);
+ }
mEditor.showDialog(groupName, false);
refresh();
-
+
}
if (e.getSource().equals(mAdd)) {
Debug.println("Show Editor");
@@ -114,7 +114,7 @@ public class GroupTab extends CMSBaseUGTab {
//==== MOUSELISTENER ======================
public void mouseClicked(MouseEvent e) {
setButtons();
-
+
/*
//NEED TO DISABLE THIS DUE TO BUG THAT WILL RE-DISPLAY
@@ -152,9 +152,9 @@ public class GroupTab extends CMSBaseUGTab {
}
public void mouseReleased(MouseEvent e) {
- setButtons();
- }
-
+ setButtons();
+ }
+
/*==========================================================
* protected methods
*==========================================================*/
@@ -301,7 +301,7 @@ public class GroupTab extends CMSBaseUGTab {
mEdit.setEnabled(true);
}
-
+
private void updateGroup() {
//send request and parse data
@@ -325,7 +325,7 @@ public class GroupTab extends CMSBaseUGTab {
for (String entry : response.keySet()) {
store.addElement(entry.trim());
}
-
+
String[] vals = new String[store.size()];
store.copyInto(vals);
@@ -335,10 +335,10 @@ public class GroupTab extends CMSBaseUGTab {
String value = response.get(vals[y]);
mDataModel.processData(vals[y],value);
}
-
+
if (mDataModel.getRowCount() >0)
mTable.setRowSelectionInterval(0,0);
-
+
mModel.progressStop();
}
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
index c3b74ce35..6759294fa 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserDataModel.java
@@ -53,7 +53,7 @@ public class UserDataModel extends CMSContentTableModel {
v.addElement(new JLabel(uid,
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_USER),
JLabel.LEFT));
- v.addElement(name);
+ v.addElement(name);
addRow(v,uid);
}
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
index 75908fe6a..29d1c6c22 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
@@ -35,7 +35,7 @@ import com.netscape.certsrv.common.*;
*
* @author Jack Pan-Chen
* @version $Revision$, $Date$
- *
+ *
* @see com.netscape.admin.certsrv.ug.UserTab
*/
public class UserEditor extends JDialog
@@ -66,9 +66,9 @@ public class UserEditor extends JDialog
private JPasswordField mPasswordConfirm;
private JLabel mUserLabel, mMembership, mGroupLbl, dummy1;
private JComboBox mGroupBox;
- private static final String ADDHELPINDEX =
+ private static final String ADDHELPINDEX =
"usersgroups-certsrv-add-user-dbox-help";
- private static final String EDITHELPINDEX =
+ private static final String EDITHELPINDEX =
"usersgroups-certsrv-edit-user-dbox-help";
/*==========================================================
@@ -90,7 +90,7 @@ public class UserEditor extends JDialog
setLocationRelativeTo(parent);
getRootPane().setDoubleBuffered(true);
setDisplay();
-
+
if(!mIsNewUser) {
mUserNameField.setVisible(false);
mUserLabel.setVisible(true);
@@ -134,7 +134,7 @@ public class UserEditor extends JDialog
mDataModel.clear();
//mViewCert.setEnabled(false);
-
+
if(!mIsNewUser) {
mUserLabel.setText(user);
} else {
@@ -142,7 +142,7 @@ public class UserEditor extends JDialog
mUserLabel.setText("");
mStateField.setText("1");
}
-
+
//retrieve the cert record from the server
try {
if (mIsNewUser == false)
@@ -184,7 +184,7 @@ public class UserEditor extends JDialog
mUserAdded = false;
if (evt.getSource().equals(mOK)) {
-
+
//check password field
String pwd = mPasswordField.getText().trim();
if (!pwd.equals("")) {
@@ -194,15 +194,15 @@ public class UserEditor extends JDialog
return;
}
}
-
+
if (mIsNewUser) {
-
+
//check text fields
if (mUserNameField.getText().trim().equals("")) {
CMSAdminUtil.showMessageDialog(mParentFrame, mResource, PREFIX,
"NOUSERNAME", CMSAdminUtil.ERROR_MESSAGE);
return;
- }
+ }
try {
addUser();
@@ -310,15 +310,15 @@ public class UserEditor extends JDialog
public void insertUpdate(DocumentEvent e) {
updateView();
}
-
+
public void removeUpdate(DocumentEvent e){
updateView();
}
-
+
public void changedUpdate(DocumentEvent e){
updateView();
}
-
+
/*==========================================================
* private methods
*==========================================================*/
@@ -332,7 +332,7 @@ public class UserEditor extends JDialog
mOK.setEnabled(false);
return;
}
- }
+ }
if (mFullNameField.getText().trim().equals("")) {
mOK.setEnabled(false);
return;
@@ -391,7 +391,7 @@ public class UserEditor extends JDialog
}
private JPanel makeContentPane() {
-
+
Insets insets = new Insets(CMSAdminUtil.COMPONENT_SPACE,0,
CMSAdminUtil.COMPONENT_SPACE,0);
@@ -481,7 +481,7 @@ public class UserEditor extends JDialog
mList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION );
mList.addMouseListener(this);
mScrollPane.setBackground(Color.white);
-
+
mScrollPane.setBorder(BorderFactory.createLoweredBevelBorder());
//setLabelCellRenderer(mTable,0);
@@ -560,7 +560,7 @@ public class UserEditor extends JDialog
}
}
-
+
//add new group information
private void addUser() throws EAdminException {
diff --git a/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
index 78b7e5252..f74b67bfa 100644
--- a/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
+++ b/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
@@ -69,7 +69,7 @@ public class UserTab extends CMSBaseUGTab {
/*==========================================================
* public methods
*==========================================================*/
-
+
/**
* refresh the content of the tab
* IRefreshTab menthod
@@ -142,7 +142,7 @@ public class UserTab extends CMSBaseUGTab {
public void mouseClicked(MouseEvent e) {
//Debug.println("CertRepositoryPanel: mouseClicked() -"+e.toString());
setButtons();
-
+
//we track the double click action on the table entry - View op
if(mTable.getSelectedRow() >= 0) {
if(e.getClickCount() == 2) {
@@ -151,15 +151,15 @@ public class UserTab extends CMSBaseUGTab {
}
}
}
-
+
public void mouseReleased(MouseEvent e) {
- setButtons();
- }
+ setButtons();
+ }
/*==========================================================
* protected methods
*==========================================================*/
-
+
/**
* create the user action button panel
*/
@@ -264,11 +264,11 @@ public class UserTab extends CMSBaseUGTab {
mCert.setEnabled(true);
}
-
+
//=============================================
// SEND REQUESTS TO THE SERVER SIDE
//=============================================
-
+
private void updateUser() {
//send request and parse data
@@ -348,10 +348,10 @@ public class UserTab extends CMSBaseUGTab {
String str = e.toString();
if (str.indexOf("The user") == 0) {
- int i =
- JOptionPane.showConfirmDialog(new JFrame(), str,
+ int i =
+ JOptionPane.showConfirmDialog(new JFrame(), str,
"Information", JOptionPane.YES_NO_OPTION,
- JOptionPane.INFORMATION_MESSAGE,
+ JOptionPane.INFORMATION_MESSAGE,
CMSAdminUtil.getImage(CMSAdminResources.IMAGE_INFO_ICON));
if (i == JOptionPane.YES_OPTION) {
Debug.println("User Deleted");
diff --git a/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
index c31767d99..9b60500c3 100644
--- a/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardBasePanel.java
@@ -44,7 +44,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener
protected String mTitle;
protected String mErrorString;
protected String mNextString =
- mResource.getString("GENERALWIZARD_LABEL_NEXT_LABEL");
+ mResource.getString("GENERALWIZARD_LABEL_NEXT_LABEL");
protected String mPanelName;
public static long mSeed;
@@ -73,7 +73,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener
/*
GridBagConstraints gbc = new GridBagConstraints();
-
+
CMSAdminUtil.resetGBC(gbc);
gbc.anchor = gbc.SOUTHWEST;
gbc.weightx = 1.0;
@@ -143,7 +143,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener
wizardInfo.remove("NMC_ERRINFO");
wizardInfo.remove("NMC_STATUS");
}
-
+
public String getErrorMessage(WizardInfo wizardInfo) {
String value = (String)wizardInfo.get("NMC_ERRINFO");
if (value != null || value.trim().length() == 0)
@@ -151,11 +151,11 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener
value = (String)wizardInfo.get("NMC_WARNINFO");
if (value != null || value.trim().length() == 0)
return value;
-
+
return null;
}
- public boolean send(String host, int port, String servlet, String rawData,
+ public boolean send(String host, int port, String servlet, String rawData,
WizardInfo wizardInfo) {
try {
Socket socket = new Socket(host, port);
@@ -203,7 +203,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener
} else {
return false;
}
- } catch (Exception e) {
+ } catch (Exception e) {
}
return false;
@@ -247,7 +247,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener
if (numTokens == 2) {
String name = tokenizer1.nextToken().trim();
String value = tokenizer1.nextToken().trim();
- wizardInfo.put(name, value);
+ wizardInfo.put(name, value);
}
}
bstream.close();
@@ -283,7 +283,7 @@ public class WizardBasePanel extends CMSBasePanel implements MouseMotionListener
// Keep tracking coordinate values
long x = e.getX();
long y = e.getY();
-
+
long top = mSeed >> 62;
mSeed = ((mSeed << 2) ^ top ^ (x<<8) ^ (y)) % Long.MAX_VALUE;
}
diff --git a/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
index 5085d43b4..21bb656ce 100644
--- a/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardInfo.java
@@ -47,24 +47,24 @@ public class WizardInfo extends Properties {
public Object getEntry(String name) {
return get(name);
}
-
+
/**
* access method to NEXT-DONE function buttons
*/
public JButton getNextDoneButton() {
- return mBNext_Done;
+ return mBNext_Done;
}
-
+
/**
* access method to CANCEL function buttons
*/
public JButton getCancelButton() {
return mBCancel;
}
-
+
/**
* access method to BACK function buttons
- */
+ */
public JButton getBackButton() {
return mBBack;
}
@@ -72,14 +72,14 @@ public class WizardInfo extends Properties {
/*==========================================================
* package methods
*==========================================================*/
-
+
/**
* set function buttons. Called by the WizardWidget to set the
* button reference.
*/
void setButtons(JButton next, JButton cancel, JButton back ) {
mBNext_Done = next;
- mBCancel = cancel;
+ mBCancel = cancel;
mBBack = back;
}
}
diff --git a/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java b/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
index c98d37b51..c58723f80 100644
--- a/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
+++ b/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
@@ -165,7 +165,7 @@ public class WizardWidget extends JDialog implements ActionListener
if (!validateWizardPanel()) {
return;
}
-
+
if (concludeWizardPanel()) {
if (mNextScreen.empty() || mBNext_Done.getText().equals("Done")) {
@@ -261,7 +261,7 @@ public class WizardWidget extends JDialog implements ActionListener
data.put(ConfigConstants.PR_CERT_INSTANCE_NAME,
consoleInfo.get(ConfigConstants.PR_CERT_INSTANCE_NAME));
data.put(ConfigConstants.PR_SERVER_ROOT,
- consoleInfo.get(ConfigConstants.PR_SERVER_ROOT));
+ consoleInfo.get(ConfigConstants.PR_SERVER_ROOT));
boolean ready = configCertCgi.configCert(data);
data.clear();
data = null;
@@ -296,10 +296,10 @@ public class WizardWidget extends JDialog implements ActionListener
//JButton[] buttons = {mBBack, mBNext_Done, mBCancel, mBHelp };
JButton[] buttons = {mBBack, mBNext_Done, mBCancel};
-
+
//pass the buttons reference to wizardinfo
mInfo.setButtons(mBNext_Done, mBCancel, mBBack);
-
+
return CMSAdminUtil.makeJButtonPanel( buttons, true);
}
diff --git a/base/console/src/com/netscape/certsrv/common/ConfigConstants.java b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
index 437974f13..a963bf1a4 100644
--- a/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
+++ b/base/console/src/com/netscape/certsrv/common/ConfigConstants.java
@@ -28,8 +28,8 @@ public interface ConfigConstants {
public static final String TRUE = "true";
public static final String FALSE = "false";
public static final String OPTYPE = "opType";
- public static final String TASKID = "taskID";
-
+ public static final String TASKID = "taskID";
+
// Stages
public static final String STAGES = "stages";
public static final String STAGE_CONNECT_DB = "stageConnectDB";
@@ -189,8 +189,8 @@ public interface ConfigConstants {
public static final String PR_MIGRATION_PASSWORD = "migrationPassword";
// Key and Cert
- public static final String PR_HARDWARE_SPLIT = "hardwareSplit";
- public static final String PR_TOKEN_LIST = "tokenList";
+ public static final String PR_HARDWARE_SPLIT = "hardwareSplit";
+ public static final String PR_TOKEN_LIST = "tokenList";
public static final String PR_TOKEN_NAME = "tokenName";
public static final String PR_SUBJECT_NAME = "subjectName";
public static final String PR_CA_SUBJECT_NAME = "caSubjectName";
@@ -292,7 +292,7 @@ public interface ConfigConstants {
// CA serial number
public static final String PR_CA_SERIAL_NUMBER = "caSerialNumber";
public static final String PR_CA_ENDSERIAL_NUMBER = "caEndSerialNumber";
-
+
// KRA serial number
public static final String PR_REQUEST_NUMBER = "requestNumber";
public static final String PR_ENDREQUEST_NUMBER = "endRequestNumber";
diff --git a/base/console/src/com/netscape/certsrv/common/Constants.java b/base/console/src/com/netscape/certsrv/common/Constants.java
index 6f3e3acdf..cf2d57575 100644
--- a/base/console/src/com/netscape/certsrv/common/Constants.java
+++ b/base/console/src/com/netscape/certsrv/common/Constants.java
@@ -50,24 +50,24 @@ public interface Constants {
//STATIC UI TYPE
public final static String TYPE_PASSWORD = "password";
-
+
/**********************************************************
* PROPERTY NAME LISTED BELOW
**********************************************************/
-
+
/*========================================================
* General
- *========================================================*/
+ *========================================================*/
public final static String PR_PORT = "port";
public final static String PR_SSLPORT = "sslPort";
-
+
/*========================================================
* Tasks
*========================================================*/
public final static String PR_SERVER_START = "start";
public final static String PR_SERVER_STOP = "stop";
public final static String PR_SERVER_RESTART = "restart";
-
+
/*========================================================
* Networks
*========================================================*/
@@ -84,12 +84,12 @@ public interface Constants {
"gateway.http.enable";
public final static String PR_MASTER_AGENT_PORT = "master.ca.agent.port";
public final static String PR_MASTER_AGENT_HOST = "master.ca.agent.host";
-
+
/*========================================================
* SMTP
*========================================================*/
public final static String PR_SERVER_NAME = "server";
-
+
/*========================================================
* SNMP
*========================================================*/
@@ -111,7 +111,7 @@ public interface Constants {
/*========================================================
* Users and Groups
*========================================================*/
-
+
//group properties
public final static String PR_GROUP_DESC = "desc";
public final static String PR_GROUP_USER = "user";
@@ -196,7 +196,7 @@ public interface Constants {
/*========================================================
* LDAP Publishing
*========================================================*/
-
+
// publishing properties
public final static String PR_BASIC_AUTH = "BasicAuth";
public final static String PR_SSL_AUTH = "SslClientAuth";
@@ -255,7 +255,7 @@ public interface Constants {
public final static String PR_BASE_DN = "baseDN";
public final static String PR_DNCOMPS = "dnComps";
public final static String PR_FILTERCOMPS = "filterComps";
-
+
// ldap connection test
public final static String PR_CONN_INITED = "connInited";
public final static String PR_CONN_INIT_FAIL = "connInitFail";
@@ -325,9 +325,9 @@ public interface Constants {
public final static String PR_RENEWAL_ENABLED = "renewal.enabled";
public final static String PR_RENEWAL_VALIDITY = "renewal.validity";
public final static String PR_RENEWAL_EMAIL = "renewal.email";
- public final static String PR_RENEWAL_EXPIREDNOTIFIEDENABLED =
+ public final static String PR_RENEWAL_EXPIREDNOTIFIEDENABLED =
"renewal.expired.notification.enabled";
- public final static String PR_RENEWAL_NUMNOTIFICATION =
+ public final static String PR_RENEWAL_NUMNOTIFICATION =
"renewal.numNotification";
public final static String PR_RENEWAL_INTERVAL = "renewal.interval";
public final static String PR_SERVLET_CLASS = "class";
@@ -356,7 +356,7 @@ public interface Constants {
public final static String PR_ACL_CLASS = "class";
public final static String PR_ACL_DESC = "desc";
public final static String PR_ACL_RIGHTS = "rights";
-
+
/*========================================================
* Key Recovery
*========================================================*/
@@ -388,7 +388,7 @@ public interface Constants {
public final static String PR_RA_INSTANCE = "ra";
public final static String PR_KRA_INSTANCE = "kra";
public final static String PR_TKS_INSTANCE = "tks";
-
+
/*
* Certificate info
*/
@@ -469,8 +469,8 @@ public interface Constants {
/*========================================================
* Security
*========================================================*/
-
- //functionality
+
+ //functionality
public final static String PR_CERT_SERVER = "SERVER";
public final static String PR_CERT_ADMIN = "ADMIN";
public final static String PR_CERT_AGENT = "AGENT";
@@ -479,7 +479,7 @@ public interface Constants {
public final static String PR_CERT_RA = "RA";
public final static String PR_CERT_POA = "POA";
public final static String PR_CERT_TRANS = "TRANS";
-
+
// key and certificate management
public final static String PR_OPERATION_TYPE = "operationtype";
public final static String PR_INSTALL_TYPE = "install";
@@ -488,7 +488,7 @@ public interface Constants {
//public final static String PR_SERVER_CERT = "servercert";
public final static String PR_CLIENT_CERT = "clientcert";
public final static String PR_FULL_INTERNAL_TOKEN_NAME="Internal Key Storage Token";
- public final static String PR_INTERNAL_TOKEN_NAME =
+ public final static String PR_INTERNAL_TOKEN_NAME =
"internal";
public final static String PR_TOKEN_NAME = "tokenName";
public final static String PR_TOKEN_PASSWD = "tokenPwd";
@@ -505,15 +505,15 @@ public interface Constants {
public final static String PR_CSR = "csr";
//encryption
-
+
/* Cipher Version: domestic or export */
public final static String PR_CIPHER_VERSION = "cipherversion";
public final static String PR_CIPHER_VERSION_DOMESTIC = "cipherdomestic";
public final static String PR_CIPHER_VERSION_EXPORT = "cipherexport";
-
+
/* Cipher Fortezza: true, false */
public final static String PR_CIPHER_FORTEZZA = "cipherfortezza";
-
+
/* Token and Certificates */
public final static String PR_TOKEN_LIST = "tokenlist";
public final static String PR_TOKEN_PREFIX = "token_";
@@ -524,45 +524,45 @@ public interface Constants {
public final static String PR_CIPHER_PREF = "cipherpref";
/* values for SSL cipher preferences */
- public final static String
+ public final static String
PR_SSL2_RC4_128_WITH_MD5 = "rc4";
- public final static String
+ public final static String
PR_SSL2_RC4_128_EXPORT40_WITH_MD5 = "rc4export";
- public final static String
+ public final static String
PR_SSL2_RC2_128_CBC_WITH_MD5 = "rc2";
- public final static String
+ public final static String
PR_SSL2_RC2_128_CBC_EXPORT40_WITH_MD5 = "rc2export";
- public final static String
+ public final static String
PR_SSL2_DES_64_CBC_WITH_MD5 = "des";
- public final static String
+ public final static String
PR_SSL2_DES_192_EDE3_CBC_WITH_MD5 = "desede3";
- public final static String
+ public final static String
PR_SSL3_RSA_WITH_NULL_MD5 = "rsa_null_md5";
- public final static String
+ public final static String
PR_SSL3_RSA_EXPORT_WITH_RC4_40_MD5 = "rsa_rc4_40_md5";
- public final static String
- PR_SSL3_RSA_WITH_RC4_128_MD5 = "rsa_rc4_128_md5";
- public final static String
+ public final static String
+ PR_SSL3_RSA_WITH_RC4_128_MD5 = "rsa_rc4_128_md5";
+ public final static String
PR_SSL3_RSA_EXPORT_WITH_RC2_CBC_40_MD5 = "rsa_rc2_40_md5";
- public final static String
+ public final static String
PR_SSL3_RSA_WITH_DES_CBC_SHA = "rsa_des_sha";
- public final static String
+ public final static String
PR_SSL3_RSA_WITH_3DES_EDE_CBC_SHA = "rsa_3des_sha";
- public final static String
+ public final static String
PR_SSL3_FORTEZZA_DMS_WITH_FORTEZZA_CBC_SHA = "fortezza";
- public final static String
+ public final static String
PR_SSL3_FORTEZZA_DMS_WITH_RC4_128_SHA = "fortezza_rc4_128_sha";
- public final static String
+ public final static String
PR_SSL_RSA_FIPS_WITH_3DES_EDE_CBC_SHA = "rsa_fips_3des_sha";
- public final static String
+ public final static String
PR_SSL_RSA_FIPS_WITH_DES_CBC_SHA = "rsa_fips_des_sha";
- public final static String
+ public final static String
PR_TLS_RSA_EXPORT1024_WITH_RC4_56_SHA = "tls_rsa_rc4_56_sha";
- public final static String
+ public final static String
PR_TLS_RSA_EXPORT1024_WITH_DES_CBC_SHA = "tls_rsa_des_sha";
/*========================================================
- * Watchdog and Server State Messages
+ * Watchdog and Server State Messages
*========================================================*/
public final static String SERVER_STARTUP_WARNING_MESSAGE = "CMS Warning: ";
diff --git a/base/console/src/com/netscape/certsrv/common/PrefixDef.java b/base/console/src/com/netscape/certsrv/common/PrefixDef.java
index b4476a9d9..489594356 100644
--- a/base/console/src/com/netscape/certsrv/common/PrefixDef.java
+++ b/base/console/src/com/netscape/certsrv/common/PrefixDef.java
@@ -34,8 +34,8 @@ public interface PrefixDef {
public final static String PX_SYS = "SYS_";
public final static String PX_DEF = "DEF_";
public final static String PX_PP = "CERT_PP";
-
+
//log content
public final static String PX_LOG = "log";
-
+
}
diff --git a/base/console/src/com/netscape/certsrv/common/ScopeDef.java b/base/console/src/com/netscape/certsrv/common/ScopeDef.java
index b3e4a79a6..c500fb0ad 100644
--- a/base/console/src/com/netscape/certsrv/common/ScopeDef.java
+++ b/base/console/src/com/netscape/certsrv/common/ScopeDef.java
@@ -31,7 +31,7 @@ public interface ScopeDef {
public final static String SC_GROUPS = "groups";
public final static String SC_USERS = "users";
public final static String SC_USER_CERTS = "certs";
-
+
public final static String SC_SNMP = "snmp";
public final static String SC_SMTP = "smtp";
public final static String SC_SUBSYSTEM = "subsystem";
@@ -39,7 +39,7 @@ public interface ScopeDef {
public final static String SC_GATEWAY = "gateway";
public final static String SC_ADMIN = "admin";
public final static String SC_NETWORK = "network";
-
+
// profile
public final static String SC_PROFILE_IMPLS = "profile";
public final static String SC_PROFILE_RULES = "rules";
@@ -83,7 +83,7 @@ public interface ScopeDef {
public final static String SC_LOG_CONTENT = "log_content";
public final static String SC_AUDITLOG_CONTENT = "transactionsLog_content";
public final static String SC_ERRORLOG_CONTENT = "errorLog_content";
- public final static String SC_SYSTEMLOG_CONTENT = "systemLog_content";
+ public final static String SC_SYSTEMLOG_CONTENT = "systemLog_content";
//LDAP publishing
public final static String SC_LDAP = "ldap";
@@ -109,7 +109,7 @@ public interface ScopeDef {
public final static String SC_RECOVERY = "recovery";
public final static String SC_AGENT_PWD = "agentPwd";
public final static String SC_MNSCHEME = "mnScheme";
-
+
//stat
public final static String SC_STAT = "stat";
@@ -119,10 +119,10 @@ public interface ScopeDef {
public final static String SC_PKIGW = "pkigw";
public final static String SC_SERVLET = "servlet";
public final static String SC_CONNECTOR = "connector";
-
+
//tasks
public final static String SC_TASKS = "tasks";
-
+
//authentication
public final static String SC_AUTH = "auths";
public final static String SC_AUTHTYPE = "authType";
@@ -139,7 +139,7 @@ public interface ScopeDef {
public final static String SC_NOTIFICATION_REQ_COMP = "notificationREQC";
public final static String SC_NOTIFICATION_REV_COMP = "notificationREVC";
public final static String SC_NOTIFICATION_RIQ = "notificationRIQ";
-
+
// acl
public final static String SC_ACL_IMPLS = "impl";
public final static String SC_ACL = "acls";
diff --git a/base/console/src/com/netscape/certsrv/common/TaskId.java b/base/console/src/com/netscape/certsrv/common/TaskId.java
index 6e093d5eb..e20bb334d 100644
--- a/base/console/src/com/netscape/certsrv/common/TaskId.java
+++ b/base/console/src/com/netscape/certsrv/common/TaskId.java
@@ -67,7 +67,7 @@ public interface TaskId {
// get master or clone setting
public final static String TASK_MASTER_OR_CLONE = "SetMasterOrClone";
-
+
// single signon
public final static String TASK_SINGLE_SIGNON = "singleSignon";
@@ -108,7 +108,7 @@ public interface TaskId {
// check certificate extension
public final static String TASK_CHECK_EXTENSION = "checkExtension";
- // check validity period: make sure the notAfterDate of the certificate
+ // check validity period: make sure the notAfterDate of the certificate
// will not go beyond the notAfterDate of the CA cert which signs the certificate.
public final static String TASK_VALIDITY_PERIOD = "checkValidityPeriod";