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/01 23:50:11 UTC

(cayenne) branch master updated (bf9f87495 -> 76808c4ea)

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


    from bf9f87495 Modeler: Better-looking "Update Entity Class Name" dialog CAY-2927
     new 5a46e689b Modeler cleanup
     new 0130fdb72 Modeler cleanup
     new c79b6e976 Modeler cleanup
     new 76808c4ea Modeler cleanup

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/cayenne/modeler/Application.java    |   5 +-
 .../event/display/CallbackMethodDisplayEvent.java  |   2 +-
 .../event/display/DbAttributeDisplayEvent.java     |  10 +-
 .../event/display/DbRelationshipDisplayEvent.java  |  10 +-
 .../display/EmbeddableAttributeDisplayEvent.java   |  12 +-
 .../event/display/MultipleObjectsDisplayEvent.java |   4 +-
 .../event/display/ObjAttributeDisplayEvent.java    |  10 +-
 .../event/display/ObjRelationshipDisplayEvent.java |  10 +-
 .../display/ProcedureParameterDisplayEvent.java    |  10 +-
 .../cayenne/modeler/pref/DBGeneratorDefaults.java  | 124 -----
 .../apache/cayenne/modeler/pref/GeneralPrefs.java  |  74 +++
 .../modeler/pref/ProjectStatePreferences.java      | 340 --------------
 .../cayenne/modeler/pref/RenamedPreferences.java   | 224 +++++----
 .../cayenne/modeler/ui/action/SaveAsAction.java    |   4 +-
 .../ui/confirmremove/ConfirmRemoveDialog.java      |  31 +-
 .../ui/datasource/DataSourceController.java        |   9 +-
 .../ui/dbgen/DBGeneratorOptionsController.java     |  43 +-
 .../cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java |  67 +++
 .../ui/preferences/PreferenceDialogController.java |  11 +-
 .../general/GeneralPreferencesController.java      | 160 ++-----
 .../general/GeneralPreferencesView.java            |  84 +---
 .../modeler/ui/project/ProjectController.java      |  43 +-
 .../project/ProjectPrefs.java}                     | 499 ++++++++++-----------
 .../datadomain/cgen/DataDomainCgenController.java  |   8 +-
 .../editor/datamap/cgen/CgenController.java        |   8 +-
 .../attrinfo/ObjAttributeInfoDialogController.java |   6 +-
 .../properties/ObjAttributeTableModel.java         |   2 +-
 .../ui/project/tree/ProjectTreeController.java     |   2 +-
 28 files changed, 627 insertions(+), 1185 deletions(-)
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
 create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/GeneralPrefs.java
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectStatePreferences.java
 create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{pref/ProjectSelectionMemo.java => ui/project/ProjectPrefs.java} (51%)


(cayenne) 02/04: Modeler cleanup

Posted by aa...@apache.org.
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 0130fdb7278b1b588dfa44f736294fd9bca1883d
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 1 10:50:49 2026 -0400

    Modeler cleanup
    
    prefs cleanup
---
 ...ProjectSelectionMemo.java => ProjectPrefs.java} | 496 ++++++++++-----------
 .../modeler/pref/ProjectStatePreferences.java      | 340 --------------
 .../modeler/ui/project/ProjectController.java      |  21 +-
 3 files changed, 255 insertions(+), 602 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectPrefs.java
similarity index 51%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectPrefs.java
index 2d961aa9a..54ec6213c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectPrefs.java
@@ -22,18 +22,21 @@ package org.apache.cayenne.modeler.pref;
 import org.apache.cayenne.configuration.ConfigurationNode;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
+import org.apache.cayenne.map.Attribute;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.Embeddable;
 import org.apache.cayenne.map.EmbeddableAttribute;
+import org.apache.cayenne.map.Entity;
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.ObjRelationship;
 import org.apache.cayenne.map.Procedure;
 import org.apache.cayenne.map.ProcedureParameter;
 import org.apache.cayenne.map.QueryDescriptor;
+import org.apache.cayenne.map.Relationship;
 import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
 import org.apache.cayenne.modeler.event.display.DataNodeDisplayEvent;
 import org.apache.cayenne.modeler.event.display.DbAttributeDisplayEvent;
@@ -54,15 +57,35 @@ import org.apache.cayenne.util.CayenneMapEntry;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.prefs.BackingStoreException;
+import java.util.prefs.Preferences;
 
 /**
- * Saves and restores the modeler's last project selection through {@link ProjectStatePreferences}.
- * Replaces the parallel {@code DisplayEventType} hierarchy by deriving the selection kind directly
- * from the controller state and dispatching to the right {@code controller.display*()} method.
+ * Binding-style handler for the Modeler's last project selection. Loaded on project
+ * open to restore selection, flushed on project close or Modeler close to persist it.
  */
-final class ProjectSelectionMemo {
-
-    enum Kind {
+public final class ProjectPrefs {
+
+    private static final String EVENT_KEY = "event";
+
+    private static final String DOMAIN_KEY = "domain";
+    private static final String NODE_KEY = "node";
+    private static final String DATA_MAP_KEY = "dataMap";
+    private static final String OBJ_ENTITY_KEY = "objEntity";
+    private static final String DB_ENTITY_KEY = "dbEntity";
+    private static final String EMBEDDABLE_KEY = "embeddable";
+    private static final String EMBEDDABLE_ATTRS_KEY = "embAttrs";
+    private static final String OBJ_ATTRS_KEY = "objAttrs";
+    private static final String DB_ATTRS_KEY = "dbAttrs";
+    private static final String OBJ_RELS_KEY = "objRels";
+    private static final String DB_RELS_KEY = "dbRels";
+    private static final String PROCEDURE_KEY = "procedure";
+    private static final String PROCEDURE_PARAMS_KEY = "procedureParams";
+    private static final String QUERY_KEY = "query";
+    private static final String MULTIPLE_OBJECTS_KEY = "multipleObjects";
+    private static final String PARENT_OBJECT_KEY = "parentObject";
+
+    private enum Kind {
         domain, dataNode, dataMap,
         objEntity, dbEntity,
         objAttributes, dbAttributes,
@@ -72,128 +95,135 @@ final class ProjectSelectionMemo {
         query, multipleObjects
     }
 
-    private ProjectSelectionMemo() {
+    private final Preferences prefs;
+
+    private ProjectPrefs(Preferences prefs) {
+        this.prefs = prefs;
     }
 
-    public static void save(ProjectController controller, ProjectStatePreferences prefs) {
-        Kind kind = leafKind(controller);
+    public static ProjectPrefs of(Preferences prefs) {
+        return new ProjectPrefs(prefs);
+    }
+
+    public void load(ProjectController controller) {
+        Kind kind = parseKind(prefs.get(EVENT_KEY, ""));
         if (kind == null) {
             return;
         }
 
-        prefs.setEvent(kind.name());
+        DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
+        if (!domain.getName().equals(prefs.get(DOMAIN_KEY, ""))) {
+            return;
+        }
 
         switch (kind) {
             case domain:
-                saveDomainPath(controller, prefs);
+                controller.displayDomain(new DomainDisplayEvent(ProjectPrefs.class, domain));
                 break;
             case dataNode:
-                saveNodePath(controller, prefs);
+                restoreDataNode(controller, domain);
                 break;
             case dataMap:
-                saveDataMapPath(controller, prefs);
+                restoreDataMap(controller, domain);
                 break;
             case objEntity:
-                saveObjEntityPath(controller, prefs);
-                break;
             case dbEntity:
-                saveDbEntityPath(controller, prefs);
+                restoreEntity(controller, domain);
                 break;
             case objAttributes:
-                saveObjEntityPath(controller, prefs);
-                prefs.setObjAttrs(joinNames(controller.getSelectedObjAttributes()));
-                break;
             case dbAttributes:
-                saveDbEntityPath(controller, prefs);
-                prefs.setDbAttrs(joinNames(controller.getSelectedDbAttributes()));
+                restoreAttributes(controller, domain);
                 break;
             case objRelationships:
-                saveObjEntityPath(controller, prefs);
-                prefs.setObjRels(joinNames(controller.getSelectedObjRelationships()));
-                break;
             case dbRelationships:
-                saveDbEntityPath(controller, prefs);
-                prefs.setDbRels(joinNames(controller.getSelectedDbRelationships()));
+                restoreRelationships(controller, domain);
                 break;
             case embeddable:
-                saveEmbeddablePath(controller, prefs);
+                restoreEmbeddable(controller, domain);
                 break;
             case embeddableAttributes:
-                saveEmbeddablePath(controller, prefs);
-                prefs.setEmbAttrs(joinEmbeddableAttributeNames(controller.getSelectedEmbeddableAttributes()));
+                restoreEmbeddableAttributes(controller, domain);
                 break;
             case procedure:
-                saveProcedurePath(controller, prefs);
+                restoreProcedure(controller, domain);
                 break;
             case procedureParameters:
-                saveProcedurePath(controller, prefs);
-                prefs.setProcedureParams(joinNames(controller.getSelectedProcedureParameters()));
+                restoreProcedureParameters(controller, domain);
                 break;
             case query:
-                saveQueryPath(controller, prefs);
+                restoreQuery(controller, domain);
                 break;
             case multipleObjects:
-                saveMultipleObjects(controller, prefs);
+                restoreMultipleObjects(controller, domain);
                 break;
         }
     }
 
-    public static void restore(ProjectController controller, ProjectStatePreferences prefs) {
-        Kind kind = parseKind(prefs.getEvent());
-        if (kind == null) {
+    public void flush(ProjectController controller) {
+        if (prefs == null) {
             return;
         }
+        try {
+            prefs.clear();
+        } catch (BackingStoreException e) {
+            // ignore
+        }
 
-        DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
-        if (!domain.getName().equals(prefs.getDomain())) {
+        Kind kind = leafKind(controller);
+        if (kind == null) {
             return;
         }
+        prefs.put(EVENT_KEY, kind.name());
 
         switch (kind) {
             case domain:
-                controller.displayDomain(new DomainDisplayEvent(ProjectSelectionMemo.class, domain));
+                saveDomainPath(controller);
                 break;
             case dataNode:
-                restoreDataNode(controller, domain, prefs);
+                saveNodePath(controller);
                 break;
             case dataMap:
-                restoreDataMap(controller, domain, prefs);
+                saveDataMapPath(controller);
                 break;
             case objEntity:
-                restoreObjEntity(controller, domain, prefs);
-                break;
             case dbEntity:
-                restoreDbEntity(controller, domain, prefs);
+                saveEntityPath(controller);
                 break;
             case objAttributes:
-                restoreObjAttributes(controller, domain, prefs);
+                saveEntityPath(controller);
+                prefs.put(OBJ_ATTRS_KEY, joinNames(controller.getSelectedObjAttributes()));
                 break;
             case dbAttributes:
-                restoreDbAttributes(controller, domain, prefs);
+                saveEntityPath(controller);
+                prefs.put(DB_ATTRS_KEY, joinNames(controller.getSelectedDbAttributes()));
                 break;
             case objRelationships:
-                restoreObjRelationships(controller, domain, prefs);
+                saveEntityPath(controller);
+                prefs.put(OBJ_RELS_KEY, joinNames(controller.getSelectedObjRelationships()));
                 break;
             case dbRelationships:
-                restoreDbRelationships(controller, domain, prefs);
+                saveEntityPath(controller);
+                prefs.put(DB_RELS_KEY, joinNames(controller.getSelectedDbRelationships()));
                 break;
             case embeddable:
-                restoreEmbeddable(controller, domain, prefs);
+                saveEmbeddablePath(controller);
                 break;
             case embeddableAttributes:
-                restoreEmbeddableAttributes(controller, domain, prefs);
+                saveEmbeddablePath(controller);
+                prefs.put(EMBEDDABLE_ATTRS_KEY, joinEmbeddableAttributeNames(controller.getSelectedEmbeddableAttributes()));
                 break;
             case procedure:
-                restoreProcedure(controller, domain, prefs);
+                saveProcedurePath(controller);
                 break;
             case procedureParameters:
-                restoreProcedureParameters(controller, domain, prefs);
+                saveProcedurePath(controller);
+                prefs.put(PROCEDURE_PARAMS_KEY, joinNames(controller.getSelectedProcedureParameters()));
                 break;
             case query:
-                restoreQuery(controller, domain, prefs);
+                saveQueryPath(controller);
                 break;
             case multipleObjects:
-                restoreMultipleObjects(controller, domain, prefs);
+                saveMultipleObjects(controller);
                 break;
         }
     }
@@ -260,65 +290,68 @@ final class ProjectSelectionMemo {
 
     // -------------------- save helpers --------------------
 
-    private static void saveDomainPath(ProjectController controller, ProjectStatePreferences prefs) {
-        prefs.setDomain(controller.getSelectedDataDomain().getName());
+    private void saveDomainPath(ProjectController controller) {
+        prefs.put(DOMAIN_KEY, controller.getSelectedDataDomain().getName());
     }
 
-    private static void saveNodePath(ProjectController controller, ProjectStatePreferences prefs) {
-        prefs.setDomain(controller.getSelectedDataDomain().getName());
-        prefs.setNode(controller.getSelectedDataNode().getName());
+    private void saveNodePath(ProjectController controller) {
+        prefs.put(DOMAIN_KEY, controller.getSelectedDataDomain().getName());
+        prefs.put(NODE_KEY, controller.getSelectedDataNode().getName());
     }
 
-    private static void saveDataMapPath(ProjectController controller, ProjectStatePreferences prefs) {
+    private void saveDataMapPath(ProjectController controller) {
         DataChannelDescriptor domain = controller.getSelectedDataDomain();
         if (domain == null) {
             return;
         }
-        prefs.setDomain(domain.getName());
+        prefs.put(DOMAIN_KEY, domain.getName());
         DataNodeDescriptor node = controller.getSelectedDataNode();
-        prefs.setNode(node != null ? node.getName() : "");
+        prefs.put(NODE_KEY, node != null ? node.getName() : "");
         DataMap dataMap = controller.getSelectedDataMap();
         if (dataMap != null) {
-            prefs.setDataMap(dataMap.getName());
+            prefs.put(DATA_MAP_KEY, dataMap.getName());
         }
     }
 
-    private static void saveObjEntityPath(ProjectController controller, ProjectStatePreferences prefs) {
-        saveDataMapPath(controller, prefs);
-        prefs.setObjEntity(controller.getSelectedObjEntity().getName());
-        prefs.setDbEntity(null);
-    }
+    private void saveEntityPath(ProjectController controller) {
+        prefs.put(DOMAIN_KEY, controller.getSelectedDataDomain().getName());
+        DataNodeDescriptor node = controller.getSelectedDataNode();
+        prefs.put(NODE_KEY, node != null ? node.getName() : "");
+        prefs.put(DATA_MAP_KEY, controller.getSelectedDataMap().getName());
 
-    private static void saveDbEntityPath(ProjectController controller, ProjectStatePreferences prefs) {
-        saveDataMapPath(controller, prefs);
-        prefs.setDbEntity(controller.getSelectedDbEntity().getName());
-        prefs.setObjEntity(null);
+        ObjEntity objEntity = controller.getSelectedObjEntity();
+        DbEntity dbEntity = controller.getSelectedDbEntity();
+        if (objEntity != null) {
+            prefs.put(OBJ_ENTITY_KEY, objEntity.getName());
+        } else if (dbEntity != null) {
+            prefs.put(DB_ENTITY_KEY, dbEntity.getName());
+        }
     }
 
-    private static void saveEmbeddablePath(ProjectController controller, ProjectStatePreferences prefs) {
-        prefs.setDomain(controller.getSelectedDataDomain().getName());
-        prefs.setDataMap(controller.getSelectedDataMap().getName());
-        prefs.setEmbeddable(controller.getSelectedEmbeddable().getClassName());
+    private void saveEmbeddablePath(ProjectController controller) {
+        prefs.put(DOMAIN_KEY, controller.getSelectedDataDomain().getName());
+        prefs.put(DATA_MAP_KEY, controller.getSelectedDataMap().getName());
+        prefs.put(EMBEDDABLE_KEY, controller.getSelectedEmbeddable().getClassName());
     }
 
-    private static void saveProcedurePath(ProjectController controller, ProjectStatePreferences prefs) {
-        prefs.setDomain(controller.getSelectedDataDomain().getName());
-        prefs.setDataMap(controller.getSelectedDataMap().getName());
-        prefs.setProcedure(controller.getSelectedProcedure().getName());
+    private void saveProcedurePath(ProjectController controller) {
+        prefs.put(DOMAIN_KEY, controller.getSelectedDataDomain().getName());
+        prefs.put(DATA_MAP_KEY, controller.getSelectedDataMap().getName());
+        prefs.put(PROCEDURE_KEY, controller.getSelectedProcedure().getName());
     }
 
-    private static void saveQueryPath(ProjectController controller, ProjectStatePreferences prefs) {
-        prefs.setDomain(controller.getSelectedDataDomain().getName());
-        prefs.setDataMap(controller.getSelectedDataMap().getName());
-        prefs.setQuery(controller.getSelectedQuery().getName());
+    private void saveQueryPath(ProjectController controller) {
+        prefs.put(DOMAIN_KEY, controller.getSelectedDataDomain().getName());
+        prefs.put(DATA_MAP_KEY, controller.getSelectedDataMap().getName());
+        prefs.put(QUERY_KEY, controller.getSelectedQuery().getName());
     }
 
-    private static void saveMultipleObjects(ProjectController controller, ProjectStatePreferences prefs) {
-        prefs.setParentObject(nameOf(controller.getSelectedParentPath()));
+    private void saveMultipleObjects(ProjectController controller) {
+        prefs.put(PARENT_OBJECT_KEY, nameOf(controller.getSelectedParentPath()));
 
         ConfigurationNode[] paths = controller.getSelectedPaths();
         if (paths == null) {
-            prefs.setMultipleObjects("");
+            prefs.put(MULTIPLE_OBJECTS_KEY, "");
             return;
         }
 
@@ -329,202 +362,176 @@ final class ProjectSelectionMemo {
                 sb.append(objectName).append(",");
             }
         }
-        prefs.setMultipleObjects(sb.toString());
+        prefs.put(MULTIPLE_OBJECTS_KEY, sb.toString());
     }
 
     // -------------------- restore helpers --------------------
 
-    private static void restoreDataNode(ProjectController controller, DataChannelDescriptor domain,
-                                        ProjectStatePreferences prefs) {
-        DataNodeDescriptor node = domain.getNodeDescriptor(prefs.getNode());
+    private void restoreDataNode(ProjectController controller, DataChannelDescriptor domain) {
+        DataNodeDescriptor node = domain.getNodeDescriptor(prefs.get(NODE_KEY, ""));
         if (node == null) {
             return;
         }
-        controller.displayDataNode(new DataNodeDisplayEvent(ProjectSelectionMemo.class, domain, node));
-    }
-
-    private static void restoreDataMap(ProjectController controller, DataChannelDescriptor domain,
-                                       ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
-        if (dataMap == null) {
-            return;
-        }
-        DataNodeDescriptor node = domain.getNodeDescriptor(prefs.getNode());
-        controller.displayDataMap(new DataMapDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, node));
-    }
-
-    private static void restoreObjEntity(ProjectController controller, DataChannelDescriptor domain,
-                                         ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
-        if (dataMap == null) {
-            return;
-        }
-        ObjEntity entity = dataMap.getObjEntity(prefs.getObjEntity());
-        if (entity == null) {
-            return;
-        }
-        controller.displayObjEntity(new ObjEntityDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity));
+        controller.displayDataNode(new DataNodeDisplayEvent(ProjectPrefs.class, domain, node));
     }
 
-    private static void restoreDbEntity(ProjectController controller, DataChannelDescriptor domain,
-                                        ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+    private void restoreDataMap(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        DbEntity entity = dataMap.getDbEntity(prefs.getDbEntity());
-        if (entity == null) {
-            return;
-        }
-        controller.displayDbEntity(new DbEntityDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity));
+        DataNodeDescriptor node = domain.getNodeDescriptor(prefs.get(NODE_KEY, ""));
+        controller.displayDataMap(new DataMapDisplayEvent(ProjectPrefs.class, domain, dataMap, node));
     }
 
-    private static void restoreObjAttributes(ProjectController controller, DataChannelDescriptor domain,
-                                             ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+    private void restoreEntity(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        ObjEntity entity = dataMap.getObjEntity(prefs.getObjEntity());
+        Entity<?, ?, ?> entity = lookupEntity(dataMap);
         if (entity == null) {
             return;
         }
-        ObjAttribute[] attrs = lookupObjAttributes(entity, prefs);
-        controller.displayObjEntity(new ObjEntityDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity));
-        controller.displayObjAttribute(new ObjAttributeDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity, attrs));
-    }
-
-    private static void restoreDbAttributes(ProjectController controller, DataChannelDescriptor domain,
-                                            ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
-        if (dataMap == null) {
-            return;
+        if (entity instanceof ObjEntity) {
+            controller.displayObjEntity(new ObjEntityDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, (ObjEntity) entity));
+        } else if (entity instanceof DbEntity) {
+            controller.displayDbEntity(new DbEntityDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, (DbEntity) entity));
         }
-        DbEntity entity = dataMap.getDbEntity(prefs.getDbEntity());
-        if (entity == null) {
-            return;
-        }
-        DbAttribute[] attrs = lookupDbAttributes(entity, prefs);
-        controller.displayDbEntity(new DbEntityDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity));
-        controller.displayDbAttribute(new DbAttributeDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity, attrs));
     }
 
-    private static void restoreObjRelationships(ProjectController controller, DataChannelDescriptor domain,
-                                                ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+    private void restoreAttributes(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        ObjEntity entity = dataMap.getObjEntity(prefs.getObjEntity());
+        Entity<?, ?, ?> entity = lookupEntity(dataMap);
         if (entity == null) {
             return;
         }
-        ObjRelationship[] rels = lookupObjRelationships(entity, prefs);
-        controller.displayObjEntity(new ObjEntityDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity));
-        controller.displayObjRelationship(new ObjRelationshipDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity, rels));
-    }
-
-    private static void restoreDbRelationships(ProjectController controller, DataChannelDescriptor domain,
-                                               ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+        Attribute<?, ?, ?>[] attrs = lookupEntityAttributes(entity);
+
+        if (entity instanceof ObjEntity) {
+            ObjEntity objEntity = (ObjEntity) entity;
+            ObjAttribute[] objAttrs = new ObjAttribute[attrs.length];
+            System.arraycopy(attrs, 0, objAttrs, 0, attrs.length);
+            controller.displayObjEntity(new ObjEntityDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, objEntity));
+            controller.displayObjAttribute(new ObjAttributeDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, objEntity, objAttrs));
+        } else if (entity instanceof DbEntity) {
+            DbEntity dbEntity = (DbEntity) entity;
+            DbAttribute[] dbAttrs = new DbAttribute[attrs.length];
+            System.arraycopy(attrs, 0, dbAttrs, 0, attrs.length);
+            controller.displayDbEntity(new DbEntityDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, dbEntity));
+            controller.displayDbAttribute(new DbAttributeDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, dbEntity, dbAttrs));
+        }
+    }
+
+    private void restoreRelationships(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        DbEntity entity = dataMap.getDbEntity(prefs.getDbEntity());
+        Entity<?, ?, ?> entity = lookupEntity(dataMap);
         if (entity == null) {
             return;
         }
-        DbRelationship[] rels = lookupDbRelationships(entity, prefs);
-        controller.displayDbEntity(new DbEntityDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity));
-        controller.displayDbRelationship(new DbRelationshipDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, entity, rels));
-    }
-
-    private static void restoreEmbeddable(ProjectController controller, DataChannelDescriptor domain,
-                                          ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+        Relationship<?, ?, ?>[] rels = lookupEntityRelationships(entity);
+
+        if (entity instanceof ObjEntity) {
+            ObjEntity objEntity = (ObjEntity) entity;
+            ObjRelationship[] objRels = new ObjRelationship[rels.length];
+            System.arraycopy(rels, 0, objRels, 0, rels.length);
+            controller.displayObjEntity(new ObjEntityDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, objEntity));
+            controller.displayObjRelationship(new ObjRelationshipDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, objEntity, objRels));
+        } else if (entity instanceof DbEntity) {
+            DbEntity dbEntity = (DbEntity) entity;
+            DbRelationship[] dbRels = new DbRelationship[rels.length];
+            System.arraycopy(rels, 0, dbRels, 0, rels.length);
+            controller.displayDbEntity(new DbEntityDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, dbEntity));
+            controller.displayDbRelationship(new DbRelationshipDisplayEvent(
+                    ProjectPrefs.class, domain, dataMap, dbEntity, dbRels));
+        }
+    }
+
+    private void restoreEmbeddable(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        Embeddable embeddable = dataMap.getEmbeddable(prefs.getEmbeddable());
+        Embeddable embeddable = dataMap.getEmbeddable(prefs.get(EMBEDDABLE_KEY, ""));
         if (embeddable == null) {
             return;
         }
-        controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, embeddable));
+        controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectPrefs.class, domain, dataMap, embeddable));
     }
 
-    private static void restoreEmbeddableAttributes(ProjectController controller, DataChannelDescriptor domain,
-                                                    ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+    private void restoreEmbeddableAttributes(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        Embeddable embeddable = dataMap.getEmbeddable(prefs.getEmbeddable());
+        Embeddable embeddable = dataMap.getEmbeddable(prefs.get(EMBEDDABLE_KEY, ""));
         if (embeddable == null) {
             return;
         }
-        controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, embeddable));
+        controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectPrefs.class, domain, dataMap, embeddable));
 
-        EmbeddableAttribute[] attrs = lookupEmbeddableAttributes(embeddable, prefs);
+        EmbeddableAttribute[] attrs = lookupEmbeddableAttributes(embeddable);
         controller.displayEmbeddableAttribute(new EmbeddableAttributeDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, embeddable, attrs));
+                ProjectPrefs.class, domain, dataMap, embeddable, attrs));
     }
 
-    private static void restoreProcedure(ProjectController controller, DataChannelDescriptor domain,
-                                         ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+    private void restoreProcedure(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        Procedure procedure = dataMap.getProcedure(prefs.getProcedure());
+        Procedure procedure = dataMap.getProcedure(prefs.get(PROCEDURE_KEY, ""));
         if (procedure == null) {
             return;
         }
-        controller.displayProcedure(new ProcedureDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, procedure));
+        controller.displayProcedure(new ProcedureDisplayEvent(ProjectPrefs.class, domain, dataMap, procedure));
     }
 
-    private static void restoreProcedureParameters(ProjectController controller, DataChannelDescriptor domain,
-                                                   ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+    private void restoreProcedureParameters(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        Procedure procedure = dataMap.getProcedure(prefs.getProcedure());
+        Procedure procedure = dataMap.getProcedure(prefs.get(PROCEDURE_KEY, ""));
         if (procedure == null) {
             return;
         }
-        controller.displayProcedure(new ProcedureDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, procedure));
+        controller.displayProcedure(new ProcedureDisplayEvent(ProjectPrefs.class, domain, dataMap, procedure));
 
-        ProcedureParameter[] params = lookupProcedureParameters(procedure, prefs);
+        ProcedureParameter[] params = lookupProcedureParameters(procedure);
         controller.displayProcedureParameter(new ProcedureParameterDisplayEvent(
-                ProjectSelectionMemo.class, domain, dataMap, procedure, params));
+                ProjectPrefs.class, domain, dataMap, procedure, params));
     }
 
-    private static void restoreQuery(ProjectController controller, DataChannelDescriptor domain,
-                                     ProjectStatePreferences prefs) {
-        DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+    private void restoreQuery(ProjectController controller, DataChannelDescriptor domain) {
+        DataMap dataMap = domain.getDataMap(prefs.get(DATA_MAP_KEY, ""));
         if (dataMap == null) {
             return;
         }
-        QueryDescriptor query = dataMap.getQueryDescriptor(prefs.getQuery());
+        QueryDescriptor query = dataMap.getQueryDescriptor(prefs.get(QUERY_KEY, ""));
         if (query == null) {
             return;
         }
-        controller.displayQuery(new QueryDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, query));
+        controller.displayQuery(new QueryDisplayEvent(ProjectPrefs.class, domain, dataMap, query));
     }
 
-    private static void restoreMultipleObjects(ProjectController controller, DataChannelDescriptor domain,
-                                               ProjectStatePreferences prefs) {
-        String parentName = prefs.getParentObject();
+    private void restoreMultipleObjects(ProjectController controller, DataChannelDescriptor domain) {
+        String parentName = prefs.get(PARENT_OBJECT_KEY, "");
         ConfigurationNode parent;
         ConfigurationNode[] objects;
 
@@ -533,66 +540,57 @@ final class ProjectSelectionMemo {
 
         if (parentMap != null) {
             parent = parentMap;
-            objects = lookupMultipleObjects(parentMap, prefs);
+            objects = lookupMultipleObjects(parentMap);
         } else if (parentNode != null) {
             parent = parentNode;
-            objects = lookupMultipleObjects(parentNode, prefs);
+            objects = lookupMultipleObjects(parentNode);
         } else {
             parent = domain;
-            objects = lookupMultipleObjects(domain, prefs);
+            objects = lookupMultipleObjects(domain);
         }
 
-        controller.displayMultipleObjects(new MultipleObjectsDisplayEvent(ProjectSelectionMemo.class, parent, objects));
+        controller.displayMultipleObjects(new MultipleObjectsDisplayEvent(ProjectPrefs.class, parent, objects));
     }
 
     // -------------------- name lookups --------------------
 
-    private static ObjAttribute[] lookupObjAttributes(ObjEntity entity, ProjectStatePreferences prefs) {
-        List<ObjAttribute> result = new ArrayList<>();
-        for (String name : prefs.getObjAttrs().split(",")) {
-            ObjAttribute attr = entity.getAttribute(name);
-            if (attr != null) {
-                result.add(attr);
-            }
-        }
-        return result.toArray(new ObjAttribute[0]);
+    private Entity<?, ?, ?> lookupEntity(DataMap dataMap) {
+        String objName = prefs.get(OBJ_ENTITY_KEY, "");
+        return !objName.isEmpty()
+                ? dataMap.getObjEntity(objName)
+                : dataMap.getDbEntity(prefs.get(DB_ENTITY_KEY, ""));
     }
 
-    private static DbAttribute[] lookupDbAttributes(DbEntity entity, ProjectStatePreferences prefs) {
-        List<DbAttribute> result = new ArrayList<>();
-        for (String name : prefs.getDbAttrs().split(",")) {
-            DbAttribute attr = entity.getAttribute(name);
+    private Attribute<?, ?, ?>[] lookupEntityAttributes(Entity<?, ?, ?> entity) {
+        String stored = (entity instanceof ObjEntity)
+                ? prefs.get(OBJ_ATTRS_KEY, "")
+                : prefs.get(DB_ATTRS_KEY, "");
+        List<Attribute<?, ?, ?>> result = new ArrayList<>();
+        for (String name : stored.split(",")) {
+            Attribute<?, ?, ?> attr = entity.getAttribute(name);
             if (attr != null) {
                 result.add(attr);
             }
         }
-        return result.toArray(new DbAttribute[0]);
+        return result.toArray(new Attribute[0]);
     }
 
-    private static ObjRelationship[] lookupObjRelationships(ObjEntity entity, ProjectStatePreferences prefs) {
-        List<ObjRelationship> result = new ArrayList<>();
-        for (String name : prefs.getObjRels().split(",")) {
-            ObjRelationship rel = entity.getRelationship(name);
-            if (rel != null) {
-                result.add(rel);
-            }
-        }
-        return result.toArray(new ObjRelationship[0]);
-    }
-
-    private static DbRelationship[] lookupDbRelationships(DbEntity entity, ProjectStatePreferences prefs) {
-        List<DbRelationship> result = new ArrayList<>();
-        for (String name : prefs.getDbRels().split(",")) {
-            DbRelationship rel = entity.getRelationship(name);
+    private Relationship<?, ?, ?>[] lookupEntityRelationships(Entity<?, ?, ?> entity) {
+        String stored = (entity instanceof ObjEntity)
+                ? prefs.get(OBJ_RELS_KEY, "")
+                : prefs.get(DB_RELS_KEY, "");
+        List<Relationship<?, ?, ?>> result = new ArrayList<>();
+        for (String name : stored.split(",")) {
+            Relationship<?, ?, ?> rel = entity.getRelationship(name);
             if (rel != null) {
                 result.add(rel);
             }
         }
-        return result.toArray(new DbRelationship[0]);
+        return result.toArray(new Relationship[0]);
     }
 
-    private static EmbeddableAttribute[] lookupEmbeddableAttributes(Embeddable embeddable, ProjectStatePreferences prefs) {
-        String stored = prefs.getEmbAttrs();
+    private EmbeddableAttribute[] lookupEmbeddableAttributes(Embeddable embeddable) {
+        String stored = prefs.get(EMBEDDABLE_ATTRS_KEY, "");
         List<EmbeddableAttribute> result = new ArrayList<>();
         if (stored.isEmpty()) {
             return new EmbeddableAttribute[0];
@@ -606,8 +604,8 @@ final class ProjectSelectionMemo {
         return result.toArray(new EmbeddableAttribute[0]);
     }
 
-    private static ProcedureParameter[] lookupProcedureParameters(Procedure procedure, ProjectStatePreferences prefs) {
-        String stored = prefs.getProcedureParams();
+    private ProcedureParameter[] lookupProcedureParameters(Procedure procedure) {
+        String stored = prefs.get(PROCEDURE_PARAMS_KEY, "");
         List<ProcedureParameter> result = new ArrayList<>();
         if (stored.isEmpty()) {
             return new ProcedureParameter[0];
@@ -622,8 +620,8 @@ final class ProjectSelectionMemo {
         return result.toArray(new ProcedureParameter[0]);
     }
 
-    private static ConfigurationNode[] lookupMultipleObjects(DataChannelDescriptor domain, ProjectStatePreferences prefs) {
-        String stored = prefs.getMultipleObjects();
+    private ConfigurationNode[] lookupMultipleObjects(DataChannelDescriptor domain) {
+        String stored = prefs.get(MULTIPLE_OBJECTS_KEY, "");
         if (stored.isEmpty()) {
             return new ConfigurationNode[0];
         }
@@ -637,8 +635,8 @@ final class ProjectSelectionMemo {
         return result.toArray(new ConfigurationNode[0]);
     }
 
-    private static ConfigurationNode[] lookupMultipleObjects(DataNodeDescriptor node, ProjectStatePreferences prefs) {
-        String stored = prefs.getMultipleObjects();
+    private ConfigurationNode[] lookupMultipleObjects(DataNodeDescriptor node) {
+        String stored = prefs.get(MULTIPLE_OBJECTS_KEY, "");
         if (stored.isEmpty()) {
             return new ConfigurationNode[0];
         }
@@ -651,8 +649,8 @@ final class ProjectSelectionMemo {
         return result.toArray(new ConfigurationNode[0]);
     }
 
-    private static ConfigurationNode[] lookupMultipleObjects(DataMap dataMap, ProjectStatePreferences prefs) {
-        String stored = prefs.getMultipleObjects();
+    private ConfigurationNode[] lookupMultipleObjects(DataMap dataMap) {
+        String stored = prefs.get(MULTIPLE_OBJECTS_KEY, "");
         if (stored.isEmpty()) {
             return new ConfigurationNode[0];
         }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectStatePreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectStatePreferences.java
deleted file mode 100644
index 3a33a9230..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectStatePreferences.java
+++ /dev/null
@@ -1,340 +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.pref;
-
-import org.apache.cayenne.modeler.ui.project.ProjectController;
-
-import java.util.prefs.BackingStoreException;
-import java.util.prefs.Preferences;
-
-public class ProjectStatePreferences extends RenamedPreferences {
-
-    private String event;
-    private String domain;
-    private String node;
-    private String dataMap;
-    private String objEntity;
-    private String dbEntity;
-    private String embeddable;
-    private String embAttrs;
-    private String objAttrs;
-    private String dbAttrs;
-    private String objRels;
-    private String dbRels;
-    private String procedure;
-    private String procedureParams;
-    private String query;
-    private String multipleObjects;
-    private String parentObject;
-
-    public static final String EVENT_PROPERTY = "event";
-    public static final String DOMAIN_PROPERTY = "domain";
-    public static final String NODE_PROPERTY = "node";
-    public static final String DATA_MAP_PROPERTY = "dataMap";
-    public static final String OBJ_ENTITY_PROPERTY = "objEntity";
-    public static final String DB_ENTITY_PROPERTY = "dbEntity";
-    public static final String EMBEDDABLE_PROPERTY = "embeddable";
-    public static final String EMBEDDABLE_ATTRS_PROPERTY = "embAttrs";
-    public static final String OBJ_ATTRS_PROPERTY = "objAttrs";
-    public static final String DB_ATTRS_PROPERTY = "dbAttrs";
-    public static final String OBJ_RELS_PROPERTY = "objRels";
-    public static final String DB_RELS_PROPERTY = "dbRels";
-    public static final String PROCEDURE_PROPERTY = "procedure";
-    public static final String PROCEDURE_PARAMS_PROPERTY = "procedureParams";
-    public static final String QUERY_PROPERTY = "query";
-    public static final String MULTIPLE_OBJECTS_PROPERTY = "multipleObjects";
-    public static final String PARENT_OBJECT_PROPERTY = "parentObject";
-
-    public ProjectStatePreferences(Preferences pref) {
-        super(pref);
-    }
-
-    public void saveSelection(ProjectController controller) {
-        if (getCurrentPreference() == null) {
-            return;
-        }
-        try {
-            getCurrentPreference().clear();
-        } catch (BackingStoreException e) {
-            // ignore exception
-        }
-        ProjectSelectionMemo.save(controller, this);
-    }
-
-    public void restoreSelection(ProjectController controller) {
-        ProjectSelectionMemo.restore(controller, this);
-    }
-
-    public String getEvent() {
-        if (event == null) {
-            event = getCurrentPreference().get(EVENT_PROPERTY, "");
-        }
-
-        return event;
-    }
-
-    public void setEvent(String event) {
-        this.event = event;
-        if (event != null) {
-            getCurrentPreference().put(EVENT_PROPERTY, event);
-        }
-    }
-
-    public String getDomain() {
-        if (domain == null) {
-            domain = getCurrentPreference().get(DOMAIN_PROPERTY, "");
-        }
-
-        return domain;
-    }
-
-    public void setDomain(String domain) {
-        this.domain = domain;
-        if (domain != null) {
-            getCurrentPreference().put(DOMAIN_PROPERTY, domain);
-        }
-    }
-
-    public String getNode() {
-        if (node == null) {
-            node = getCurrentPreference().get(NODE_PROPERTY, "");
-        }
-
-        return node;
-    }
-
-    public void setNode(String node) {
-        this.node = node;
-        if (node != null) {
-            getCurrentPreference().put(NODE_PROPERTY, node);
-        }
-    }
-
-    public String getDataMap() {
-        if (dataMap == null) {
-            dataMap = getCurrentPreference().get(DATA_MAP_PROPERTY, "");
-        }
-
-        return dataMap;
-    }
-
-    public void setDataMap(String dataMap) {
-        this.dataMap = dataMap;
-        if (dataMap != null) {
-            getCurrentPreference().put(DATA_MAP_PROPERTY, dataMap);
-        }
-    }
-
-    public String getObjEntity() {
-        if (objEntity == null) {
-            objEntity = getCurrentPreference().get(OBJ_ENTITY_PROPERTY, "");
-        }
-
-        return objEntity;
-    }
-
-    public void setObjEntity(String objEntity) {
-        this.objEntity = objEntity;
-        if (objEntity != null) {
-            getCurrentPreference().put(OBJ_ENTITY_PROPERTY, objEntity);
-        }
-    }
-
-    public String getDbEntity() {
-        if (dbEntity == null) {
-            dbEntity = getCurrentPreference().get(DB_ENTITY_PROPERTY, "");
-        }
-
-        return dbEntity;
-    }
-
-    public void setDbEntity(String dbEntity) {
-        this.dbEntity = dbEntity;
-        if (dbEntity != null) {
-            getCurrentPreference().put(DB_ENTITY_PROPERTY, dbEntity);
-        }
-    }
-
-    public String getEmbeddable() {
-        if (embeddable == null) {
-            embeddable = getCurrentPreference().get(EMBEDDABLE_PROPERTY, "");
-        }
-
-        return embeddable;
-    }
-
-    public void setEmbeddable(String embeddable) {
-        this.embeddable = embeddable;
-        if (embeddable != null) {
-            getCurrentPreference().put(EMBEDDABLE_PROPERTY, embeddable);
-        }
-    }
-
-    public String getEmbAttrs() {
-        if (embAttrs == null) {
-            embAttrs = getCurrentPreference().get(EMBEDDABLE_ATTRS_PROPERTY, "");
-        }
-
-        return embAttrs;
-    }
-
-    public void setEmbAttrs(String embAttrs) {
-        this.embAttrs = embAttrs;
-        if (embAttrs != null) {
-            getCurrentPreference().put(EMBEDDABLE_ATTRS_PROPERTY, embAttrs);
-        }
-    }
-
-    public String getObjAttrs() {
-        if (objAttrs == null) {
-            objAttrs = getCurrentPreference().get(OBJ_ATTRS_PROPERTY, "");
-        }
-
-        return objAttrs;
-    }
-
-    public void setObjAttrs(String objAttrs) {
-        this.objAttrs = objAttrs;
-        if (objAttrs != null) {
-            getCurrentPreference().put(OBJ_ATTRS_PROPERTY, objAttrs);
-        }
-    }
-
-    public String getDbAttrs() {
-        if (dbAttrs == null) {
-            dbAttrs = getCurrentPreference().get(DB_ATTRS_PROPERTY, "");
-        }
-
-        return dbAttrs;
-    }
-
-    public void setDbAttrs(String dbAttrs) {
-        this.dbAttrs = dbAttrs;
-        if (dbAttrs != null) {
-            getCurrentPreference().put(DB_ATTRS_PROPERTY, dbAttrs);
-        }
-    }
-
-    public String getObjRels() {
-        if (objRels == null) {
-            objRels = getCurrentPreference().get(OBJ_RELS_PROPERTY, "");
-        }
-
-        return objRels;
-    }
-
-    public void setObjRels(String objRels) {
-        this.objRels = objRels;
-        if (objRels != null) {
-            getCurrentPreference().put(OBJ_RELS_PROPERTY, objRels);
-        }
-    }
-
-    public String getDbRels() {
-        if (dbRels == null) {
-            dbRels = getCurrentPreference().get(DB_RELS_PROPERTY, "");
-        }
-
-        return dbRels;
-    }
-
-    public void setDbRels(String dbRels) {
-        this.dbRels = dbRels;
-        if (dbRels != null) {
-            getCurrentPreference().put(DB_RELS_PROPERTY, dbRels);
-        }
-    }
-
-    public String getProcedure() {
-        if (procedure == null) {
-            procedure = getCurrentPreference().get(PROCEDURE_PROPERTY, "");
-        }
-
-        return procedure;
-    }
-
-    public void setProcedure(String procedure) {
-        this.procedure = procedure;
-        if (procedure != null) {
-            getCurrentPreference().put(PROCEDURE_PROPERTY, procedure);
-        }
-    }
-
-    public String getProcedureParams() {
-        if (procedureParams == null) {
-            procedureParams = getCurrentPreference().get(PROCEDURE_PARAMS_PROPERTY, "");
-        }
-
-        return procedureParams;
-    }
-
-    public void setProcedureParams(String procedureParams) {
-        this.procedureParams = procedureParams;
-        if (procedureParams != null) {
-            getCurrentPreference().put(PROCEDURE_PARAMS_PROPERTY, procedureParams);
-        }
-    }
-
-    public String getQuery() {
-        if (query == null) {
-            query = getCurrentPreference().get(QUERY_PROPERTY, "");
-        }
-
-        return query;
-    }
-
-    public void setQuery(String query) {
-        this.query = query;
-        if (query != null) {
-            getCurrentPreference().put(QUERY_PROPERTY, query);
-        }
-    }
-
-    public String getMultipleObjects() {
-        if (multipleObjects == null) {
-            multipleObjects = getCurrentPreference().get(MULTIPLE_OBJECTS_PROPERTY, "");
-        }
-
-        return multipleObjects;
-    }
-
-    public void setMultipleObjects(String multipleObjects) {
-        this.multipleObjects = multipleObjects;
-        if (multipleObjects != null) {
-            getCurrentPreference().put(MULTIPLE_OBJECTS_PROPERTY, multipleObjects);
-        }
-    }
-
-    public String getParentObject() {
-        if (parentObject == null) {
-            parentObject = getCurrentPreference().get(PARENT_OBJECT_PROPERTY, "");
-        }
-
-        return parentObject;
-    }
-
-    public void setParentObject(String parentObject) {
-        this.parentObject = parentObject;
-        if (parentObject != null) {
-            getCurrentPreference().put(PARENT_OBJECT_PROPERTY, parentObject);
-        }
-    }
-
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
index b5fd436d1..c24e9c74a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
@@ -41,7 +41,7 @@ import org.apache.cayenne.modeler.event.model.*;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.pref.DataMapDefaults;
 import org.apache.cayenne.modeler.pref.DataNodeDefaults;
-import org.apache.cayenne.modeler.pref.ProjectStatePreferences;
+import org.apache.cayenne.modeler.pref.ProjectPrefs;
 import org.apache.cayenne.modeler.service.action.GlobalActions;
 import org.apache.cayenne.modeler.ui.ModelerController;
 import org.apache.cayenne.modeler.ui.action.RevertAction;
@@ -61,6 +61,7 @@ import java.util.EventListener;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.prefs.Preferences;
 
@@ -114,10 +115,6 @@ public class ProjectController extends ChildController<ModelerController> {
         return preferences;
     }
 
-    public ProjectStatePreferences getProjectStatePreferences() {
-        return new ProjectStatePreferences(getDataDomainPreferences());
-    }
-
     /**
      * Returns top preferences for the current project, throwing an exception if no project is selected.
      */
@@ -272,11 +269,11 @@ public class ProjectController extends ChildController<ModelerController> {
         if (project == null) {
             return;
         }
-        getProjectStatePreferences().saveSelection(this);
+        ProjectPrefs.of(getDataDomainPreferences()).flush(this);
     }
 
     public void restoreSelectionFromPrefs() {
-        getProjectStatePreferences().restoreSelection(this);
+        ProjectPrefs.of(getDataDomainPreferences()).load(this);
     }
 
     public boolean isDirty() {
@@ -541,12 +538,10 @@ public class ProjectController extends ChildController<ModelerController> {
         }
 
         for (DomainListener listener : listeners.getListeners(DomainListener.class)) {
-            switch (e.getType()) {
-                case CHANGE:
-                    listener.domainChanged(e);
-                    break;
-                default:
-                    throw new IllegalArgumentException("Invalid DomainEvent type: " + e.getType());
+            if (Objects.requireNonNull(e.getType()) == ModelEvent.Type.CHANGE) {
+                listener.domainChanged(e);
+            } else {
+                throw new IllegalArgumentException("Invalid DomainEvent type: " + e.getType());
             }
         }
     }


(cayenne) 01/04: Modeler cleanup

Posted by aa...@apache.org.
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 5a46e689b212409e8e7f163c7b28e64ab2932542
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 1 10:50:49 2026 -0400

    Modeler cleanup
    
    display events cleanup
---
 .../modeler/event/display/CallbackMethodDisplayEvent.java    |  2 +-
 .../modeler/event/display/DbAttributeDisplayEvent.java       | 10 +---------
 .../modeler/event/display/DbRelationshipDisplayEvent.java    | 10 +---------
 .../event/display/EmbeddableAttributeDisplayEvent.java       | 12 ++----------
 .../modeler/event/display/MultipleObjectsDisplayEvent.java   |  4 ++--
 .../modeler/event/display/ObjAttributeDisplayEvent.java      | 10 +---------
 .../modeler/event/display/ObjRelationshipDisplayEvent.java   | 10 +---------
 .../event/display/ProcedureParameterDisplayEvent.java        | 10 +---------
 .../apache/cayenne/modeler/pref/ProjectSelectionMemo.java    |  2 +-
 .../modeler/ui/project/tree/ProjectTreeController.java       |  2 +-
 10 files changed, 12 insertions(+), 60 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
index 0b2a1c51b..5bed58ce0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
@@ -24,7 +24,7 @@ public class CallbackMethodDisplayEvent extends DisplayEvent {
 
     private final ObjCallbackMethod[] callbackMethods;
 
-    public CallbackMethodDisplayEvent(Object src, ObjCallbackMethod[] callbackMethods) {
+    public CallbackMethodDisplayEvent(Object src, ObjCallbackMethod... callbackMethods) {
         super(src);
         this.callbackMethods = callbackMethods;
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
index 0e27738af..1cbfda7ac 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
@@ -35,15 +35,7 @@ public class DbAttributeDisplayEvent extends DisplayEvent {
                                    DataChannelDescriptor domain,
                                    DataMap dataMap,
                                    DbEntity entity,
-                                   DbAttribute attribute) {
-        this(src, domain, dataMap, entity, new DbAttribute[]{attribute});
-    }
-
-    public DbAttributeDisplayEvent(Object src,
-                                   DataChannelDescriptor domain,
-                                   DataMap dataMap,
-                                   DbEntity entity,
-                                   DbAttribute[] attributes) {
+                                   DbAttribute... attributes) {
         super(src);
         this.domain = domain;
         this.dataMap = dataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
index 8b05528a0..8148e4e58 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
@@ -35,15 +35,7 @@ public class DbRelationshipDisplayEvent extends DisplayEvent {
                                       DataChannelDescriptor domain,
                                       DataMap dataMap,
                                       DbEntity entity,
-                                      DbRelationship relationship) {
-        this(src, domain, dataMap, entity, new DbRelationship[]{relationship});
-    }
-
-    public DbRelationshipDisplayEvent(Object src,
-                                      DataChannelDescriptor domain,
-                                      DataMap dataMap,
-                                      DbEntity entity,
-                                      DbRelationship[] relationships) {
+                                      DbRelationship... relationships) {
         super(src);
         this.domain = domain;
         this.dataMap = dataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
index a2d133c83..62be96d99 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
@@ -34,20 +34,12 @@ public class EmbeddableAttributeDisplayEvent extends DisplayEvent {
                                            DataChannelDescriptor domain,
                                            DataMap dataMap,
                                            Embeddable embeddable,
-                                           EmbeddableAttribute attribute) {
-        this(src, domain, dataMap, embeddable, new EmbeddableAttribute[]{attribute});
-    }
-
-    public EmbeddableAttributeDisplayEvent(Object src,
-                                           DataChannelDescriptor domain,
-                                           DataMap dataMap,
-                                           Embeddable embeddable,
-                                           EmbeddableAttribute[] attributes) {
+                                           EmbeddableAttribute... embeddableAttributes) {
         super(src);
         this.domain = domain;
         this.dataMap = dataMap;
         this.embeddable = embeddable;
-        this.embeddableAttributes = attributes;
+        this.embeddableAttributes = embeddableAttributes;
     }
 
     public DataChannelDescriptor getDomain() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
index f64cfeafc..2dfe655f1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
@@ -28,10 +28,10 @@ public class MultipleObjectsDisplayEvent extends DisplayEvent {
     private final ConfigurationNode[] nodes;
     private final ConfigurationNode parentNode;
 
-    public MultipleObjectsDisplayEvent(Object src, ConfigurationNode[] nodes, ConfigurationNode parentNode) {
+    public MultipleObjectsDisplayEvent(Object src, ConfigurationNode parentNode, ConfigurationNode... nodes) {
         super(src);
-        this.nodes = nodes;
         this.parentNode = parentNode;
+        this.nodes = nodes;
     }
 
     public ConfigurationNode[] getNodes() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
index 74a67dcbb..fe78723ce 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
@@ -35,15 +35,7 @@ public class ObjAttributeDisplayEvent extends DisplayEvent {
                                     DataChannelDescriptor domain,
                                     DataMap dataMap,
                                     ObjEntity entity,
-                                    ObjAttribute attribute) {
-        this(src, domain, dataMap, entity, new ObjAttribute[]{attribute});
-    }
-
-    public ObjAttributeDisplayEvent(Object src,
-                                    DataChannelDescriptor domain,
-                                    DataMap dataMap,
-                                    ObjEntity entity,
-                                    ObjAttribute[] attributes) {
+                                    ObjAttribute... attributes) {
         super(src);
         this.domain = domain;
         this.dataMap = dataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
index d8a43142f..7bb803084 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
@@ -35,15 +35,7 @@ public class ObjRelationshipDisplayEvent extends DisplayEvent {
                                        DataChannelDescriptor domain,
                                        DataMap dataMap,
                                        ObjEntity entity,
-                                       ObjRelationship relationship) {
-        this(src, domain, dataMap, entity, new ObjRelationship[]{relationship});
-    }
-
-    public ObjRelationshipDisplayEvent(Object src,
-                                       DataChannelDescriptor domain,
-                                       DataMap dataMap,
-                                       ObjEntity entity,
-                                       ObjRelationship[] relationships) {
+                                       ObjRelationship... relationships) {
         super(src);
         this.domain = domain;
         this.dataMap = dataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
index 1028ceca5..c60cfc63f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
@@ -36,15 +36,7 @@ public class ProcedureParameterDisplayEvent extends DisplayEvent {
                                           DataChannelDescriptor domain,
                                           DataMap dataMap,
                                           Procedure procedure,
-                                          ProcedureParameter procedureParameter) {
-        this(src, domain, dataMap, procedure, new ProcedureParameter[]{procedureParameter});
-    }
-
-    public ProcedureParameterDisplayEvent(Object src,
-                                          DataChannelDescriptor domain,
-                                          DataMap dataMap,
-                                          Procedure procedure,
-                                          ProcedureParameter[] procedureParameters) {
+                                          ProcedureParameter... procedureParameters) {
         super(src);
         this.domain = domain;
         this.dataMap = dataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
index aec6525ab..2d961aa9a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
@@ -542,7 +542,7 @@ final class ProjectSelectionMemo {
             objects = lookupMultipleObjects(domain, prefs);
         }
 
-        controller.displayMultipleObjects(new MultipleObjectsDisplayEvent(ProjectSelectionMemo.class, objects, parent));
+        controller.displayMultipleObjects(new MultipleObjectsDisplayEvent(ProjectSelectionMemo.class, parent, objects));
     }
 
     // -------------------- name lookups --------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
index 2b7b653ee..667f30296 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
@@ -199,7 +199,7 @@ public class ProjectTreeController extends ChildController<ProjectController>
 
                         parent.displayMultipleObjects(new MultipleObjectsDisplayEvent(
                                 this,
-                                projectPaths, projectParentPath));
+                                projectParentPath, projectPaths));
                     } else if (paths.length == 1) {
                         processSelection(paths[0]);
                     }


(cayenne) 03/04: Modeler cleanup

Posted by aa...@apache.org.
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 c79b6e97620a141646fbd0ae4618cdb9fa0d5885
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 1 10:50:49 2026 -0400

    Modeler cleanup
---
 .../modeler/ui/project/ProjectController.java      | 23 ----------------------
 .../attrinfo/ObjAttributeInfoDialogController.java |  6 +++---
 .../properties/ObjAttributeTableModel.java         |  2 +-
 3 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
index c24e9c74a..4b1a9c2dd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
@@ -58,11 +58,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.EventListener;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import java.util.prefs.Preferences;
 
 /**
@@ -1222,26 +1219,6 @@ public class ProjectController extends ChildController<ModelerController> {
         }
     }
 
-    public ArrayList<Embeddable> getEmbeddablesInCurrentDataDomain() {
-        DataChannelDescriptor dataChannelDescriptor = (DataChannelDescriptor) getProject().getRootNode();
-        Collection<DataMap> maps = dataChannelDescriptor.getDataMaps();
-        Iterator<DataMap> it = maps.iterator();
-        ArrayList<Embeddable> embs = new ArrayList<>();
-        while (it.hasNext()) {
-            embs.addAll(it.next().getEmbeddables());
-        }
-        return embs;
-    }
-
-    public Set<String> getEmbeddableNamesInCurrentDataDomain() {
-        ArrayList<Embeddable> embs = getEmbeddablesInCurrentDataDomain();
-        Set<String> embNames = new HashSet<>(embs.size());
-        for (Embeddable emb : embs) {
-            embNames.add(emb.getClassName());
-        }
-        return embNames;
-    }
-
     private Preferences buildPreferences() {
 
         Preferences root = Preferences.userNodeForPackage(Project.class);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java
index ac34cd8ed..ce04855f7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java
@@ -88,7 +88,7 @@ public class ObjAttributeInfoDialogController extends ChildController<ProjectCon
         this.stringToEmbeddables = new HashMap<>();
         this.embeddableNames = new ArrayList<>();
 
-        for (Embeddable emb : mediator.getEmbeddablesInCurrentDataDomain()) {
+        for (Embeddable emb : mediator.getEntityResolver().getEmbeddables()) {
             stringToEmbeddables.put(emb.getClassName(), emb);
             embeddableNames.add(emb.getClassName());
         }
@@ -128,8 +128,8 @@ public class ObjAttributeInfoDialogController extends ChildController<ProjectCon
                 }
             }
 
-            if (isType || !mediator.getEmbeddableNamesInCurrentDataDomain()
-                    .contains((String) view.getTypeComboBox().getSelectedItem())) {
+            if (isType || mediator.getEntityResolver()
+                    .getEmbeddable((String) view.getTypeComboBox().getSelectedItem()) == null) {
                 ((CardLayout) view.getTypeManagerPane().getLayout()).show(view.getTypeManagerPane(), FLATTENED_PANEL);
             } else {
                 ((CardLayout) view.getTypeManagerPane().getLayout()).show(view.getTypeManagerPane(), EMBEDDABLE_PANEL);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
index cb1bfb84e..1bcc046db 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
@@ -248,7 +248,7 @@ public class ObjAttributeTableModel extends CMTableModel<ObjAttribute> {
         }
 
         ObjAttribute attributeNew;
-        if (controller.getEmbeddableNamesInCurrentDataDomain().contains(newType)) {
+        if (controller.getEntityResolver().getEmbeddable(newType) != null) {
             attributeNew = new EmbeddedAttribute();
             attributeNew.setDbAttributePath((String)null);
         } else {


(cayenne) 04/04: Modeler cleanup

Posted by aa...@apache.org.
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 76808c4eafd144af1cead78dd0f324b6883d0043
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 1 10:50:49 2026 -0400

    Modeler cleanup
    
    prefs cleanup
---
 .../org/apache/cayenne/modeler/Application.java    |   5 +-
 .../cayenne/modeler/pref/DBGeneratorDefaults.java  | 124 ------------
 .../apache/cayenne/modeler/pref/GeneralPrefs.java  |  74 +++++++
 .../cayenne/modeler/pref/RenamedPreferences.java   | 224 ++++++++++-----------
 .../cayenne/modeler/ui/action/SaveAsAction.java    |   4 +-
 .../ui/confirmremove/ConfirmRemoveDialog.java      |  31 +--
 .../ui/datasource/DataSourceController.java        |   9 +-
 .../ui/dbgen/DBGeneratorOptionsController.java     |  43 ++--
 .../cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java |  67 ++++++
 .../ui/preferences/PreferenceDialogController.java |  11 +-
 .../general/GeneralPreferencesController.java      | 160 ++++-----------
 .../general/GeneralPreferencesView.java            |  84 ++------
 .../modeler/ui/project/ProjectController.java      |   1 -
 .../modeler/{pref => ui/project}/ProjectPrefs.java |   3 +-
 .../datadomain/cgen/DataDomainCgenController.java  |   8 +-
 .../editor/datamap/cgen/CgenController.java        |   8 +-
 16 files changed, 358 insertions(+), 498 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 096cc6f92..2fee9f607 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
@@ -29,6 +29,7 @@ import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.modeler.pref.CayennePreference;
 import org.apache.cayenne.modeler.dbconnector.DBConnectorPrefs;
 import org.apache.cayenne.modeler.dbconnector.DBConnectors;
+import org.apache.cayenne.modeler.pref.GeneralPrefs;
 import org.apache.cayenne.modeler.pref.LastProjectsPreferences;
 import org.apache.cayenne.modeler.service.action.GlobalActions;
 import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
@@ -37,7 +38,6 @@ import org.apache.cayenne.modeler.ui.ModelerController;
 import org.apache.cayenne.modeler.ui.action.OpenProjectAction;
 import org.apache.cayenne.modeler.ui.logconsole.LogConsoleController;
 import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesController;
-import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.undo.CayenneUndoManager;
 import org.apache.cayenne.project.ConfigurationNodeParentGetter;
 import org.apache.cayenne.project.Project;
@@ -282,8 +282,7 @@ public class Application {
 
     private File initialProjectFromPreferences() {
 
-        Preferences autoLoadLastProject = getPreferencesNode(GeneralPreferencesController.class, "");
-        if ((autoLoadLastProject != null) && autoLoadLastProject.getBoolean(GeneralPreferencesController.AUTO_LOAD_PROJECT_PREFERENCE, false)) {
+        if (GeneralPrefs.of().isAutoLoadProject()) {
             List<File> files = LastProjectsPreferences.getFiles();
             if (!files.isEmpty()) {
                 return files.get(0);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
deleted file mode 100644
index b7ac2c96f..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
+++ /dev/null
@@ -1,124 +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.pref;
-
-import org.apache.cayenne.access.DbGenerator;
-
-import java.util.Collection;
-import java.util.prefs.Preferences;
-
-public class DBGeneratorDefaults extends RenamedPreferences {
-
-    public static final String CREATE_FK_PROPERTY = "createFK";
-    public static final String CREATE_PK_PROPERTY = "createPK";
-    public static final String CREATE_TABLES_PROPERTY = "createTables";
-    public static final String DROP_PK_PROPERTY = "dropPK";
-    public static final String DROP_TABLES_PROPERTY = "dropTables";
-
-    public boolean createFK;
-    public boolean createPK;
-    public boolean createTables;
-    public boolean dropPK;
-    public boolean dropTables;
-
-    public DBGeneratorDefaults(Preferences pref) {
-        super(pref);
-        this.createFK = getCurrentPreference().getBoolean(CREATE_FK_PROPERTY, true);
-        this.createPK = getCurrentPreference().getBoolean(CREATE_PK_PROPERTY, true);
-        this.createTables = getCurrentPreference().getBoolean(
-                CREATE_TABLES_PROPERTY,
-                true);
-        this.dropPK = getCurrentPreference().getBoolean(DROP_PK_PROPERTY, false);
-        this.dropTables = getCurrentPreference().getBoolean(DROP_TABLES_PROPERTY, false);
-    }
-
-    public void setCreateFK(Boolean createFK) {
-        this.createFK = createFK;
-        getCurrentPreference().putBoolean(CREATE_FK_PROPERTY, createFK);
-    }
-
-    public boolean getCreateFK() {
-        return createFK;
-    }
-
-    public void setCreatePK(Boolean createPK) {
-        this.createPK = createPK;
-        getCurrentPreference().putBoolean(CREATE_PK_PROPERTY, createPK);
-    }
-
-    public boolean getCreatePK() {
-        return createPK;
-    }
-
-    public void setCreateTables(Boolean createTables) {
-        this.createTables = createTables;
-        getCurrentPreference().putBoolean(CREATE_TABLES_PROPERTY, createTables);
-    }
-
-    public boolean getCreateTables() {
-        return createTables;
-    }
-
-    public void setDropPK(Boolean dropPK) {
-        this.dropPK = dropPK;
-        getCurrentPreference().putBoolean(DROP_PK_PROPERTY, dropPK);
-    }
-
-    public boolean getDropPK() {
-        return dropPK;
-    }
-
-    public void setDropTables(Boolean dropTables) {
-        this.dropTables = dropTables;
-        getCurrentPreference().putBoolean(DROP_TABLES_PROPERTY, dropTables);
-    }
-
-    public boolean getDropTables() {
-        return dropTables;
-    }
-
-    /**
-     * Updates DbGenerator settings, consulting its own state.
-     */
-    public void configureGenerator(Collection<DbGenerator> generators) {
-        setCreateFK(createFK);
-        setCreatePK(createPK);
-        setCreateTables(createTables);
-        setDropPK(dropPK);
-        setDropTables(dropTables);
-        for (DbGenerator generator : generators) {
-            generator.setShouldCreateFKConstraints(createFK);
-            generator.setShouldCreatePKSupport(createPK);
-            generator.setShouldCreateTables(createTables);
-            generator.setShouldDropPKSupport(dropPK);
-            generator.setShouldDropTables(dropTables);
-        }
-    }
-
-    /**
-     * An initialization callback.
-     */
-    public void prePersist() {
-        setCreateFK(Boolean.TRUE);
-        setCreatePK(Boolean.TRUE);
-        setCreateTables(Boolean.TRUE);
-        setDropPK(Boolean.FALSE);
-        setDropTables(Boolean.FALSE);
-    }
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/GeneralPrefs.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/GeneralPrefs.java
new file mode 100644
index 000000000..dc75edcaa
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/GeneralPrefs.java
@@ -0,0 +1,74 @@
+/*****************************************************************
+ *   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.pref;
+
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
+
+import java.util.prefs.Preferences;
+
+public final class GeneralPrefs {
+
+    static final String AUTO_LOAD_PROJECT     = "autoLoadProject";
+    static final String DELETE_PROMPT         = "deletePrompt";
+    static final String ENCODING              = "encoding";
+    static final String FAVOURITE_DATA_SOURCE = "favouriteDataSource";
+
+    private final Preferences prefs;
+
+    private GeneralPrefs(Preferences prefs) {
+        this.prefs = prefs;
+    }
+
+    public static GeneralPrefs of() {
+        return new GeneralPrefs(Preferences.userNodeForPackage(GeneralPreferencesController.class));
+    }
+
+    public boolean isAutoLoadProject() {
+        return prefs.getBoolean(AUTO_LOAD_PROJECT, false);
+    }
+
+    public void setAutoLoadProject(boolean v) {
+        prefs.putBoolean(AUTO_LOAD_PROJECT, v);
+    }
+
+    public boolean isDeletePrompt() {
+        return prefs.getBoolean(DELETE_PROMPT, false);
+    }
+
+    public void setDeletePrompt(boolean v) {
+        prefs.putBoolean(DELETE_PROMPT, v);
+    }
+
+    public String getEncoding() {
+        return prefs.get(ENCODING, null);
+    }
+
+    public void setEncoding(String v) {
+        prefs.put(ENCODING, v == null ? "" : v);
+    }
+
+    public String getFavouriteDataSource() {
+        return prefs.get(FAVOURITE_DATA_SOURCE, null);
+    }
+
+    public void setFavouriteDataSource(String v) {
+        prefs.put(FAVOURITE_DATA_SOURCE, v);
+    }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/RenamedPreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/RenamedPreferences.java
index 23b48fc1f..96cd50b07 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/RenamedPreferences.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/RenamedPreferences.java
@@ -18,115 +18,89 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.pref;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 
 /**
- * use for preferences where in preference's node path contains dependence from name dataChanelDescriptor, 
- * dataNodeDescriptor, dataMap etc.
+ * Base class for preferences whose node path embeds a name that can change at runtime
+ * (DataChannelDescriptor, DataNodeDescriptor, DataMap, ...). The Java {@link Preferences}
+ * API has no native rename, so on rename we copy the entire subtree to the new path and
+ * defer cleanup until the user saves or exits.
+ * <p>
+ * Two process-wide buffers track the speculative rename:
+ * <ul>
+ *   <li>{@code oldNodes} — original nodes to delete on save (commit)</li>
+ *   <li>{@code newNodes} — copied nodes to delete on unsaved exit (rollback)</li>
+ * </ul>
+ * The buffers are shared across all rename sites because the commit/rollback decision
+ * is made far from the rename itself, in {@code SaveAction} and {@code ExitAction}.
+ * Access is implicitly single-threaded (Swing EDT).
  */
 public abstract class RenamedPreferences extends CayennePreference {
 
-    private static List<Preferences> newNode;
-    private static List<Preferences> oldNode;
+    private static final Logger LOGGER = LoggerFactory.getLogger(RenamedPreferences.class);
 
-    public RenamedPreferences(Preferences pref) {
-        this.currentPreference = pref;
-    }
-
-    public void copyPreferences(String newName) {
-        this.currentPreference = copyPreferences(newName, getCurrentPreference());
-    }
+    private static final List<Preferences> newNodes = new ArrayList<>();
+    private static final List<Preferences> oldNodes = new ArrayList<>();
 
     public static Preferences copyPreferences(String newName, Preferences oldPref) {
-
         Preferences parent = oldPref.parent();
         Preferences newPref = parent.node(newName);
-        return copyPreferences(newPref, oldPref, true);
+        return copyTracked(newPref, oldPref);
     }
 
-    private static ArrayList<Preferences> childrenCopy(
-            Preferences pref,
-            String oldPath,
-            String newPath) {
-
-        try {
-            String[] children = pref.childrenNames();
-
-            ArrayList<Preferences> prefChild = new ArrayList<>();
-
-            for (String child : children) {
-                // get old preference
-                Preferences childNode = pref.node(child);
-
-                if (!equalsPath(oldNode, childNode)) {
-                    // path to node
-                    String path = childNode.absolutePath().replace(oldPath, newPath);
-
-                    // copy all preferences in this node
-                    String[] names = childNode.keys();
-                    Preferences newPref = Preferences.userRoot().node(path);
-                    for (String name : names) {
-                        newPref.put(name, childNode.get(name, ""));
-                    }
-                    prefChild.add(newPref);
-                }
-            }
+    /**
+     * Copies the {@code oldPref} subtree onto {@code newPref} and registers both nodes
+     * for deferred cleanup: {@code oldPref} on save, {@code newPref} on unsaved exit.
+     */
+    public static Preferences copyTracked(Preferences newPref, Preferences oldPref) {
+        return copy(newPref, oldPref, true);
+    }
 
-            return prefChild;
-        }
-        catch (BackingStoreException e) {
-        }
-        return null;
+    /**
+     * Copies the {@code oldPref} subtree onto {@code newPref} without registering either
+     * node for deferred cleanup. Used by Save As, where the caller manages cleanup itself.
+     */
+    public static Preferences copyUntracked(Preferences newPref, Preferences oldPref) {
+        return copy(newPref, oldPref, false);
     }
 
     public static void removeOldPreferences() {
-        if (oldNode != null) {
-
-            for (Preferences pref : oldNode) {
-                try {
-                    pref.removeNode();
-                } catch (BackingStoreException e) {
-                } catch (IllegalStateException e) {
-                    // do nothing
-                }
-            }
-            clearPreferences();
+        for (Preferences pref : oldNodes) {
+            removeNodeQuietly(pref);
         }
-
+        clearPreferences();
     }
 
     public static void removeNewPreferences() {
-        if (newNode != null) {
-
-            for (Preferences pref : newNode) {
-                try {
-                    pref.removeNode();
-                } catch (BackingStoreException e) {
-                } catch (IllegalStateException e) {
-                    // do nothing
-                }
-            }
-            clearPreferences();
+        for (Preferences pref : newNodes) {
+            removeNodeQuietly(pref);
         }
+        clearPreferences();
     }
 
     public static void clearPreferences() {
-        oldNode.clear();
-        newNode.clear();
+        oldNodes.clear();
+        newNodes.clear();
     }
 
-    public static Preferences copyPreferences(
-            Preferences newPref,
-            Preferences oldPref,
-            boolean addToPreferenceList) {
+    public RenamedPreferences(Preferences pref) {
+        this.currentPreference = pref;
+    }
 
+    public void copyPreferences(String newName) {
+        this.currentPreference = copyPreferences(newName, getCurrentPreference());
+    }
+
+    private static Preferences copy(Preferences newPref, Preferences oldPref, boolean track) {
         try {
-            // copy all preferences in this node
             String[] names = oldPref.keys();
-
             for (String name : names) {
                 newPref.put(name, oldPref.get(name, ""));
             }
@@ -134,61 +108,79 @@ public abstract class RenamedPreferences extends CayennePreference {
             String oldPath = oldPref.absolutePath();
             String newPath = newPref.absolutePath();
 
-            // copy children nodes and its preferences
-            ArrayList<Preferences> childrenOldPref = childrenCopy(
-                    oldPref,
-                    oldPath,
-                    newPath);
-
+            List<Preferences> childrenOldPref = childrenCopy(oldPref, oldPath, newPath);
             while (!childrenOldPref.isEmpty()) {
-
-                ArrayList<Preferences> childrenPrefTemp = new ArrayList<>();
-
+                List<Preferences> childrenPrefTemp = new ArrayList<>();
                 for (Preferences child : childrenOldPref) {
-                    ArrayList<Preferences> childArray = childrenCopy(
-                            child,
-                            oldPath,
-                            newPath);
-
-                    childrenPrefTemp.addAll(childArray);
+                    childrenPrefTemp.addAll(childrenCopy(child, oldPath, newPath));
                 }
-
-                childrenOldPref.clear();
-                childrenOldPref.addAll(childrenPrefTemp);
-            }
-
-            if (newNode == null) {
-                newNode = new ArrayList<>();
-            }
-            if (oldNode == null) {
-                oldNode = new ArrayList<>();
+                childrenOldPref = childrenPrefTemp;
             }
 
-            if (addToPreferenceList) {
-                if (!equalsPath(newNode, newPref)) {
-                    newNode.add(newPref);
+            if (track) {
+                if (!containsByPath(newNodes, newPref)) {
+                    newNodes.add(newPref);
                 }
-                if (!equalsPath(oldNode, oldPref)) {
-                    oldNode.add(oldPref);
+                if (!containsByPath(oldNodes, oldPref)) {
+                    oldNodes.add(oldPref);
                 }
             }
 
             return newPref;
-        }
-        catch (BackingStoreException e) {
-            throw new RuntimeException("Error remane preferences");
+        } catch (BackingStoreException e) {
+            throw new RuntimeException("Error renaming preferences", e);
         }
     }
 
-    private static boolean equalsPath(List<Preferences> listPref, Preferences pref) {
-        if (listPref != null) {
-            for (Preferences next : listPref) {
-                String pathInList = next.absolutePath();
-                String path = pref.absolutePath();
-                if (pathInList.equals(path)) {
-                    return true;
+    private static List<Preferences> childrenCopy(Preferences pref, String oldPath, String newPath) {
+        try {
+            String[] children = pref.childrenNames();
+            List<Preferences> prefChild = new ArrayList<>();
+
+            for (String child : children) {
+                Preferences childNode = pref.node(child);
+
+                if (!containsByPath(oldNodes, childNode)) {
+                    String path = childNode.absolutePath().replace(oldPath, newPath);
+
+                    String[] names = childNode.keys();
+                    Preferences newPref = Preferences.userRoot().node(path);
+                    for (String name : names) {
+                        newPref.put(name, childNode.get(name, ""));
+                    }
+                    prefChild.add(newPref);
                 }
             }
+
+            return prefChild;
+        } catch (BackingStoreException e) {
+            LOGGER.warn("Error reading preference children at '{}'", pref.absolutePath(), e);
+            return Collections.emptyList();
+        }
+    }
+
+    private static void removeNodeQuietly(Preferences pref) {
+        try {
+            pref.removeNode();
+        } catch (BackingStoreException | IllegalStateException e) {
+            LOGGER.warn("Error removing preference node '{}'", safePath(pref), e);
+        }
+    }
+
+    private static String safePath(Preferences pref) {
+        try {
+            return pref.absolutePath();
+        } catch (IllegalStateException e) {
+            return "<removed>";
+        }
+    }
+
+    private static boolean containsByPath(List<Preferences> list, Preferences pref) {
+        String path = pref.absolutePath();
+        for (Preferences next : list) {
+            if (next.absolutePath().equals(path)) {
+                return true;
+            }
         }
         return false;
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java
index 3ebe943b4..c7af16cbe 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/SaveAsAction.java
@@ -109,7 +109,7 @@ public class SaveAsAction extends ModelerAbstractAction {
             Preferences oldPref = getProjectController().getPreferences();
             String projPath = oldPref.absolutePath().replace(oldName, "");
             Preferences newPref = getProjectController().getPreferences().node(projPath + newName);
-            RenamedPreferences.copyPreferences(newPref, getProjectController().getPreferences(), false);
+            RenamedPreferences.copyUntracked(newPref, getProjectController().getPreferences());
         } else if (isNewProject) {
             if (tempOldPref != null) {
 
@@ -122,7 +122,7 @@ public class SaveAsAction extends ModelerAbstractAction {
 
                     Preferences newPref = application.getMainPreferenceForProject().node(projPath + newName);
 
-                    RenamedPreferences.copyPreferences(newPref, tempOldPref, false);
+                    RenamedPreferences.copyUntracked(newPref, tempOldPref);
                     tempOldPref.removeNode();
                 }
             }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
index 7c41df275..f17872db2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
@@ -18,13 +18,10 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.ui.confirmremove;
 
-import java.util.prefs.Preferences;
-
-import javax.swing.JCheckBox;
-import javax.swing.JOptionPane;
-
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
+import org.apache.cayenne.modeler.pref.GeneralPrefs;
+
+import javax.swing.*;
 
 /**
  * Used to confirm deleting items in the model.
@@ -66,12 +63,7 @@ public class ConfirmRemoveDialog {
         // If the user clicks "cancel" or window close button, we'll just ignore whatever's in the checkbox because
         // it's non-sensical.
         if (shouldDelete) {
-            Preferences pref = application.getPreferencesNode(
-                    GeneralPreferencesController.class,
-                    "");
-            pref.putBoolean(
-                    GeneralPreferencesController.DELETE_PROMPT_PREFERENCE,
-                    neverPromptAgainBox.isSelected());
+            GeneralPrefs.of().setDeletePrompt(!neverPromptAgainBox.isSelected());
         }
     }
 
@@ -80,19 +72,8 @@ public class ConfirmRemoveDialog {
     }
 
     public boolean shouldDelete(String name) {
-        if (allowAsking) {
-
-            Preferences pref = application.getPreferencesNode(
-                    GeneralPreferencesController.class,
-                    "");
-
-            // See if the user has opted not to showDialog the delete dialog.
-            if ((pref == null)
-                    || !pref.getBoolean(
-                            GeneralPreferencesController.DELETE_PROMPT_PREFERENCE,
-                            false)) {
-                showDialog(name);
-            }
+        if (allowAsking && GeneralPrefs.of().isDeletePrompt()) {
+            showDialog(name);
         }
 
         return shouldDelete;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceController.java
index cfb0f6f05..f71fa1d72 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceController.java
@@ -22,12 +22,12 @@ package org.apache.cayenne.modeler.ui.datasource;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.dbconnector.DBConnector;
 import org.apache.cayenne.modeler.dbconnector.DBConnectors;
 import org.apache.cayenne.modeler.pref.DataMapDefaults;
+import org.apache.cayenne.modeler.pref.GeneralPrefs;
 
 import javax.sql.DataSource;
 import javax.swing.*;
@@ -39,7 +39,6 @@ import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
-import java.util.prefs.Preferences;
 
 import static org.apache.cayenne.modeler.dbconnector.DBConnector.*;
 
@@ -87,8 +86,7 @@ public class DataSourceController extends ChildController<ProjectController> {
     }
 
     private void initFavouriteDataSource() {
-        final Preferences pref = getApplication().getPreferencesNode(GeneralPreferencesController.class, "");
-        final String favouriteDataSource = pref.get(GeneralPreferencesController.FAVOURITE_DATA_SOURCE, null);
+        String favouriteDataSource = GeneralPrefs.of().getFavouriteDataSource();
         if (favouriteDataSource != null && connectors.containsKey(favouriteDataSource)) {
             setDataSourceKey(favouriteDataSource);
             view.getDataSources().setSelectedItem(dataSourceKey);
@@ -184,8 +182,7 @@ public class DataSourceController extends ChildController<ProjectController> {
         this.canceled = canceled;
         view.dispose();
         if (!canceled) {
-            Preferences pref = getApplication().getPreferencesNode(GeneralPreferencesController.class, "");
-            pref.put(GeneralPreferencesController.FAVOURITE_DATA_SOURCE, dataSourceKey);
+            GeneralPrefs.of().setFavouriteDataSource(dataSourceKey);
         }
     }
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
index cd7fd619b..60cae6349 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
@@ -28,7 +28,6 @@ import org.apache.cayenne.modeler.ui.validation.ValidationController;
 import org.apache.cayenne.modeler.ui.datasource.DataSourceController;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.dbconnector.DBConnector;
-import org.apache.cayenne.modeler.pref.DBGeneratorDefaults;
 import org.apache.cayenne.modeler.util.DbAdapterInfo;
 import org.apache.cayenne.validation.ValidationResult;
 
@@ -50,7 +49,7 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
 
     protected DBConnector connectionInfo;
     protected Collection<DataMap> dataMaps;
-    protected DBGeneratorDefaults generatorDefaults;
+    protected DBGeneratorPrefs generatorDefaults;
     protected Collection<DbGenerator> generators;
     protected String textForSQL;
 
@@ -65,7 +64,7 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
         this.connectionInfo = new DBConnector();
         // DataSource may not be initialized, so warn connection wizard
         this.connectionInfo.setAllowDataSourceFailure(true);
-        this.generatorDefaults = new DBGeneratorDefaults(parent
+        this.generatorDefaults = DBGeneratorPrefs.of(parent
                 .getPreferences()
                 .node("DbGenerator"));
 
@@ -75,7 +74,7 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
 
         tables.updateTables(dataMaps);
         prepareGenerator();
-        generatorDefaults.configureGenerator(generators);
+        applyOptionsToGenerators();
         createSQL();
         refreshView();
     }
@@ -87,6 +86,8 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
 
     protected void initController() {
 
+        generatorDefaults.bind(view);
+
         DefaultComboBoxModel<String> adapterModel = new DefaultComboBoxModel<>(
                 DbAdapterInfo.getStandardAdapters());
         view.getAdapters().setModel(adapterModel);
@@ -99,11 +100,11 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
             refreshSQLAction();
         });
 
-        view.getCreateFK().addActionListener(e -> { generatorDefaults.setCreateFK(view.getCreateFK().isSelected()); refreshSQLAction(); });
-        view.getCreatePK().addActionListener(e -> { generatorDefaults.setCreatePK(view.getCreatePK().isSelected()); refreshSQLAction(); });
-        view.getCreateTables().addActionListener(e -> { generatorDefaults.setCreateTables(view.getCreateTables().isSelected()); refreshSQLAction(); });
-        view.getDropPK().addActionListener(e -> { generatorDefaults.setDropPK(view.getDropPK().isSelected()); refreshSQLAction(); });
-        view.getDropTables().addActionListener(e -> { generatorDefaults.setDropTables(view.getDropTables().isSelected()); refreshSQLAction(); });
+        view.getCreateFK().addActionListener(e -> refreshSQLAction());
+        view.getCreatePK().addActionListener(e -> refreshSQLAction());
+        view.getCreateTables().addActionListener(e -> refreshSQLAction());
+        view.getDropPK().addActionListener(e -> refreshSQLAction());
+        view.getDropTables().addActionListener(e -> refreshSQLAction());
 
         view.getGenerateButton().addActionListener(e -> generateSchemaAction());
         view.getSaveSqlButton().addActionListener(e -> storeSQLAction());
@@ -118,6 +119,21 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
         });
     }
 
+    private void applyOptionsToGenerators() {
+        boolean createFK = view.getCreateFK().isSelected();
+        boolean createPK = view.getCreatePK().isSelected();
+        boolean createTables = view.getCreateTables().isSelected();
+        boolean dropPK = view.getDropPK().isSelected();
+        boolean dropTables = view.getDropTables().isSelected();
+        for (DbGenerator generator : generators) {
+            generator.setShouldCreateFKConstraints(createFK);
+            generator.setShouldCreatePKSupport(createPK);
+            generator.setShouldCreateTables(createTables);
+            generator.setShouldDropPKSupport(dropPK);
+            generator.setShouldDropTables(dropTables);
+        }
+    }
+
     /**
      * Creates new internal DbGenerator instance.
      */
@@ -162,13 +178,6 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
 
     protected void refreshView() {
         view.setEnabled(connectionInfo != null);
-
-        view.getCreateFK().setSelected(generatorDefaults.createFK);
-        view.getCreatePK().setSelected(generatorDefaults.createPK);
-        view.getCreateTables().setSelected(generatorDefaults.createTables);
-        view.getDropPK().setSelected(generatorDefaults.dropPK);
-        view.getDropTables().setSelected(generatorDefaults.dropTables);
-
         view.getSql().setText(textForSQL);
     }
 
@@ -207,7 +216,7 @@ public class DBGeneratorOptionsController extends ChildController<ProjectControl
         }
         connectionInfo.setDbAdapter((String) view.getAdapters().getSelectedItem());
         prepareGenerator();
-        generatorDefaults.configureGenerator(generators);
+        applyOptionsToGenerators();
         createSQL();
         view.getSql().setText(textForSQL);
     }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java
new file mode 100644
index 000000000..8e16b4a94
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java
@@ -0,0 +1,67 @@
+/*****************************************************************
+ *   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.ui.dbgen;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.prefs.Preferences;
+
+/**
+ * Binds the DB Generator dialog's checkboxes to {@link Preferences}: seeds the
+ * checkboxes from prefs on {@link #bind} and writes them back when the dialog window
+ * closes. Holds no state of its own — the view is the source of truth while the dialog
+ * is open.
+ */
+public class DBGeneratorPrefs {
+
+    private static final String CREATE_FK_PROPERTY = "createFK";
+    private static final String CREATE_PK_PROPERTY = "createPK";
+    private static final String CREATE_TABLES_PROPERTY = "createTables";
+    private static final String DROP_PK_PROPERTY = "dropPK";
+    private static final String DROP_TABLES_PROPERTY = "dropTables";
+
+    private final Preferences prefs;
+
+    private DBGeneratorPrefs(Preferences prefs) {
+        this.prefs = prefs;
+    }
+
+    public static DBGeneratorPrefs of(Preferences prefs) {
+        return new DBGeneratorPrefs(prefs);
+    }
+
+    public void bind(DBGeneratorOptionsView view) {
+        view.getCreateFK().setSelected(prefs.getBoolean(CREATE_FK_PROPERTY, true));
+        view.getCreatePK().setSelected(prefs.getBoolean(CREATE_PK_PROPERTY, true));
+        view.getCreateTables().setSelected(prefs.getBoolean(CREATE_TABLES_PROPERTY, true));
+        view.getDropPK().setSelected(prefs.getBoolean(DROP_PK_PROPERTY, false));
+        view.getDropTables().setSelected(prefs.getBoolean(DROP_TABLES_PROPERTY, false));
+
+        view.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosed(WindowEvent e) {
+                prefs.putBoolean(CREATE_FK_PROPERTY, view.getCreateFK().isSelected());
+                prefs.putBoolean(CREATE_PK_PROPERTY, view.getCreatePK().isSelected());
+                prefs.putBoolean(CREATE_TABLES_PROPERTY, view.getCreateTables().isSelected());
+                prefs.putBoolean(DROP_PK_PROPERTY, view.getDropPK().isSelected());
+                prefs.putBoolean(DROP_TABLES_PROPERTY, view.getDropTables().isSelected());
+            }
+        });
+    }
+}
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 324bde4b5..eb1eace2d 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
@@ -31,11 +31,11 @@ import java.awt.*;
 public class PreferenceDialogController extends ChildController<RootController> {
 
     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 DATA_SOURCES_KEY = "DataSources";
+    private static final String CLASSPATH_KEY = "Classpath";
 
     private static final String[] preferenceMenus = new String[]{
-            GENERAL_KEY, DATA_SOURCES_KEY, CLASS_PATH_KEY
+            GENERAL_KEY, DATA_SOURCES_KEY, CLASSPATH_KEY
     };
 
     private final PreferenceDialogView view;
@@ -73,7 +73,7 @@ public class PreferenceDialogController extends ChildController<RootController>
         view.getDetailPanel().add(dataSourcePrefsController.getView(), DATA_SOURCES_KEY);
 
         this.classpathPrefsController = new ClasspathPreferencesController(this);
-        view.getDetailPanel().add(classpathPrefsController.getView(), CLASS_PATH_KEY);
+        view.getDetailPanel().add(classpathPrefsController.getView(), CLASSPATH_KEY);
     }
 
     public void updateSelection() {
@@ -90,6 +90,7 @@ public class PreferenceDialogController extends ChildController<RootController>
 
     private void savePreferencesAction() {
         dataSourcePrefsController.commit();
+        generalPrefsController.commit();
         context.save();
         view.dispose();
     }
@@ -99,7 +100,7 @@ public class PreferenceDialogController extends ChildController<RootController>
     }
 
     public void showClassPathEditorAction() {
-        doShow(CLASS_PATH_KEY, classpathPrefsController);
+        doShow(CLASSPATH_KEY, classpathPrefsController);
     }
 
     public void showDataSourceEditorAction(Object dataSourceKey) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
index 7f7c05b51..a64f27543 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
@@ -20,73 +20,42 @@
 package org.apache.cayenne.modeler.ui.preferences.general;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.pref.GeneralPrefs;
 import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
-import org.apache.cayenne.util.Util;
 
 import javax.swing.*;
 import java.awt.*;
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Vector;
-import java.util.prefs.Preferences;
+import java.util.List;
 
 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 static final String[] STANDARD_ENCODINGS = {
+            "ISO-8859-1", "US-ASCII", "UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE"
+    };
 
     private final GeneralPreferencesView view;
     private final String systemEncoding;
-    private final Preferences preferences;
-
-    private boolean autoLoadProjectPreference;
-    private String encoding;
-    private boolean defaultEncoding;
-    private boolean deletePromptPreference;
+    private final String defaultLabel;
 
     public GeneralPreferencesController(PreferenceDialogController parent) {
         super(parent);
 
-        this.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);
-
+        GeneralPrefs prefs = GeneralPrefs.of();
         this.systemEncoding = detectPlatformEncoding();
+        this.defaultLabel = systemEncoding + " (default)";
 
         this.view = new GeneralPreferencesView();
-        this.view.setEnabled(true);
-
-        Vector allEncodings = supportedEncodings(systemEncoding);
-        view.getEncodingChoices().setModel(new DefaultComboBoxModel(allEncodings));
-        view.getDefaultEncodingLabel().setText("Default (" + systemEncoding + ")");
-        view.getDefaultEncoding().setSelected(true);
-
-        view.getDefaultEncoding().addActionListener(e -> setDefaultEncoding(view.getDefaultEncoding().isSelected()));
-        view.getOtherEncoding().addActionListener(e -> setDefaultEncoding(!view.getOtherEncoding().isSelected()));
-        view.getEncodingChoices().addActionListener(e -> {
-            Object sel = view.getEncodingChoices().getSelectedItem();
-            setEncoding(sel != null ? sel.toString() : null);
-        });
-
-        setSelectedEncoding(encoding);
-
-        this.view.getAutoLoadProject().addActionListener(e -> setAutoLoadProject(view.getAutoLoadProject().isSelected()));
-        this.view.getDeletePrompt().addActionListener(e -> setDeletePrompt(view.getDeletePrompt().isSelected()));
-        this.view.getAutoLoadProject().setSelected(autoLoadProjectPreference);
-        this.view.getDeletePrompt().setSelected(deletePromptPreference);
+
+        view.getEncodingChoices().setModel(new DefaultComboBoxModel<>(supportedEncodings()));
+        selectEncoding(prefs.getEncoding());
+        view.getAutoLoadProject().setSelected(prefs.isAutoLoadProject());
+
+        // Note how the meaning of the preference is the opposite of the checkbox
+        view.getNoDeletePrompt().setSelected(!prefs.isDeletePrompt());
     }
 
     @Override
@@ -94,96 +63,41 @@ public class GeneralPreferencesController extends ChildController<PreferenceDial
         return view;
     }
 
-    public String getEncoding() {
-        return encoding;
-    }
+    public void commit() {
+        GeneralPrefs prefs = GeneralPrefs.of();
 
-    public void setEncoding(String encoding) {
-        if (!Util.nullSafeEquals(this.encoding, encoding)) {
-            addChangedPreferences(ENCODING_PREFERENCE, encoding);
-            this.encoding = encoding;
-        }
+        Object selected = view.getEncodingChoices().getSelectedItem();
+        String encoding = (selected == null || defaultLabel.equals(selected)) ? systemEncoding : selected.toString();
+
+        prefs.setEncoding(encoding);
+        prefs.setAutoLoadProject(view.getAutoLoadProject().isSelected());
+        prefs.setDeletePrompt(!view.getNoDeletePrompt().isSelected());
     }
 
     /**
      * Returns default encoding on the current platform.
      */
     protected String detectPlatformEncoding() {
-        // this info is private until 1.5, so have to hack it...
         return new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding();
     }
 
     /**
-     * Returns an array of charsets that all JVMs must support cross-platform combined
-     * with a default platform charset. See Javadocs for java.nio.charset.Charset for the
-     * list of "standard" charsets.
+     * Returns charsets that all JVMs must support cross-platform, with the platform
+     * default placed first and labeled. See java.nio.charset.Charset for the list of
+     * "standard" charsets.
      */
-    protected Vector supportedEncodings(String platformEncoding) {
-        String[] defaultCharsets = new String[] {
-                "US-ASCII", "ISO-8859-1", "UTF-8", "UTF-16BE", "UTF-16LE", "UTF-16"
-        };
-
-        Vector charsets = new Vector(Arrays.asList(defaultCharsets));
-        if (!charsets.contains(platformEncoding)) {
-            charsets.add(platformEncoding);
-        }
-
-        Collections.sort(charsets);
-        return charsets;
-    }
-
-    private void setSelectedEncoding(String encoding) {
-        this.encoding = encoding;
-        this.defaultEncoding = encoding == null || encoding.equals(systemEncoding);
-
-        view.getEncodingChoices().setSelectedItem(encoding);
-        view.getDefaultEncoding().setSelected(defaultEncoding);
-        view.getOtherEncoding().setSelected(!defaultEncoding);
-        view.getEncodingChoices().setEnabled(!defaultEncoding);
-        view.getDefaultEncodingLabel().setEnabled(defaultEncoding);
-    }
-
-    private void setDefaultEncoding(boolean b) {
-        if (b != defaultEncoding) {
-            this.defaultEncoding = b;
-
-            if (b) {
-                setEncoding(systemEncoding);
-                view.getEncodingChoices().setEnabled(false);
-                view.getDefaultEncodingLabel().setEnabled(true);
-            }
-            else {
-                view.getEncodingChoices().setEnabled(true);
-                view.getDefaultEncodingLabel().setEnabled(false);
-            }
-        }
-    }
-
-    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.getContext().getChangedBooleanPreferences().get(preferences);
-        if (map == null) {
-            map = new HashMap<>();
-        }
-        map.put(key, value);
-        parent.getContext().getChangedBooleanPreferences().put(preferences, map);
+    private String[] supportedEncodings() {
+        List<String> charsets = new ArrayList<>(Arrays.asList(STANDARD_ENCODINGS));
+        charsets.remove(systemEncoding);
+        charsets.add(0, defaultLabel);
+        return charsets.toArray(new String[0]);
     }
 
-    public void addChangedPreferences(String key, String value) {
-        Map<String, String> map = parent.getContext().getChangedPreferences().get(preferences);
-        if (map == null) {
-            map = new HashMap<>();
+    private void selectEncoding(String encoding) {
+        if (encoding == null || encoding.isEmpty() || encoding.equals(systemEncoding)) {
+            view.getEncodingChoices().setSelectedItem(defaultLabel);
+        } else {
+            view.getEncodingChoices().setSelectedItem(encoding);
         }
-        map.put(key, value);
-        parent.getContext().getChangedPreferences().put(preferences, map);
     }
 }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
index 6106f2e90..490de650b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
@@ -19,7 +19,6 @@
 
 package org.apache.cayenne.modeler.ui.preferences.general;
 
-import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
@@ -30,86 +29,47 @@ import java.awt.*;
 
 public class GeneralPreferencesView extends JPanel {
 
-    private final JRadioButton defaultEncoding;
-    private final JRadioButton otherEncoding;
-    private final JComboBox encodingChoices;
-    private final JLabel defaultEncodingLabel;
-    private final JPanel encodingSelector;
-    private final JLabel encodingSelectorLabel;
-    private final JCheckBox autoLoadProjectBox;
-    private final JCheckBox deletePromptBox;
+    private final JComboBox<String> encodingChoices;
+    private final JCheckBox autoLoadProject;
+    private final JCheckBox noDeletePrompt;
 
     public GeneralPreferencesView() {
-        this.defaultEncoding = new JRadioButton();
-        this.otherEncoding = new JRadioButton();
-        this.encodingChoices = new JComboBox();
-        this.defaultEncodingLabel = new JLabel();
-
-        ButtonGroup group = new ButtonGroup();
-        group.add(defaultEncoding);
-        group.add(otherEncoding);
-
-        FormLayout encodingLayout = new FormLayout("pref, 3dlu, pref", "");
-        DefaultFormBuilder encodingBuilder = new DefaultFormBuilder(encodingLayout);
-        encodingBuilder.append(defaultEncoding, defaultEncodingLabel);
-        encodingBuilder.append(otherEncoding, encodingChoices);
-        this.encodingSelector = encodingBuilder.getPanel();
-
-        this.encodingSelectorLabel = new JLabel("File Encoding:");
-        this.autoLoadProjectBox = new JCheckBox("Automatically Load Last Opened Project");
-        this.deletePromptBox = new JCheckBox("Always Delete Items Without Prompt");
+        this.encodingChoices = new JComboBox<>();
+        JLabel encodingSelectorLabel = new JLabel("File Encoding:");
+        JLabel autoLoadProjectLabel = new JLabel("Auto-Load Last Project:");
+        JLabel noDeletePromptLabel = new JLabel("Delete Without Prompt:");
+        this.autoLoadProject = new JCheckBox();
+        this.noDeletePrompt = new JCheckBox();
 
         FormLayout layout = new FormLayout(
-                "right:pref, 3dlu, 30dlu, 3dlu, fill:70dlu",
-                "p, 3dlu, p, 12dlu, p, 30dlu, p, 12dlu, p, 3dlu, p, fill:40dlu:grow");
+                "right:pref, 3dlu, fill:120dlu",
+                "p, 3dlu, p, 12dlu, p, 3dlu, p, fill:40dlu:grow");
 
         CellConstraints cc = new CellConstraints();
         PanelBuilder builder = new PanelBuilder(layout);
         builder.setDefaultDialogBorder();
-        builder.addSeparator("General Preferences", cc.xyw(1, 1, 5));
-
-        builder.add(encodingSelectorLabel, cc.xy(1, 5));
-        builder.add(encodingSelector, cc.xywh(3, 5, 3, 3));
-        builder.add(autoLoadProjectBox, cc.xy(1, 7, CellConstraints.LEFT, CellConstraints.DEFAULT));
+        builder.addSeparator("General Preferences", cc.xyw(1, 1, 3));
 
-        builder.addSeparator("Editor Preferences", cc.xyw(1, 9, 5));
-        builder.add(deletePromptBox, cc.xy(1, 11, CellConstraints.LEFT, CellConstraints.DEFAULT));
+        builder.add(encodingSelectorLabel, cc.xy(1, 3));
+        builder.add(encodingChoices, cc.xy(3, 3));
+        builder.add(autoLoadProjectLabel, cc.xy(1, 5));
+        builder.add(autoLoadProject, cc.xy(3, 5, CellConstraints.LEFT, CellConstraints.DEFAULT));
+        builder.add(noDeletePromptLabel, cc.xy(1, 7));
+        builder.add(noDeletePrompt, cc.xy(3, 7, CellConstraints.LEFT, CellConstraints.DEFAULT));
 
         this.setLayout(new BorderLayout());
         this.add(builder.getPanel(), BorderLayout.CENTER);
     }
 
-    @Override
-    public void setEnabled(boolean b) {
-        super.setEnabled(b);
-
-        encodingSelector.setEnabled(b);
-        encodingSelectorLabel.setEnabled(b);
-        autoLoadProjectBox.setEnabled(b);
-        deletePromptBox.setEnabled(b);
-    }
-
-    public JRadioButton getDefaultEncoding() {
-        return defaultEncoding;
-    }
-
-    public JLabel getDefaultEncodingLabel() {
-        return defaultEncodingLabel;
-    }
-
-    public JComboBox getEncodingChoices() {
+    public JComboBox<String> getEncodingChoices() {
         return encodingChoices;
     }
 
-    public JRadioButton getOtherEncoding() {
-        return otherEncoding;
-    }
-
     public JCheckBox getAutoLoadProject() {
-        return autoLoadProjectBox;
+        return autoLoadProject;
     }
 
-    public JCheckBox getDeletePrompt() {
-        return deletePromptBox;
+    public JCheckBox getNoDeletePrompt() {
+        return noDeletePrompt;
     }
 }
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
index 4b1a9c2dd..a2aa4217c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
@@ -41,7 +41,6 @@ import org.apache.cayenne.modeler.event.model.*;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.pref.DataMapDefaults;
 import org.apache.cayenne.modeler.pref.DataNodeDefaults;
-import org.apache.cayenne.modeler.pref.ProjectPrefs;
 import org.apache.cayenne.modeler.service.action.GlobalActions;
 import org.apache.cayenne.modeler.ui.ModelerController;
 import org.apache.cayenne.modeler.ui.action.RevertAction;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectPrefs.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectPrefs.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectPrefs.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectPrefs.java
index 54ec6213c..5cbc9ee26 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectPrefs.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectPrefs.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.pref;
+package org.apache.cayenne.modeler.ui.project;
 
 import org.apache.cayenne.configuration.ConfigurationNode;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
@@ -52,7 +52,6 @@ import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
 import org.apache.cayenne.modeler.event.display.ProcedureDisplayEvent;
 import org.apache.cayenne.modeler.event.display.ProcedureParameterDisplayEvent;
 import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
-import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.util.CayenneMapEntry;
 
 import java.util.ArrayList;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java
index ed94ea84d..4f027514b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java
@@ -27,14 +27,13 @@ import org.apache.cayenne.gen.ClassGenerationAction;
 import org.apache.cayenne.gen.ClassGenerationActionFactory;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
+import org.apache.cayenne.modeler.pref.GeneralPrefs;
 import org.apache.cayenne.modeler.project.CgenOps;
-import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.editor.datadomain.DataDomainGeneratorsViewController;
 import org.apache.cayenne.tools.ToolsInjectorBuilder;
 
 import java.util.Set;
-import java.util.prefs.Preferences;
 
 public class DataDomainCgenController extends DataDomainGeneratorsViewController<CgenConfiguration> {
 
@@ -88,10 +87,7 @@ public class DataDomainCgenController extends DataDomainGeneratorsViewController
         CgenConfiguration cgenConfiguration = new CgenConfiguration();
         cgenConfiguration.setDataMap(dataMap);
         cgenConfiguration.updateOutputPath(CgenOps.baseDir(controller.getApplication()));
-        Preferences preferences = controller.getApplication().getPreferencesNode(GeneralPreferencesController.class, "");
-        if (preferences != null) {
-            cgenConfiguration.setEncoding(preferences.get(GeneralPreferencesController.ENCODING_PREFERENCE, null));
-        }
+        cgenConfiguration.setEncoding(GeneralPrefs.of().getEncoding());
 
         cgenConfiguration.resolveExcludedEntities();
         cgenConfiguration.resolveExcludedEmbeddables();
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
index d527fa0c9..06f5536de 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
@@ -41,8 +41,8 @@ import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
 import org.apache.cayenne.modeler.event.model.ObjEntityListener;
 import org.apache.cayenne.modeler.event.model.ProjectAfterSaveEvent;
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.pref.GeneralPrefs;
 import org.apache.cayenne.modeler.project.CgenOps;
-import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportController;
 import org.apache.cayenne.tools.ToolsInjectorBuilder;
@@ -56,7 +56,6 @@ import java.util.Comparator;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.function.Predicate;
-import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 
 /**
@@ -304,10 +303,7 @@ public class CgenController extends ChildController<ProjectController> implement
             configuration.setRootPath(Utils.getRootPathForDataMap(map));
             configuration.updateOutputPath(basePath);
         }
-        Preferences preferences = application.getPreferencesNode(GeneralPreferencesController.class, "");
-        if (preferences != null) {
-            configuration.setEncoding(preferences.get(GeneralPreferencesController.ENCODING_PREFERENCE, null));
-        }
+        configuration.setEncoding(GeneralPrefs.of().getEncoding());
         return configuration;
     }