From c26a450e176ec80a194348ab02a4a5960334536e Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 09 Jan 2007 15:03:47 +0000
Subject: [PATCH] Fix a bug in the Utils.isMacOS function and remove some unused functions.
---
opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java | 2 +-
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java | 2 ++
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java | 2 +-
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java | 4 ++--
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java | 6 ------
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java | 3 ++-
6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
index 0adfe02..b1f8dda 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetupDialog.java
@@ -36,6 +36,7 @@
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
import org.opends.quicksetup.ButtonName;
import org.opends.quicksetup.CurrentInstallStatus;
@@ -144,7 +145,7 @@
}
}
});
- frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+ frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
UIFactory.IconType ic;
if (Utils.isMacOS())
{
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
index c2d3f4d3..8de9731 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
@@ -664,6 +664,8 @@
b.setToolTipText(tooltip);
}
+ b.setOpaque(false);
+
return b;
}
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
index b79185e..95242f9 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/UninstallLauncher.java
@@ -213,12 +213,6 @@
Utils.getCommandLineMaxLineWidth());
}
- private static String getMsg(String key, String[] args)
- {
- return org.opends.server.util.StaticUtils.wrapText(
- getI18n().getMsg(key, args), Utils.getCommandLineMaxLineWidth());
- }
-
private static ResourceProvider getI18n()
{
return ResourceProvider.getInstance();
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
index 9c0357b..9167721 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/uninstaller/Uninstaller.java
@@ -667,8 +667,8 @@
/* Create these objects to resend the stop process output to the details
* area.
*/
- StopReader errorReader = new StopReader(err, true);
- StopReader outputReader = new StopReader(out, false);
+ new StopReader(err, true);
+ new StopReader(out, false);
int returnValue = process.waitFor();
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
index 2d989e3..833da50 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/Utils.java
@@ -320,7 +320,7 @@
*/
public static boolean isMacOS()
{
- return containsOsProperty("Mac OS");
+ return containsOsProperty("mac os");
}
/**
diff --git a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java
index 9cea3bb..9a2e030 100644
--- a/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java
+++ b/opendj-sdk/opends/src/statuspanel/org/opends/statuspanel/ui/StatusPanelDialog.java
@@ -137,7 +137,7 @@
quitClicked();
}
});
- setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+ setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
UIFactory.IconType ic;
if (Utils.isMacOS())
{
--
Gitblit v1.10.0