A more robust "universal" Main on mac

Author: andrus

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java

@@ -64,7 +64,9 @@ public class Application {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(Application.class);
 
-    public static void launch(String[] args, UIInitializer platformInitializer) {
+    public static void launch(String[] args, UIInitializer platformInit) {
+
+        platformInit.beforeSwingLaunch();
 
         CliArgs cli = CliArgs.parse(args);
 
@@ -80,11 +82,11 @@ public static void launch(String[] args, UIInitializer platformInitializer) {
                 new ModelerModule());
 
         SwingUtilities.invokeLater(() ->
-                new Application(injector, platformInitializer, cli).launch(cli.initialProject()));
+                new Application(injector, platformInit, cli).launch(cli.initialProject()));
     }
 
     private final Injector injector;
-    private final UIInitializer platformInitializer;
+    private final UIInitializer platformInit;
     private final ModelerClassLoader classLoader;
     private final PreferencesRepository preferencesRepository;
     private final ProjectValidator projectValidator;
@@ -95,9 +97,9 @@ public static void launch(String[] args, UIInitializer platformInitializer) {
     private CayenneUndoManager undoManager;
     private DBConnectors dbConnectors;
 
-    public Application(Injector injector, UIInitializer platformInitializer, CliArgs cli) {
+    public Application(Injector injector, UIInitializer platformInit, CliArgs cli) {
         this.injector = injector;
-        this.platformInitializer = platformInitializer;
+        this.platformInit = platformInit;
         this.cli = cli;
 
         this.classLoader = new ModelerClassLoader();
@@ -134,8 +136,8 @@ public UpgradeService getUpgradeService() {
         return injector.getInstance(UpgradeService.class);
     }
 
-    public UIInitializer getPlatformInitializer() {
-        return platformInitializer;
+    public UIInitializer getPlatformInit() {
+        return platformInit;
     }
 
     public ConfigurationNodeParentGetter getConfigurationNodeParentGetter() {
@@ -171,7 +173,7 @@ public CliArgs getCli() {
     }
 
     public void launch(File initialProject) {
-        this.platformInitializer.initLookAndFeel();
+
         this.actionManager = new GlobalActions(
                 this,
                 injector.getInstance(ConfigurationNameMapper.class),
@@ -197,6 +199,8 @@ public void launch(File initialProject) {
 
         this.undoManager = new CayenneUndoManager(this);
         this.frame = new MainFrame(this);
+        this.platformInit.afterFrameCreated(this);
+
 
         // open up
         frame.onStartup();

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java

@@ -20,22 +20,22 @@
 
 import org.apache.cayenne.modeler.Application;
 
-import javax.swing.JFrame;
-
 /**
  * A base callback for platform-specific Modeler initialization.
  */
 public interface UIInitializer {
 
     /**
-     * Initializes application look and feel.
+     * Sets platform-specific system properties and initializes the application look and feel.
+     * Called before AWT/Swing is touched, so implementations may set properties that AWT reads
+     * only during its own init (e.g. {@code apple.awt.application.name}) before installing the L&F.
      */
-    default void initLookAndFeel() {
+    default void beforeSwingLaunch() {
     }
 
     /**
      * Updates default frame menus according to the platform specifics.
      */
-    default void setupMenus(Application app, JFrame frame) {
+    default void afterFrameCreated(Application app) {
     }
 }

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericUIInitializer.java

@@ -39,7 +39,7 @@ public class GenericUIInitializer implements UIInitializer {
     private static final String DEFAULT_THEME_NAME = "Sky Bluer";
 
     @Override
-    public void initLookAndFeel() {
+    public void beforeSwingLaunch() {
 
         PlasticTheme theme = findTheme();
 

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java

@@ -35,7 +35,10 @@
 public class MacUIInitializer implements UIInitializer {
 
     @Override
-    public void initLookAndFeel() {
+    public void beforeSwingLaunch() {
+        // must be set before Aqua L&F initializes — it reads this property during init
+        System.setProperty("apple.awt.application.name", "CayenneModeler");
+
         // override some default styles and colors, assuming that Aqua theme will be used
 
         Color lightGrey = new Color(0xEEEEEE);
@@ -89,10 +92,10 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
     }
 
     @Override
-    public void setupMenus(Application app, JFrame frame) {
+    public void afterFrameCreated(Application app) {
 
         // set additional look and feel for the window
-        frame.getRootPane().putClientProperty("apple.awt.brushMetalLook", Boolean.TRUE);
+        app.getFrame().getRootPane().putClientProperty("apple.awt.brushMetalLook", Boolean.TRUE);
 
         // Only relocate About/Preferences/Quit to the macOS application menu when the
         // screen menu bar is actually in use. Otherwise the JMenuBar stays inside the
@@ -119,7 +122,7 @@ public void setupMenus(Application app, JFrame frame) {
         removeActions.add(globalActions.getAction(AboutAction.class));
         removeActions.add(globalActions.getAction(ConfigurePreferencesAction.class));
 
-        JMenuBar menuBar = frame.getJMenuBar();
+        JMenuBar menuBar = app.getFrame().getJMenuBar();
         for (Component c : menuBar.getComponents()) {
             if (c instanceof JMenu menu) {
 

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java

@@ -32,7 +32,7 @@ public class WinUIInitializer implements UIInitializer {
     private static final Logger LOGGER = LoggerFactory.getLogger(WinUIInitializer.class);
 
     @Override
-    public void initLookAndFeel() {
+    public void beforeSwingLaunch() {
         try {
             UIManager.setLookAndFeel(WindowsLookAndFeel.class.getName());
             // override some default styles and colors

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java

@@ -135,8 +135,6 @@ public MainFrame(Application app) {
 
         setProjectView(null);
 
-        this.app.getPlatformInitializer().setupMenus(this.app, this);
-
         this.session = new ProjectSession(this.app);
         this.session.addDirtyListener((wasDirty, isDirty) -> {
             if (isDirty) {