From 1cc714052eeea68b2f091b31cd5667b95c471f32 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Sat, 29 Nov 2008 12:45:46 +0000
Subject: [PATCH] The fix for issue 3633 introduced a regression in the way the Mac OS menu is displayed. The properties that must to be set to update properly the Mac OS menu must be set before loading AWT.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 12 ++++--------
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java | 4 ++--
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index a15727e..4630273 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -236,12 +236,12 @@
private static void initLookAndFeel() throws Throwable
{
+// Setup MacOSX native menu bar before AWT is loaded.
+ Utils.setMacOSXMenuBar(
+ AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get());
+
if (SwingUtilities.isEventDispatchThread())
{
-// Setup MacOSX native menu bar before AWT is loaded.
- Utils.setMacOSXMenuBar(
- AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get());
-
UIManager.setLookAndFeel(
UIManager.getSystemLookAndFeelClassName());
}
@@ -254,10 +254,6 @@
{
try
{
-// Setup MacOSX native menu bar before AWT is loaded.
- Utils.setMacOSXMenuBar(
- AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get());
-
UIManager.setLookAndFeel(
UIManager.getSystemLookAndFeelClassName());
}
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
index cfdb5bf..8b3535a 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/Launcher.java
@@ -215,6 +215,8 @@
*/
protected int launchGui(final String[] args)
{
+// Setup MacOSX native menu bar before AWT is loaded.
+ Utils.setMacOSXMenuBar(getFrameTitle());
final int[] returnValue =
{ -1 };
Thread t = new Thread(new Runnable()
@@ -223,8 +225,6 @@
{
try
{
- // Setup MacOSX native menu bar before AWT is loaded.
- Utils.setMacOSXMenuBar(getFrameTitle());
SplashScreen.main(args);
returnValue[0] = 0;
}
--
Gitblit v1.10.0