This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 6fab0bade deleting this... Is it a bad idea?
6fab0bade is described below
commit 6fab0baded950784fa18e8f7e4aa5e35c2703ec7
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun May 17 15:18:44 2026 -0400
deleting this... Is it a bad idea?
---
.../main/java/org/apache/cayenne/modeler/Application.java | 10 +++++-----
.../src/main/java/org/apache/cayenne/modeler/Main.java | 12 ++++++------
.../{UIPlatformInitializer.java => UIInitializer.java} | 2 +-
...ricPlatformInitializer.java => GenericUIInitializer.java} | 6 +++---
.../{MacPlatformInitializer.java => MacUIInitializer.java} | 4 ++--
.../{WinPlatformInitializer.java => WinUIInitializer.java} | 6 +++---
.../apache/cayenne/modeler/CayenneModelerValidationIT.java | 6 +++---
.../src/test/java/org/apache/cayenne/modeler/MainTest.java | 4 ++--
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
index 322fac1ed..97aa18d93 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.modeler.pref.PreferencesRepository;
import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
-import org.apache.cayenne.modeler.platform.UIPlatformInitializer;
+import org.apache.cayenne.modeler.platform.UIInitializer;
import
org.apache.cayenne.modeler.service.validator.ConfigurableProjectValidator;
import org.apache.cayenne.modeler.ui.MainFrame;
import org.apache.cayenne.modeler.ui.action.OpenProjectAction;
@@ -64,7 +64,7 @@ public class Application {
private static final Logger LOGGER =
LoggerFactory.getLogger(Application.class);
- public static void launch(String[] args, UIPlatformInitializer
platformInitializer) {
+ public static void launch(String[] args, UIInitializer
platformInitializer) {
try {
// logger should go after Look And Feel or Logger Console will be
without style
LOGGER.info("Starting CayenneModeler.");
@@ -102,7 +102,7 @@ public class Application {
}
private final Injector injector;
- private final UIPlatformInitializer platformInitializer;
+ private final UIInitializer platformInitializer;
private final ModelerClassLoader classLoader;
private final PreferencesRepository preferencesRepository;
private final GlobalActions actionManager;
@@ -112,7 +112,7 @@ public class Application {
private CayenneUndoManager undoManager;
private DBConnectors dbConnectors;
- public Application(Injector injector, UIPlatformInitializer
platformInitializer) {
+ public Application(Injector injector, UIInitializer platformInitializer) {
this.injector = injector;
this.platformInitializer = platformInitializer;
@@ -154,7 +154,7 @@ public class Application {
return injector.getInstance(UpgradeService.class);
}
- public UIPlatformInitializer getPlatformInitializer() {
+ public UIInitializer getPlatformInitializer() {
return platformInitializer;
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index 40aadf424..9a3c3c007 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.modeler;
import org.apache.cayenne.modeler.service.os.OperatingSystem;
-import org.apache.cayenne.modeler.platform.UIPlatformInitializer;
+import org.apache.cayenne.modeler.platform.UIInitializer;
public final class Main {
@@ -28,15 +28,15 @@ public final class Main {
Application.launch(args, loadPlatformInitializer(OperatingSystem.os));
}
- static UIPlatformInitializer loadPlatformInitializer(OperatingSystem os) {
+ static UIInitializer loadPlatformInitializer(OperatingSystem os) {
String fqn = switch (os) {
- case MAC_OS ->
"org.apache.cayenne.modeler.platform.mac.MacPlatformInitializer";
- case WINDOWS ->
"org.apache.cayenne.modeler.platform.win.WinPlatformInitializer";
- case OTHER ->
"org.apache.cayenne.modeler.platform.generic.GenericPlatformInitializer";
+ case MAC_OS ->
"org.apache.cayenne.modeler.platform.mac.MacUIInitializer";
+ case WINDOWS ->
"org.apache.cayenne.modeler.platform.win.WinUIInitializer";
+ case OTHER ->
"org.apache.cayenne.modeler.platform.generic.GenericUIInitializer";
};
try {
- return (UIPlatformInitializer)
Class.forName(fqn).getDeclaredConstructor().newInstance();
+ return (UIInitializer)
Class.forName(fqn).getDeclaredConstructor().newInstance();
} catch (ReflectiveOperationException e) {
throw new IllegalStateException("Cannot load platform initializer
" + fqn, e);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIPlatformInitializer.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java
similarity index 97%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIPlatformInitializer.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java
index 4510f7a9f..7c094416e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIPlatformInitializer.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/UIInitializer.java
@@ -25,7 +25,7 @@ import javax.swing.JFrame;
/**
* A base callback for platform-specific Modeler initialization.
*/
-public interface UIPlatformInitializer {
+public interface UIInitializer {
/**
* Initializes application look and feel.
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericPlatformInitializer.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericUIInitializer.java
similarity index 96%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericPlatformInitializer.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericUIInitializer.java
index 31488ef96..496cee539 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericPlatformInitializer.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/generic/GenericUIInitializer.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.platform.generic;
import com.jgoodies.looks.plastic.PlasticLookAndFeel;
import com.jgoodies.looks.plastic.PlasticTheme;
import com.jgoodies.looks.plastic.PlasticXPLookAndFeel;
-import org.apache.cayenne.modeler.platform.UIPlatformInitializer;
+import org.apache.cayenne.modeler.platform.UIInitializer;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,9 +29,9 @@ import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.awt.*;
-public class GenericPlatformInitializer implements UIPlatformInitializer {
+public class GenericUIInitializer implements UIInitializer {
- private static final Logger LOGGER =
LoggerFactory.getLogger(GenericPlatformInitializer.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(GenericUIInitializer.class);
private static final String DEFAULT_LAF_NAME =
PlasticXPLookAndFeel.class.getName();
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacPlatformInitializer.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java
similarity index 97%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacPlatformInitializer.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java
index 4146ad6c9..d4051348d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacPlatformInitializer.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/mac/MacUIInitializer.java
@@ -20,7 +20,7 @@ package org.apache.cayenne.modeler.platform.mac;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.service.action.GlobalActions;
-import org.apache.cayenne.modeler.platform.UIPlatformInitializer;
+import org.apache.cayenne.modeler.platform.UIInitializer;
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,7 +32,7 @@ import java.awt.*;
import java.util.HashSet;
import java.util.Set;
-public class MacPlatformInitializer implements UIPlatformInitializer {
+public class MacUIInitializer implements UIInitializer {
@Override
public void initLookAndFeel() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinPlatformInitializer.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java
similarity index 95%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinPlatformInitializer.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java
index 0b2cf863b..197a8013d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinPlatformInitializer.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/platform/win/WinUIInitializer.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler.platform.win;
import com.jgoodies.looks.windows.WindowsLookAndFeel;
-import org.apache.cayenne.modeler.platform.UIPlatformInitializer;
+import org.apache.cayenne.modeler.platform.UIInitializer;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,9 +27,9 @@ import org.slf4j.LoggerFactory;
import javax.swing.*;
import java.awt.*;
-public class WinPlatformInitializer implements UIPlatformInitializer {
+public class WinUIInitializer implements UIInitializer {
- private static final Logger LOGGER =
LoggerFactory.getLogger(WinPlatformInitializer.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(WinUIInitializer.class);
@Override
public void initLookAndFeel() {
diff --git
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
index ef4452992..7ca7977f2 100644
---
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
+++
b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/CayenneModelerValidationIT.java
@@ -22,7 +22,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.dbsync.reverse.configuration.ToolsModule;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
-import org.apache.cayenne.modeler.platform.UIPlatformInitializer;
+import org.apache.cayenne.modeler.platform.UIInitializer;
import
org.apache.cayenne.modeler.service.validator.ConfigurableProjectValidator;
import org.apache.cayenne.project.Project;
import org.apache.cayenne.project.ProjectLoader;
@@ -58,7 +58,7 @@ public class CayenneModelerValidationIT {
@Test
public void validatorProvided() {
- Application application = new Application(injector, new
UIPlatformInitializer() {
+ Application application = new Application(injector, new
UIInitializer() {
});
assertTrue(application.getProjectValidator() instanceof
ConfigurableProjectValidator);
}
@@ -66,7 +66,7 @@ public class CayenneModelerValidationIT {
@Test
public void configLoaded() {
URLResource projectResource = new
URLResource(getClass().getResource(CAYENNE_CONFIGURED_VALIDATION_PROJECT));
- Application application = new Application(injector, new
UIPlatformInitializer() {
+ Application application = new Application(injector, new
UIInitializer() {
});
ProjectLoader projectLoader =
injector.getInstance(ProjectLoader.class);
Project project = projectLoader.loadProject(projectResource);
diff --git
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java
b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java
index 18869bfa5..dcb75ca70 100644
---
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java
+++
b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/MainTest.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler;
-import org.apache.cayenne.modeler.platform.UIPlatformInitializer;
+import org.apache.cayenne.modeler.platform.UIInitializer;
import org.apache.cayenne.modeler.service.os.OperatingSystem;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
@@ -31,7 +31,7 @@ public class MainTest {
@ParameterizedTest
@EnumSource(OperatingSystem.class)
public void loadPlatformInitializer_resolvesValidClass(OperatingSystem os)
{
- UIPlatformInitializer initializer = Main.loadPlatformInitializer(os);
+ UIInitializer initializer = Main.loadPlatformInitializer(os);
assertNotNull(initializer, "No initializer resolved for " + os);
}
}
