GlobalActions must be initialized lazily, leset they are triggered during unit tests

Author: andrus

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

@@ -105,8 +105,8 @@ private static File initialProjectFromArgs(String[] args) {
     private final UIInitializer platformInitializer;
     private final ModelerClassLoader classLoader;
     private final PreferencesRepository preferencesRepository;
-    private final GlobalActions actionManager;
     private final ProjectValidator projectValidator;
+    private GlobalActions actionManager;
     private LogConsole logConsole;
     private MainFrame frame;
     private CayenneUndoManager undoManager;
@@ -118,10 +118,6 @@ public Application(Injector injector, UIInitializer platformInitializer) {
 
         this.classLoader = new ModelerClassLoader();
         this.preferencesRepository = new PreferencesRepository(injector.getInstance(ConfigurationNameMapper.class));
-        this.actionManager = new GlobalActions(
-                this,
-                injector.getInstance(ConfigurationNameMapper.class),
-                injector.getInstance(ConfigurationNodeParentGetter.class));
         this.projectValidator = new ConfigurableProjectValidator(this);
     }
 
@@ -187,7 +183,11 @@ public LogConsole getLogConsole() {
     }
 
     public void launch(File initialProject) {
-        platformInitializer.initLookAndFeel();
+        this.platformInitializer.initLookAndFeel();
+        this.actionManager = new GlobalActions(
+                this,
+                injector.getInstance(ConfigurationNameMapper.class),
+                injector.getInstance(ConfigurationNodeParentGetter.class));
 
         this.logConsole = new LogConsole(this);
         ModelerLogFactory.setAppender(logConsole);