[Fedora-directory-commits] console/src/com/netscape/management/client/security CertInstallTypePage.java, 1.1.1.1, 1.2 KeyCertUtility.java, 1.1.1.1, 1.2 KeyCertWizardResource.properties, 1.1.1.1, 1.2

[Christina Fu (cfu)]

Author: cfu

Update of /cvs/dirsec/console/src/com/netscape/management/client/security
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5061/src/com/netscape/management/client/security

Modified Files:
	CertInstallTypePage.java KeyCertUtility.java 
	KeyCertWizardResource.properties 
Log Message:
244051 - move brand-specifics to a new jar



Index: CertInstallTypePage.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/CertInstallTypePage.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- CertInstallTypePage.java	18 Jul 2005 00:34:16 -0000	1.1.1.1
+++ CertInstallTypePage.java	13 Jun 2007 20:33:09 -0000	1.2
@@ -31,12 +31,13 @@
 
     JTextField forServer, certName;
     ResourceSet resource = KeyCertUtility.getResourceSet();
+    ResourceSet resource_theme = KeyCertUtility.getResourceSetTheme();
 
     public void pageShown() {
         IDataCollectionModel dataModel = getDataModel();
-        forServer.setText((String)(dataModel.getValue("serverType", resource.getString("CertInstallTypePage", "defaultServerName"))) +
+        forServer.setText((String)(dataModel.getValue("serverType", resource_theme.getString("CertInstallTypePage", "defaultServerName"))) +
                           " (" +
-                          (String)(dataModel.getValue("sie", resource.getString("CertInstallTypePage", "defaultSIE"))) +
+                          (String)(dataModel.getValue("sie", resource_theme.getString("CertInstallTypePage", "defaultSIE"))) +
                           ")");
 
 	if (dataModel.getValue("certtype").equals(Integer.toString(CertInstallWizard.CA))) {


Index: KeyCertUtility.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/KeyCertUtility.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- KeyCertUtility.java	18 Jul 2005 00:34:17 -0000	1.1.1.1
+++ KeyCertUtility.java	13 Jun 2007 20:33:09 -0000	1.2
@@ -48,6 +48,16 @@
         return _resource;
     }
 
+    static ResourceSet _resource_theme = null;
+    public static ResourceSet getResourceSetTheme() {
+        if (_resource_theme == null) {
+            _resource_theme = new ResourceSet("com.netscape.management.client.theme.theme");
+
+        }
+
+        return _resource_theme;
+    }
+
     static Help _help = null;
     public static Help getHelp() {
         if (_help == null) {


Index: KeyCertWizardResource.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/security/KeyCertWizardResource.properties,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- KeyCertWizardResource.properties	18 Jul 2005 00:34:17 -0000	1.1.1.1
+++ KeyCertWizardResource.properties	13 Jun 2007 20:33:09 -0000	1.2
@@ -30,7 +30,7 @@
 
 CertMigrateAliasSelectionPage-help=admin
 CertMigrateAliasSelectionPage-title=Alias Selection
-CertMigrateAliasSelectionPage-explain=The Fedora server contains one or more certificate aliases
+CertMigrateAliasSelectionPage-explain=The server contains one or more certificate aliases
 CertMigrateAliasSelectionPage-selectLabel=Select the alias to import from:
 CertMigrateAliasSelectionPage-enterPwd=Enter the password for the certificiate database for the selected alias:
 CertMigrateAliasSelectionPage-nameLabel=Name
@@ -158,8 +158,8 @@
 CertInstallTypePage-thisServerLabel=Server Certificate
 CertInstallTypePage-certChainLabel =Certificate Chain
 CertInstallTypePage-caLabel=Trusted Certificate Authority
-CertInstallTypePage-defaultServerName=Fedora Server
-CertInstallTypePage-defaultSIE=Fedora Server Instance
+#CertInstallTypePage-defaultServerName=Fedora Server
+#CertInstallTypePage-defaultSIE=Fedora Server Instance
 
 
 # Cert Install Trust Page