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/04/21 00:24:50 UTC
(cayenne) 03/03: 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 f27f398b0e4e39cf4d26a450e76b3f93151cef1c
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Mon Apr 20 19:32:15 2026 -0400
Modeler cleanup
cleaning up prefs controller.
Fixing proper card selection display
---
.../main/java/org/apache/cayenne/modeler/Main.java | 6 +-
.../modeler/action/ConfigurePreferencesAction.java | 3 +-
.../modeler/dialog/ConfirmRemoveDialog.java | 10 +-
.../dialog/db/DataSourceWizardController.java | 10 +-
.../pref/CayenneModelerPreferenceEditor.java | 1 -
.../pref/ClasspathPreferencesController.java | 16 +--
.../pref/DataSourcePreferencesController.java | 34 ++----
.../modeler/dialog/pref/GeneralPreferences.java | 126 ---------------------
.../dialog/pref/GeneralPreferencesController.java | 116 +++++++++++++++++++
.../dialog/pref/PreferenceDialogController.java | 108 +++++++-----------
.../modeler/editor/cgen/CgenController.java | 6 +-
.../editor/cgen/domain/CgenTabController.java | 6 +-
.../org/apache/cayenne/pref/PreferenceEditor.java | 6 +-
13 files changed, 194 insertions(+), 254 deletions(-)
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 6070ad11c..48820a26d 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
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
import org.apache.cayenne.di.Module;
import org.apache.cayenne.modeler.action.OpenProjectAction;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferences;
+import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
import org.apache.cayenne.modeler.init.CayenneModelerModule;
import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
import org.apache.cayenne.project.ProjectModule;
@@ -112,9 +112,9 @@ public class Main {
protected File initialProjectFromPreferences() {
- Preferences autoLoadLastProject = Application.getInstance().getPreferencesNode(GeneralPreferences.class, "");
+ Preferences autoLoadLastProject = Application.getInstance().getPreferencesNode(GeneralPreferencesController.class, "");
if ((autoLoadLastProject != null)
- && autoLoadLastProject.getBoolean(GeneralPreferences.AUTO_LOAD_PROJECT_PREFERENCE, false)) {
+ && autoLoadLastProject.getBoolean(GeneralPreferencesController.AUTO_LOAD_PROJECT_PREFERENCE, false)) {
List<File> lastFiles = ModelerPreferences.getLastProjFiles();
if (!lastFiles.isEmpty()) {
return lastFiles.get(0);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
index 2a82c1734..c9169ef1d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
@@ -41,8 +41,7 @@ public class ConfigurePreferencesAction extends CayenneAction {
}
public void showPreferencesDialog() {
- new PreferenceDialogController(getApplication().getFrameController()).startupAction(null);
-
+ new PreferenceDialogController(getApplication().getFrameController()).showGeneralEditorAction();
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
index 9f4c88c83..e8f56042a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
@@ -24,7 +24,7 @@ import javax.swing.JCheckBox;
import javax.swing.JOptionPane;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferences;
+import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
/**
* Used to confirm deleting items in the model.
@@ -65,10 +65,10 @@ public class ConfirmRemoveDialog {
// it's non-sensical.
if (shouldDelete) {
Preferences pref = Application.getInstance().getPreferencesNode(
- GeneralPreferences.class,
+ GeneralPreferencesController.class,
"");
pref.putBoolean(
- GeneralPreferences.DELETE_PROMPT_PREFERENCE,
+ GeneralPreferencesController.DELETE_PROMPT_PREFERENCE,
neverPromptAgainBox.isSelected());
}
}
@@ -81,13 +81,13 @@ public class ConfirmRemoveDialog {
if (allowAsking) {
Preferences pref = Application.getInstance().getPreferencesNode(
- GeneralPreferences.class,
+ GeneralPreferencesController.class,
"");
// See if the user has opted not to showDialog the delete dialog.
if ((pref == null)
|| !pref.getBoolean(
- GeneralPreferences.DELETE_PROMPT_PREFERENCE,
+ GeneralPreferencesController.DELETE_PROMPT_PREFERENCE,
false)) {
showDialog(name);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
index 8b1facd45..5bd32b8e5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.dialog.db;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.modeler.ClassLoadingService;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferences;
+import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
import org.apache.cayenne.modeler.dialog.pref.PreferenceDialogController;
import org.apache.cayenne.modeler.event.model.DataSourceEvent;
import org.apache.cayenne.modeler.event.model.DataSourceListener;
@@ -105,8 +105,8 @@ public class DataSourceWizardController extends ChildController<ProjectControlle
}
private void initFavouriteDataSource() {
- final Preferences pref = getApplication().getPreferencesNode(GeneralPreferences.class, "");
- final String favouriteDataSource = pref.get(GeneralPreferences.FAVOURITE_DATA_SOURCE, null);
+ final Preferences pref = getApplication().getPreferencesNode(GeneralPreferencesController.class, "");
+ final String favouriteDataSource = pref.get(GeneralPreferencesController.FAVOURITE_DATA_SOURCE, null);
if (favouriteDataSource != null && dataSources.containsKey(favouriteDataSource)) {
setDataSourceKey(favouriteDataSource);
view.getDataSources().setSelectedItem(dataSourceKey);
@@ -212,8 +212,8 @@ public class DataSourceWizardController extends ChildController<ProjectControlle
view.dispose();
removeDataSourceListener();
if (!canceled) {
- Preferences pref = getApplication().getPreferencesNode(GeneralPreferences.class, "");
- pref.put(GeneralPreferences.FAVOURITE_DATA_SOURCE, dataSourceKey);
+ Preferences pref = getApplication().getPreferencesNode(GeneralPreferencesController.class, "");
+ pref.put(GeneralPreferencesController.FAVOURITE_DATA_SOURCE, dataSourceKey);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CayenneModelerPreferenceEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CayenneModelerPreferenceEditor.java
index f7e11996c..2cf084ce9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CayenneModelerPreferenceEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CayenneModelerPreferenceEditor.java
@@ -24,7 +24,6 @@ import org.apache.cayenne.pref.CayennePreferenceEditor;
/**
* Specialized preferences editor for CayenneModeler.
- *
*/
public class CayenneModelerPreferenceEditor extends CayennePreferenceEditor {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesController.java
index 9a49fcd8a..bfa2d77e3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesController.java
@@ -21,8 +21,6 @@ package org.apache.cayenne.modeler.dialog.pref;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.util.FileFilters;
-import org.apache.cayenne.pref.CayennePreferenceEditor;
-import org.apache.cayenne.pref.PreferenceEditor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,21 +44,15 @@ public class ClasspathPreferencesController extends ChildController<PreferenceDi
private final List<String> classPathEntries;
private final List<String> classPathKeys;
private final ClasspathTableModel tableModel;
- private final CayennePreferenceEditor editor;
private final Preferences preferences;
private int counter;
- public ClasspathPreferencesController(PreferenceDialogController parentController) {
- super(parentController);
+ public ClasspathPreferencesController(PreferenceDialogController parent) {
+ super(parent);
this.view = new ClasspathPreferencesView();
- PreferenceEditor editor = parentController.getEditor();
- this.editor = editor instanceof CayennePreferenceEditor
- ? (CayennePreferenceEditor) editor
- : null;
-
// this prefs node is shared with other dialog panels... be aware of
// that when accessing the keys
this.preferences = getApplication().getPreferencesNode(this.getClass(), "");
@@ -188,12 +180,12 @@ public class ClasspathPreferencesController extends ChildController<PreferenceDi
}
public void updatePreferences(String key, String value) {
- Map<String, String> map = editor.getChangedPreferences().get(preferences);
+ Map<String, String> map = parent.getEditor().getChangedPreferences().get(preferences);
if (map == null) {
map = new HashMap<>();
}
map.put(key, value);
- editor.getChangedPreferences().put(preferences, map);
+ parent.getEditor().getChangedPreferences().put(preferences, map);
}
static class ClasspathTableModel extends AbstractTableModel {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesController.java
index 748a0bc22..c48d0e6aa 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesController.java
@@ -25,9 +25,7 @@ import org.apache.cayenne.modeler.FileClassLoadingService;
import org.apache.cayenne.modeler.event.model.DataSourceEvent;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.pref.DBConnectionInfo;
-import org.apache.cayenne.pref.CayennePreferenceEditor;
import org.apache.cayenne.pref.ChildrenMapPreference;
-import org.apache.cayenne.pref.PreferenceEditor;
import org.apache.cayenne.util.Util;
import javax.swing.*;
@@ -51,22 +49,16 @@ import java.util.stream.Collectors;
*/
public class DataSourcePreferencesController extends ChildController<PreferenceDialogController> {
- protected DataSourcePreferencesView view;
- protected String dataSourceKey;
- protected Map dataSources;
- protected ChildrenMapPreference dataSourcePreferences;
- protected CayennePreferenceEditor editor;
+ private final DataSourcePreferencesView view;
+ private String dataSourceKey;
+ private Map dataSources;
+ private final ChildrenMapPreference dataSourcePreferences;
- public DataSourcePreferencesController(PreferenceDialogController parentController) {
- super(parentController);
+ public DataSourcePreferencesController(PreferenceDialogController parent) {
+ super(parent);
this.view = new DataSourcePreferencesView(this);
- PreferenceEditor editor = parentController.getEditor();
- if (editor instanceof CayennePreferenceEditor) {
- this.editor = (CayennePreferenceEditor) editor;
- }
-
// init view data
this.dataSourcePreferences = getApplication().getCayenneProjectPreferences().getDetailObject(
DBConnectionInfo.class);
@@ -232,8 +224,8 @@ public class DataSourcePreferencesController extends ChildController<PreferenceD
}
Preferences classPathPreferences = getApplication().getPreferencesNode(ClasspathPreferencesController.class, "");
- if (editor.getChangedPreferences().containsKey(classPathPreferences)) {
- Map<String, String> map = editor.getChangedPreferences().get(classPathPreferences);
+ if (parent.getEditor().getChangedPreferences().containsKey(classPathPreferences)) {
+ Map<String, String> map = parent.getEditor().getChangedPreferences().get(classPathPreferences);
for (Map.Entry<String, String> en : map.entrySet()) {
String key = en.getKey();
@@ -243,18 +235,16 @@ public class DataSourcePreferencesController extends ChildController<PreferenceD
}
}
- if (editor.getRemovedPreferences().containsKey(classPathPreferences)) {
- Map<String, String> map = editor.getRemovedPreferences().get(classPathPreferences);
+ if (parent.getEditor().getRemovedPreferences().containsKey(classPathPreferences)) {
+ Map<String, String> map = parent.getEditor().getRemovedPreferences().get(classPathPreferences);
for (Map.Entry<String, String> en : map.entrySet()) {
String key = en.getKey();
- if (details.contains(key)) {
- details.remove(key);
- }
+ details.remove(key);
}
}
- if (details.size() > 0) {
+ if (!details.isEmpty()) {
classLoader.setPathFiles(details.stream().map(File::new).collect(Collectors.toList()));
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java
deleted file mode 100644
index c2fb21b37..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferences.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne.modeler.dialog.pref;
-
-import org.apache.cayenne.modeler.mvc.ChildController;
-import org.apache.cayenne.pref.CayennePreferenceEditor;
-import org.apache.cayenne.pref.PreferenceEditor;
-
-import java.awt.*;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.prefs.Preferences;
-
-public class GeneralPreferences extends ChildController<PreferenceDialogController> {
-
- public static final String AUTO_LOAD_PROJECT_PREFERENCE = "autoLoadProject";
- public static final String DELETE_PROMPT_PREFERENCE = "deletePrompt";
- public static final String ENCODING_PREFERENCE = "encoding";
- /**
- * Favourite data source preference
- * Currently used in reengineering dialog where it's selected by default
- * It's not present in preferences dialog hence can't be modified directly
- */
- public static final String FAVOURITE_DATA_SOURCE = "favouriteDataSource";
-
- protected GeneralPreferencesView view;
- protected CayennePreferenceEditor editor;
-
- protected boolean autoLoadProjectPreference;
- protected String encoding;
- protected boolean deletePromptPreference;
-
- protected Preferences preferences;
-
- public GeneralPreferences(PreferenceDialogController parent) {
- super(parent);
- this.view = new GeneralPreferencesView();
-
- PreferenceEditor editor = parent.getEditor();
- if (editor instanceof CayennePreferenceEditor) {
- this.editor = (CayennePreferenceEditor) editor;
- this.view.setEnabled(true);
- initBindings();
- } else {
- this.view.setEnabled(false);
- }
- }
-
- @Override
- public Component getView() {
- return view;
- }
-
- protected void initBindings() {
- // init model objects
- preferences = application.getPreferencesNode(GeneralPreferences.class, "");
-
- this.encoding = preferences.get(ENCODING_PREFERENCE, null);
- this.autoLoadProjectPreference = preferences.getBoolean(AUTO_LOAD_PROJECT_PREFERENCE, false);
- this.deletePromptPreference = preferences.getBoolean(DELETE_PROMPT_PREFERENCE, false);
-
- // build child controllers...
- EncodingSelectorController encodingSelectorController = new EncodingSelectorController(this, view.getEncodingSelector());
- encodingSelectorController.addPropertyChangeListener(EncodingSelectorController.ENCODING_PROPERTY, evt -> setEncoding((String) evt.getNewValue()));
- encodingSelectorController.setSelectedEncoding(encoding);
-
- view.getAutoLoadProject().addActionListener(e -> setAutoLoadProject(view.getAutoLoadProject().isSelected()));
- view.getDeletePrompt().addActionListener(e -> setDeletePrompt(view.getDeletePrompt().isSelected()));
- view.getAutoLoadProject().setSelected(autoLoadProjectPreference);
- view.getDeletePrompt().setSelected(deletePromptPreference);
- }
-
- public String getEncoding() {
- return encoding;
- }
-
- public void setEncoding(String encoding) {
- addChangedPreferences(ENCODING_PREFERENCE, encoding);
- this.encoding = encoding;
- }
-
- private void setAutoLoadProject(boolean autoLoadProject) {
- addChangedBooleanPreferences(AUTO_LOAD_PROJECT_PREFERENCE, autoLoadProject);
- this.autoLoadProjectPreference = autoLoadProject;
- }
-
- private void setDeletePrompt(boolean deletePrompt) {
- addChangedBooleanPreferences(DELETE_PROMPT_PREFERENCE, deletePrompt);
- this.deletePromptPreference = deletePrompt;
- }
-
- public void addChangedBooleanPreferences(String key, boolean value) {
- Map<String, Boolean> map = editor.getChangedBooleanPreferences().get(preferences);
- if (map == null) {
- map = new HashMap<>();
- }
- map.put(key, value);
- editor.getChangedBooleanPreferences().put(preferences, map);
- }
-
- public void addChangedPreferences(String key, String value) {
- Map<String, String> map = editor.getChangedPreferences().get(preferences);
- if (map == null) {
- map = new HashMap<>();
- }
- map.put(key, value);
- editor.getChangedPreferences().put(preferences, map);
- }
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesController.java
new file mode 100644
index 000000000..9bce28649
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesController.java
@@ -0,0 +1,116 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.dialog.pref;
+
+import org.apache.cayenne.modeler.mvc.ChildController;
+
+import java.awt.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.prefs.Preferences;
+
+public class GeneralPreferencesController extends ChildController<PreferenceDialogController> {
+
+ public static final String AUTO_LOAD_PROJECT_PREFERENCE = "autoLoadProject";
+ public static final String DELETE_PROMPT_PREFERENCE = "deletePrompt";
+ public static final String ENCODING_PREFERENCE = "encoding";
+
+ /**
+ * Favourite data source preference
+ * Currently used in reengineering dialog where it's selected by default
+ * It's not present in preferences dialog hence can't be modified directly
+ */
+ public static final String FAVOURITE_DATA_SOURCE = "favouriteDataSource";
+
+ private final GeneralPreferencesView view;
+
+ private boolean autoLoadProjectPreference;
+ private String encoding;
+ private boolean deletePromptPreference;
+ private Preferences preferences;
+
+ public GeneralPreferencesController(PreferenceDialogController parent) {
+ super(parent);
+ this.view = new GeneralPreferencesView();
+ this.view.setEnabled(true);
+ initBindings();
+ }
+
+ @Override
+ public Component getView() {
+ return view;
+ }
+
+ protected void initBindings() {
+ // init model objects
+ preferences = application.getPreferencesNode(GeneralPreferencesController.class, "");
+
+ this.encoding = preferences.get(ENCODING_PREFERENCE, null);
+ this.autoLoadProjectPreference = preferences.getBoolean(AUTO_LOAD_PROJECT_PREFERENCE, false);
+ this.deletePromptPreference = preferences.getBoolean(DELETE_PROMPT_PREFERENCE, false);
+
+ // build child controllers...
+ EncodingSelectorController encodingSelectorController = new EncodingSelectorController(this, view.getEncodingSelector());
+ encodingSelectorController.addPropertyChangeListener(EncodingSelectorController.ENCODING_PROPERTY, evt -> setEncoding((String) evt.getNewValue()));
+ encodingSelectorController.setSelectedEncoding(encoding);
+
+ view.getAutoLoadProject().addActionListener(e -> setAutoLoadProject(view.getAutoLoadProject().isSelected()));
+ view.getDeletePrompt().addActionListener(e -> setDeletePrompt(view.getDeletePrompt().isSelected()));
+ view.getAutoLoadProject().setSelected(autoLoadProjectPreference);
+ view.getDeletePrompt().setSelected(deletePromptPreference);
+ }
+
+ public String getEncoding() {
+ return encoding;
+ }
+
+ public void setEncoding(String encoding) {
+ addChangedPreferences(ENCODING_PREFERENCE, encoding);
+ this.encoding = encoding;
+ }
+
+ private void setAutoLoadProject(boolean autoLoadProject) {
+ addChangedBooleanPreferences(AUTO_LOAD_PROJECT_PREFERENCE, autoLoadProject);
+ this.autoLoadProjectPreference = autoLoadProject;
+ }
+
+ private void setDeletePrompt(boolean deletePrompt) {
+ addChangedBooleanPreferences(DELETE_PROMPT_PREFERENCE, deletePrompt);
+ this.deletePromptPreference = deletePrompt;
+ }
+
+ public void addChangedBooleanPreferences(String key, boolean value) {
+ Map<String, Boolean> map = parent.getEditor().getChangedBooleanPreferences().get(preferences);
+ if (map == null) {
+ map = new HashMap<>();
+ }
+ map.put(key, value);
+ parent.getEditor().getChangedBooleanPreferences().put(preferences, map);
+ }
+
+ public void addChangedPreferences(String key, String value) {
+ Map<String, String> map = parent.getEditor().getChangedPreferences().get(preferences);
+ if (map == null) {
+ map = new HashMap<>();
+ }
+ map.put(key, value);
+ parent.getEditor().getChangedPreferences().put(preferences, map);
+ }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogController.java
index 81c97a321..a158ff80d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogController.java
@@ -21,56 +21,56 @@ package org.apache.cayenne.modeler.dialog.pref;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.mvc.RootController;
-import org.apache.cayenne.pref.PreferenceEditor;
-
-import javax.swing.JDialog;
-import javax.swing.JList;
-import javax.swing.SwingUtilities;
-import java.awt.Component;
-import java.awt.Dialog;
-import java.awt.Frame;
-import java.awt.Window;
-import java.util.HashMap;
-import java.util.Map;
+
+import javax.swing.*;
+import java.awt.*;
public class PreferenceDialogController extends ChildController<RootController> {
- public static final String GENERAL_KEY = "General";
- public static final String DATA_SOURCES_KEY = "Local DataSources";
- public static final String CLASS_PATH_KEY = "ClassPath";
+ private static final String GENERAL_KEY = "General";
+ private static final String DATA_SOURCES_KEY = "Local DataSources";
+ private static final String CLASS_PATH_KEY = "ClassPath";
private static final String[] preferenceMenus = new String[]{
GENERAL_KEY, DATA_SOURCES_KEY, CLASS_PATH_KEY
};
- protected PreferenceDialogView view;
- protected Map<String, RootController> detailControllers;
- protected PreferenceEditor editor;
+ private final PreferenceDialogView view;
+ private final CayenneModelerPreferenceEditor editor;
+
+ private final GeneralPreferencesController generalPrefsController;
+ private final DataSourcePreferencesController dataSourcePrefsController;
+ private final ClasspathPreferencesController classpathPrefsController;
public PreferenceDialogController(final RootController parent) {
super(parent);
- final Window parentView = parent.getView() instanceof Window
+ Window parentView = parent.getView() instanceof Window
? (Window) parent.getView()
: SwingUtilities.getWindowAncestor(parent.getView());
+
this.view = (parentView instanceof Dialog)
? new PreferenceDialogView((Dialog) parentView)
: new PreferenceDialogView((Frame) parentView);
- this.detailControllers = new HashMap<>();
- // editor must be configured before startup for "showDetailViewAction()" to work
- this.editor = new CayenneModelerPreferenceEditor(application);
- initBindings();
- }
+ this.editor = new CayenneModelerPreferenceEditor(application);
- protected void initBindings() {
- final JList<String> list = view.getList();
+ JList<String> list = view.getList();
list.setListData(preferenceMenus);
list.addListSelectionListener(e -> updateSelection());
view.getCancelButton().addActionListener(e -> cancelAction());
view.getSaveButton().addActionListener(e -> savePreferencesAction());
+
+ this.generalPrefsController = new GeneralPreferencesController(this);
+ view.getDetailPanel().add(generalPrefsController.getView(), GENERAL_KEY);
+
+ this.dataSourcePrefsController = new DataSourcePreferencesController(this);
+ view.getDetailPanel().add(dataSourcePrefsController.getView(), DATA_SOURCES_KEY);
+
+ this.classpathPrefsController = new ClasspathPreferencesController(this);
+ view.getDetailPanel().add(classpathPrefsController.getView(), CLASS_PATH_KEY);
}
public void updateSelection() {
@@ -80,73 +80,43 @@ public class PreferenceDialogController extends ChildController<RootController>
}
}
- public void cancelAction() {
+ private void cancelAction() {
editor.revert();
view.dispose();
}
- public void savePreferencesAction() {
+ private void savePreferencesAction() {
editor.save();
view.dispose();
}
- /**
- * Configures preferences dialog to display an editor for a local DataSource with
- * specified name.
- */
- public void showDataSourceEditorAction(final Object dataSourceKey) {
- configure();
-
- // this will install needed controller
- view.getDetailLayout().show(view.getDetailPanel(), DATA_SOURCES_KEY);
-
- final DataSourcePreferencesController controller = (DataSourcePreferencesController) detailControllers
- .get(DATA_SOURCES_KEY);
- controller.editDataSourceAction(dataSourceKey);
- view.setVisible(true);
+ public void showGeneralEditorAction() {
+ doShow(GENERAL_KEY, generalPrefsController);
}
- /**
- * Configures preferences dialog to display an editor for a local DataSource with
- * specified name.
- */
public void showClassPathEditorAction() {
- configure();
-
- // this will install needed controller
- view.getDetailLayout().show(view.getDetailPanel(), CLASS_PATH_KEY);
-
- ClasspathPreferencesController controller = (ClasspathPreferencesController) detailControllers
- .get(CLASS_PATH_KEY);
- controller.getView().setEnabled(true);
- view.setVisible(true);
+ doShow(CLASS_PATH_KEY, classpathPrefsController);
}
- public void startupAction(final String key) {
- configure();
- view.getList().setSelectedValue(key == null ? GENERAL_KEY : key, true);
- view.setVisible(true);
+ public void showDataSourceEditorAction(Object dataSourceKey) {
+ dataSourcePrefsController.editDataSourceAction(dataSourceKey);
+ doShow(DATA_SOURCES_KEY, dataSourcePrefsController);
}
- protected void configure() {
- // init known panels
- registerPanel(GENERAL_KEY, new GeneralPreferences(this));
- registerPanel(DATA_SOURCES_KEY, new DataSourcePreferencesController(this));
- registerPanel(CLASS_PATH_KEY, new ClasspathPreferencesController(this));
+ private void doShow(String cardKey, ChildController<?> childController) {
view.getDetailLayout().show(view.getDetailPanel(), GENERAL_KEY);
view.pack();
- // show
centerView();
makeCloseableOnEscape();
view.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
view.setModalityType(Dialog.ModalityType.MODELESS);
- }
- protected void registerPanel(final String name, final RootController panelController) {
- detailControllers.put(name, panelController);
- view.getDetailPanel().add(panelController.getView(), name);
+ view.getDetailLayout().show(view.getDetailPanel(), cardKey);
+ view.getList().setSelectedValue(cardKey, true);
+ childController.getView().setEnabled(true);
+ view.setVisible(true);
}
@Override
@@ -154,7 +124,7 @@ public class PreferenceDialogController extends ChildController<RootController>
return view;
}
- public PreferenceEditor getEditor() {
+ public CayenneModelerPreferenceEditor getEditor() {
return editor;
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenController.java
index 68a7ff9ef..3ce4edca4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CgenController.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.map.event.EmbeddableListener;
import org.apache.cayenne.map.event.EntityEvent;
import org.apache.cayenne.map.event.ObjEntityListener;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferences;
+import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
import org.apache.cayenne.modeler.editor.DbImportController;
import org.apache.cayenne.modeler.event.model.DataMapEvent;
import org.apache.cayenne.modeler.event.model.DataMapListener;
@@ -301,9 +301,9 @@ public class CgenController extends ChildController<ProjectController> implement
configuration.setRootPath(Utils.getRootPathForDataMap(dataMap));
configuration.updateOutputPath(basePath);
}
- Preferences preferences = application.getPreferencesNode(GeneralPreferences.class, "");
+ Preferences preferences = application.getPreferencesNode(GeneralPreferencesController.class, "");
if (preferences != null) {
- configuration.setEncoding(preferences.get(GeneralPreferences.ENCODING_PREFERENCE, null));
+ configuration.setEncoding(preferences.get(GeneralPreferencesController.ENCODING_PREFERENCE, null));
}
return configuration;
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
index 768b63d41..a908e0787 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.gen.ClassGenerationActionFactory;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferences;
+import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
import org.apache.cayenne.modeler.editor.GeneratorsTabController;
import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
import org.apache.cayenne.modeler.util.ModelerUtil;
@@ -93,9 +93,9 @@ public class CgenTabController extends GeneratorsTabController<CgenConfiguration
CgenConfiguration cgenConfiguration = new CgenConfiguration();
cgenConfiguration.setDataMap(dataMap);
cgenConfiguration.updateOutputPath(Paths.get(ModelerUtil.initOutputFolder()));
- Preferences preferences = Application.getInstance().getPreferencesNode(GeneralPreferences.class, "");
+ Preferences preferences = Application.getInstance().getPreferencesNode(GeneralPreferencesController.class, "");
if (preferences != null) {
- cgenConfiguration.setEncoding(preferences.get(GeneralPreferences.ENCODING_PREFERENCE, null));
+ cgenConfiguration.setEncoding(preferences.get(GeneralPreferencesController.ENCODING_PREFERENCE, null));
}
cgenConfiguration.resolveExcludedEntities();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceEditor.java
index 7f19fc01f..02c48ef65 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/pref/PreferenceEditor.java
@@ -22,11 +22,11 @@ package org.apache.cayenne.pref;
/**
* Defines an API of a preferences editor used for editing preferences without affecting
* the rest of the application until the editing is finished.
- *
+ *
*/
public interface PreferenceEditor {
- public void save();
+ void save();
- public void revert();
+ void revert();
}