The fix for issue 3633 introduced a regression in the way the Mac OS menu i...

jvergara

29.45.2008 1cc714052eeea68b2f091b31cd5667b95c471f32

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

@@ -236,12 +236,12 @@

  private static void initLookAndFeel() throws Throwable
  {
    if (SwingUtilities.isEventDispatchThread())
    {
//    Setup MacOSX native menu bar before AWT is loaded.
      Utils.setMacOSXMenuBar(
          AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get());

    if (SwingUtilities.isEventDispatchThread())
    {
      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());
          }

 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;
        }