Modeler cleanup - taking PlatformInitializer out of DI

Author: andrus

modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericCayenneModelerModule.java

@@ -18,34 +18,11 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.generic;
 
-import java.util.Collection;
+import org.apache.cayenne.modeler.Application;
 
-import org.apache.cayenne.di.Module;
-import org.apache.cayenne.modeler.Main;
+public final class GenericMain {
 
-public class GenericMain extends Main {
-
-    /**
-     * Main method that starts the CayenneModeler.
-     */
     public static void main(String[] args) {
-        try {
-            new GenericMain(args).launch();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    protected GenericMain(String[] args) {
-        super(args);
-    }
-
-    @Override
-    protected Collection<Module> appendModules(Collection<Module> modules) {
-        modules = super.appendModules(modules);
-        modules.add(new GenericCayenneModelerModule());
-        return modules;
+        Application.launch(args, new GenericPlatformInitializer());
     }
 }

modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericMain.java

@@ -21,28 +21,24 @@
 import com.jgoodies.looks.plastic.PlasticLookAndFeel;
 import com.jgoodies.looks.plastic.PlasticTheme;
 import com.jgoodies.looks.plastic.PlasticXPLookAndFeel;
-import org.apache.cayenne.modeler.service.platform.PlatformInitializer;
+import org.apache.cayenne.modeler.ui.UIPlatformInitializer;
 import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
 
-public class GenericPlatformInitializer implements PlatformInitializer {
+public class GenericPlatformInitializer implements UIPlatformInitializer {
 
-    private static Logger logger = LoggerFactory.getLogger(GenericPlatformInitializer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(GenericPlatformInitializer.class);
 
-    static final String DEFAULT_LAF_NAME = PlasticXPLookAndFeel.class.getName();
+    private static final String DEFAULT_LAF_NAME = PlasticXPLookAndFeel.class.getName();
 
-    // note that another theme - "Desert Blue" doesn't support Chinese and
-    // Japanese chars
-    static final String DEFAULT_THEME_NAME = "Sky Bluer";
-
-    public void setupMenus(JFrame frame) {
-        // noop - default menus are fine
-    }
+    // note that another theme - "Desert Blue" doesn't support Chinese and Japanese chars
+    private static final String DEFAULT_THEME_NAME = "Sky Bluer";
 
+    @Override
     public void initLookAndFeel() {
 
         PlasticTheme theme = findTheme();
@@ -56,7 +52,7 @@ public void initLookAndFeel() {
             // override some default styles and colors
             overrideUIDefaults();
         } catch (Exception e) {
-            logger.warn("Error installing L&F: " + DEFAULT_LAF_NAME, e);
+            LOGGER.warn("Error installing L&F: " + DEFAULT_LAF_NAME, e);
         }
     }
 
@@ -89,7 +85,7 @@ private void overrideUIDefaults() {
         UIManager.put("MainToolBar.border",             BorderFactory.createLineBorder(Color.GRAY));
     }
 
-    protected PlasticTheme findTheme() {
+    private PlasticTheme findTheme() {
 
         for (Object object : PlasticLookAndFeel.getInstalledThemes()) {
             PlasticTheme theme = (PlasticTheme) object;
@@ -99,5 +95,4 @@ protected PlasticTheme findTheme() {
         }
         return null;
     }
-
 }

modeler/cayenne-modeler-generic-ext/src/main/java/org/apache/cayenne/modeler/generic/GenericPlatformInitializer.java

@@ -19,37 +19,11 @@
 
 package org.apache.cayenne.modeler.osx;
 
-import java.util.Collection;
+import org.apache.cayenne.modeler.Application;
 
-import org.apache.cayenne.di.Module;
-import org.apache.cayenne.modeler.Main;
+public final class OSXMain {
 
-/**
- * Main class to start CayenneModeler on MacOSX.
- */
-public class OSXMain extends Main {
-
-    /**
-     * Main method that starts the CayenneModeler.
-     */
     public static void main(String[] args) {
-        try {
-            new OSXMain(args).launch();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    protected OSXMain(String[] args) {
-        super(args);
-    }
-
-    @Override
-    protected Collection<Module> appendModules(Collection<Module> modules) {
-        modules = super.appendModules(modules);
-        modules.add(new OSXCayenneModelerModule());
-        return modules;
+        Application.launch(args, new OSXPlatformInitializer());
     }
 }

modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXCayenneModelerModule.java

@@ -18,9 +18,9 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.osx;
 
-import org.apache.cayenne.di.Inject;
-import org.apache.cayenne.modeler.service.platform.PlatformInitializer;
+import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.service.action.GlobalActions;
+import org.apache.cayenne.modeler.ui.UIPlatformInitializer;
 import org.apache.cayenne.modeler.ui.action.AboutAction;
 import org.apache.cayenne.modeler.ui.action.ConfigurePreferencesAction;
 import org.apache.cayenne.modeler.ui.action.ExitAction;
@@ -32,31 +32,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class OSXPlatformInitializer implements PlatformInitializer {
-
-    @Inject
-    protected GlobalActions globalActions;
+public class OSXPlatformInitializer implements UIPlatformInitializer {
 
     @Override
     public void initLookAndFeel() {
-
         // override some default styles and colors, assuming that Aqua theme will be used
-        overrideUIDefaults();
-
-        Desktop desktop = Desktop.getDesktop();
-
-        desktop.setAboutHandler(e -> globalActions.getAction(AboutAction.class).showAboutDialog());
-        desktop.setPreferencesHandler(e -> globalActions.getAction(ConfigurePreferencesAction.class).showPreferencesDialog());
-        desktop.setQuitHandler((e, r) -> {
-            if (!globalActions.getAction(ExitAction.class).exit()) {
-                r.cancelQuit();
-            } else {
-                r.performQuit();
-            }
-        });
-    }
 
-    private void overrideUIDefaults() {
         Color lightGrey = new Color(0xEEEEEE);
         Color darkGrey = new Color(225, 225, 225);
         Border darkBorder = BorderFactory.createLineBorder(darkGrey);
@@ -108,7 +89,21 @@ public void paintBorder(Component c, Graphics g, int x, int y, int width, int he
     }
 
     @Override
-    public void setupMenus(JFrame frame) {
+    public void setupMenus(Application app, JFrame frame) {
+
+        GlobalActions globalActions = app.getActionManager();
+
+        Desktop desktop = Desktop.getDesktop();
+        desktop.setAboutHandler(e -> globalActions.getAction(AboutAction.class).showAboutDialog());
+        desktop.setPreferencesHandler(e -> globalActions.getAction(ConfigurePreferencesAction.class).showPreferencesDialog());
+        desktop.setQuitHandler((e, r) -> {
+            if (!globalActions.getAction(ExitAction.class).exit()) {
+                r.cancelQuit();
+            } else {
+                r.performQuit();
+            }
+        });
+
         // set additional look and feel for the window
         frame.getRootPane().putClientProperty("apple.awt.brushMetalLook", Boolean.TRUE);
 

modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXMain.java

@@ -18,33 +18,11 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.win;
 
-import org.apache.cayenne.di.Module;
-import org.apache.cayenne.modeler.Main;
+import org.apache.cayenne.modeler.Application;
 
-import java.util.Collection;
+public final class WinMain {
 
-public class WinMain extends Main {
-
-    /**
-     * Main method that starts the CayenneModeler.
-     */
     public static void main(String[] args) {
-        try {
-            new WinMain(args).launch();
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-    }
-
-    protected WinMain(String[] args) {
-        super(args);
-    }
-
-    @Override
-    protected Collection<Module> appendModules(Collection<Module> modules) {
-        modules = super.appendModules(modules);
-        modules.add(new WinCayenneModelerModule());
-        return modules;
+        Application.launch(args, new WinPlatformInitializer());
     }
 }

modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/osx/OSXPlatformInitializer.java

@@ -19,23 +19,17 @@
 package org.apache.cayenne.modeler.win;
 
 import com.jgoodies.looks.windows.WindowsLookAndFeel;
-import org.apache.cayenne.modeler.service.platform.PlatformInitializer;
+import org.apache.cayenne.modeler.ui.UIPlatformInitializer;
 import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.swing.JFrame;
-import javax.swing.UIManager;
-import javax.swing.BorderFactory;
-import java.awt.Color;
+import javax.swing.*;
+import java.awt.*;
 
-public class WinPlatformInitializer implements PlatformInitializer {
+public class WinPlatformInitializer implements UIPlatformInitializer {
 
-    private static Logger logger = LoggerFactory.getLogger(WinPlatformInitializer.class);
-
-    @Override
-    public void setupMenus(JFrame frame) {
-    }
+    private static final Logger LOGGER = LoggerFactory.getLogger(WinPlatformInitializer.class);
 
     @Override
     public void initLookAndFeel() {
@@ -44,7 +38,7 @@ public void initLookAndFeel() {
             // override some default styles and colors
             overrideUIDefaults();
         } catch (Exception e) {
-            logger.warn("Error installing L&F: " + WindowsLookAndFeel.class.getName(), e);
+            LOGGER.warn("Error installing L&F: " + WindowsLookAndFeel.class.getName(), e);
         }
     }