You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/05/03 01:38:08 UTC
(cayenne) 01/02: Modeler Cleanup
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
commit 01fb3a93f104463152761f9ac89c5e1ec62a8148
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat May 2 21:25:30 2026 -0400
Modeler Cleanup
---
.../modeler/ui/preferences/PreferenceDialogController.java | 6 +++---
.../MorePreferencesController.java} | 10 +++++-----
.../AllPreferencesView.java => more/MorePreferencesView.java} | 6 +++---
.../ui/project/editor/datamap/main/DataMapMainView.java | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java
index 3fed65c48..5a650a31b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.ui.preferences;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.mvc.RootController;
-import org.apache.cayenne.modeler.ui.preferences.all.AllPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.more.MorePreferencesController;
import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesController;
import org.apache.cayenne.modeler.ui.preferences.datasource.DataSourcePreferencesController;
import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
@@ -49,7 +49,7 @@ public class PreferenceDialogController extends ChildController<RootController>
private final GeneralPreferencesController generalPrefsController;
private final DataSourcePreferencesController dataSourcePrefsController;
private final ClasspathPreferencesController classpathPrefsController;
- private final AllPreferencesController allPrefsController;
+ private final MorePreferencesController allPrefsController;
public PreferenceDialogController(final RootController parent) {
super(parent);
@@ -78,7 +78,7 @@ public class PreferenceDialogController extends ChildController<RootController>
this.classpathPrefsController = new ClasspathPreferencesController(this);
view.getDetailPanel().add(classpathPrefsController.getView(), CLASSPATH_KEY);
- this.allPrefsController = new AllPreferencesController(this);
+ this.allPrefsController = new MorePreferencesController(this);
view.getDetailPanel().add(allPrefsController.getView(), MORE_KEY);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/all/AllPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesController.java
similarity index 91%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/all/AllPreferencesController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesController.java
index 8868b021e..0c36cfc47 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/all/AllPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesController.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.preferences.all;
+package org.apache.cayenne.modeler.ui.preferences.more;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.mvc.ChildController;
@@ -29,14 +29,14 @@ import javax.swing.*;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
-public class AllPreferencesController extends ChildController<PreferenceDialogController> {
+public class MorePreferencesController extends ChildController<PreferenceDialogController> {
- private final AllPreferencesView view;
+ private final MorePreferencesView view;
- public AllPreferencesController(PreferenceDialogController parent) {
+ public MorePreferencesController(PreferenceDialogController parent) {
super(parent);
- this.view = new AllPreferencesView();
+ this.view = new MorePreferencesView();
view.getCopyAllButton().addActionListener(e -> copyAllToClipboard());
view.getDeleteAllButton().addActionListener(e -> deleteAll());
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/all/AllPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesView.java
similarity index 93%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/all/AllPreferencesView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesView.java
index d5b75b9e3..8bca8b1ac 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/all/AllPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesView.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.preferences.all;
+package org.apache.cayenne.modeler.ui.preferences.more;
import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
@@ -26,12 +26,12 @@ import com.jgoodies.forms.layout.FormLayout;
import javax.swing.*;
import java.awt.*;
-public class AllPreferencesView extends JPanel {
+public class MorePreferencesView extends JPanel {
private final JButton copyAllButton;
private final JButton deleteAllButton;
- public AllPreferencesView() {
+ public MorePreferencesView() {
this.copyAllButton = new JButton("Copy All to Clipboard");
this.deleteAllButton = new JButton("Delete All");
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
index 57f13dba3..2b15b2b18 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
@@ -136,7 +136,7 @@ public class DataMapMainView extends JPanel {
initFromModel(map);
}
});
-
+
nodeSelector.addActionListener(e -> setDataNode());
quoteSQLIdentifiers.addItemListener(e -> setQuoteSQLIdentifiers(quoteSQLIdentifiers.isSelected()));
defaultLockType.addItemListener(e -> setDefaultLockType(defaultLockType.isSelected()