linamh/dev-java/idm-console-framework/files/idm-console-framework-alt0.patch

100 lines
6.1 KiB
Diff
Raw Normal View History

diff -ur idm-console-framework/src/com/netscape/management/client/preferences/FilePreferenceManager.java idm-console-framework.new/src/com/netscape/management/client/preferences/FilePreferenceManager.java
--- idm-console-framework/src/com/netscape/management/client/preferences/FilePreferenceManager.java 2005-11-29 21:37:01 +0300
+++ idm-console-framework.new/src/com/netscape/management/client/preferences/FilePreferenceManager.java 2007-08-08 12:41:08 +0400
@@ -46,15 +46,15 @@
String homePath = null;
Properties p = System.getProperties();
- File f = new File(Console.PREFERENCE_DIR);
+ File f = new File(com.netscape.management.client.console.Console.PREFERENCE_DIR);
if (!f.exists())
f.mkdir();
if (!f.exists()) {
- Debug.println("error: cannot create/access" + Console.PREFERENCE_DIR);
+ Debug.println("error: cannot create/access" + com.netscape.management.client.console.Console.PREFERENCE_DIR);
return ".";
}
- return Console.PREFERENCE_DIR;
+ return com.netscape.management.client.console.Console.PREFERENCE_DIR;
}
diff -ur idm-console-framework/src/com/netscape/management/client/security/CertRequestWizard.java idm-console-framework.new/src/com/netscape/management/client/security/CertRequestWizard.java
--- idm-console-framework/src/com/netscape/management/client/security/CertRequestWizard.java 2006-02-09 01:13:18 +0300
+++ idm-console-framework.new/src/com/netscape/management/client/security/CertRequestWizard.java 2007-08-08 12:40:29 +0400
@@ -61,7 +61,7 @@
IDataCollectionModel dataCollectionModel = new WizardDataCollectionModel();
final String PLUGIN_ID = "PLUGIN_ID";
- final String PLUGIN_DIR = Console.PREFERENCE_DIR + "caplugin" + File.separator;
+ final String PLUGIN_DIR = com.netscape.management.client.console.Console.PREFERENCE_DIR + "caplugin" + File.separator;
final String DEFAULT_PLUGIN_CLASS = "com.netscape.management.client.security.csr.DefaultPlugin.class";
final String DEFAULT_PLUGIN_DESC = "Manual Cert Request Plugin";
diff -ur idm-console-framework/src/com/netscape/management/client/topology/DomainNode.java idm-console-framework.new/src/com/netscape/management/client/topology/DomainNode.java
--- idm-console-framework/src/com/netscape/management/client/topology/DomainNode.java 2005-07-18 04:34:18 +0400
+++ idm-console-framework.new/src/com/netscape/management/client/topology/DomainNode.java 2007-08-08 12:39:43 +0400
@@ -200,14 +200,14 @@
removeAllChildren();
String _i18nHostsCreatedOutOf =
- Console._resource.getString("splash", "hostsCreatedOutOf");
+ com.netscape.management.client.console.Console._resource.getString("splash", "hostsCreatedOutOf");
String _i18nHostsCreated =
- Console._resource.getString("splash", "hostsCreated");
+ com.netscape.management.client.console.Console._resource.getString("splash", "hostsCreated");
long t1, t0 = System.currentTimeMillis();
int cnt = 0;
- SplashScreen splashScreen = SplashScreen.getInstance();
+ com.netscape.management.client.console.SplashScreen splashScreen = com.netscape.management.client.console.SplashScreen.getInstance();
removeAllChildren();
@@ -215,7 +215,7 @@
if (splashScreen != null && hostCount > 0 &&
System.getProperty("profile") != null) {
splashScreen.setStatusText( MessageFormat.format(
- Console._resource.getString("splash", "hostsCount"),
+ com.netscape.management.client.console.Console._resource.getString("splash", "hostsCount"),
new Object[]{ new Integer(hostCount), getName()}));
}
@@ -277,7 +277,7 @@
if (splashScreen != null && cnt > 1) {
splashScreen.setStatusText(
- Console._resource.getString("splash", "startingConsole"));
+ com.netscape.management.client.console.Console._resource.getString("splash", "startingConsole"));
//splashScreen.setStatusText(
// MessageFormat.format(Console._resource.getString("splash", "hostsCreatedDone"),
// new Object[] { new Integer(cnt), getName()}));
diff -ur idm-console-framework/src/com/netscape/management/client/topology/TopTopologyNode.java idm-console-framework.new/src/com/netscape/management/client/topology/TopTopologyNode.java
--- idm-console-framework/src/com/netscape/management/client/topology/TopTopologyNode.java 2005-07-18 04:34:19 +0400
+++ idm-console-framework.new/src/com/netscape/management/client/topology/TopTopologyNode.java 2007-08-08 12:38:12 +0400
@@ -50,7 +50,7 @@
// Show status
- SplashScreen splashScreen = SplashScreen.getInstance();
+ com.netscape.management.client.console.SplashScreen splashScreen = com.netscape.management.client.console.SplashScreen.getInstance();
if (splashScreen != null && splashScreen.isVisible()) {
splashScreen.setStatusText(
Console._resource.getString("splash", "discoveryOn"));
diff -ur idm-console-framework/src/com/netscape/management/client/util/IndexDialog.java idm-console-framework.new/src/com/netscape/management/client/util/IndexDialog.java
--- idm-console-framework/src/com/netscape/management/client/util/IndexDialog.java 2005-07-18 04:34:26 +0400
+++ idm-console-framework.new/src/com/netscape/management/client/util/IndexDialog.java 2007-08-08 12:34:08 +0400
@@ -193,8 +193,8 @@
protected JList populateIndex( URL url ) {
try {
AdmTask admTask = new AdmTask(url,
- Console.getConsoleInfo().getAuthenticationDN(),
- Console.getConsoleInfo().getAuthenticationPassword());
+ com.netscape.management.client.console.Console.getConsoleInfo().getAuthenticationDN(),
+ com.netscape.management.client.console.Console.getConsoleInfo().getAuthenticationPassword());
admTask.exec();
if (admTask.getException() != null) {