This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new d10c084d3 Prefs reorg
d10c084d3 is described below
commit d10c084d38f4824c8ded927ed8193035d4474cd0
Author: Andrus Adamchik <[email protected]>
AuthorDate: Wed May 20 10:34:25 2026 -0400
Prefs reorg
---
.../main/java/org/apache/cayenne/modeler/Application.java | 8 ++++----
.../org/apache/cayenne/modeler/dbconnector/DBConnectors.java | 2 +-
.../pref/{PreferencesCopier.java => PrefsCopier.java} | 6 +++---
.../{PreferencesJsonExporter.java => PrefsExporter.java} | 4 ++--
.../java/org/apache/cayenne/modeler/pref/PrefsLocator.java | 12 +-----------
.../java/org/apache/cayenne/modeler/pref/PrefsManager.java | 2 +-
.../{toolkit/table => pref/adapters}/CMTablePrefs.java | 3 ++-
.../cayenne/modeler/pref/{ => adapters}/ClasspathPrefs.java | 3 ++-
.../adapters/ComponentGeometryPrefs.java} | 6 +++---
.../modeler/pref/{ => adapters}/DBConnectorPrefs.java | 3 ++-
.../{ui/dbgen => pref/adapters}/DBGeneratorPrefs.java | 2 +-
.../cayenne/modeler/pref/{ => adapters}/DataMapPrefs.java | 3 ++-
.../cayenne/modeler/pref/{ => adapters}/DataNodePrefs.java | 7 +++++--
.../adapters/FileChooserPrefs.java} | 6 +++---
.../cayenne/modeler/pref/{ => adapters}/GeneralPrefs.java | 4 +++-
.../{ui/logconsole => pref/adapters}/LogConsolePrefs.java | 2 +-
.../modeler/{project => pref/adapters}/ProjectPrefs.java | 3 ++-
.../modeler/pref/{ => adapters}/RecentProjectsPrefs.java | 3 ++-
.../adapters/SplitPanePrefs.java} | 6 +++---
.../pref/migration/toV5/_1_DbConnectorsMigration.java | 4 ++--
.../modeler/pref/migration/toV5/_2_ClasspathMigration.java | 2 +-
.../pref/migration/toV5/_3_GeneralPrefsMigration.java | 2 +-
.../pref/migration/toV5/_4_RecentProjectsMigration.java | 6 +++---
.../org/apache/cayenne/modeler/project/ProjectSession.java | 1 +
.../main/java/org/apache/cayenne/modeler/ui/MainFrame.java | 12 ++++++------
.../main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java | 2 +-
.../cayenne/modeler/ui/action/DBConnectionAwareAction.java | 2 +-
.../cayenne/modeler/ui/action/ImportDataMapAction.java | 4 ++--
.../cayenne/modeler/ui/action/ImportEOModelAction.java | 4 ++--
.../org/apache/cayenne/modeler/ui/action/ProjectOpener.java | 2 +-
.../cayenne/modeler/ui/action/ShowLogConsoleAction.java | 2 +-
.../modeler/ui/confirmremove/ConfirmRemoveDialog.java | 2 +-
.../cayenne/modeler/ui/datasource/DataSourceDialog.java | 4 ++--
.../cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java | 1 +
.../modeler/ui/dbrelationship/DbRelationshipDialog.java | 2 +-
.../org/apache/cayenne/modeler/ui/logconsole/LogConsole.java | 1 +
.../ui/preferences/classpath/ClasspathPrefsPanel.java | 6 +++---
.../modeler/ui/preferences/general/GeneralPrefsPanel.java | 2 +-
.../cayenne/modeler/ui/preferences/more/MorePrefsPanel.java | 3 ++-
.../org/apache/cayenne/modeler/ui/project/ProjectView.java | 4 ++--
.../ui/project/editor/datadomain/cgen/DataDomainCgenTab.java | 2 +-
.../modeler/ui/project/editor/datamap/cgen/CgenPanel.java | 2 +-
.../editor/datamap/cgen/templateeditor/TemplateEditor.java | 8 ++++----
.../ui/project/editor/datamap/main/DataMapMainView.java | 2 +-
.../ui/project/editor/datanode/DataNodeEditorPanel.java | 2 +-
.../ui/project/editor/datanode/jdbc/JDBCDataSourcePanel.java | 2 +-
.../project/editor/dbentity/properties/DbAttributePanel.java | 2 +-
.../editor/dbentity/properties/DbEntityPropertiesView.java | 4 ++--
.../editor/dbentity/properties/DbRelationshipPanel.java | 2 +-
.../embeddable/attributes/EmbeddableAttributesView.java | 2 +-
.../editor/objentity/attrinfo/ObjAttributeInfoDialog.java | 2 +-
.../editor/objentity/callbacks/ObjEntityCallbacksView.java | 2 +-
.../editor/objentity/properties/ObjAttributePanel.java | 2 +-
.../editor/objentity/properties/ObjEntityPropertiesView.java | 4 ++--
.../editor/objentity/properties/ObjRelationshipPanel.java | 2 +-
.../ui/project/editor/procedure/ProcedureParameterTab.java | 2 +-
.../editor/query/selectquery/SelectQueryOrderingTab.java | 4 ++--
.../editor/query/sqltemplate/SQLTemplatePrefetchTab.java | 4 ++--
.../ui/project/validator/ValidationDisplayHandler.java | 2 +-
.../org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java | 2 +-
60 files changed, 106 insertions(+), 101 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 1b9f62636..a2ece0876 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
@@ -31,12 +31,12 @@ import org.apache.cayenne.di.Injector;
import org.apache.cayenne.modeler.dbconnector.DBConnectors;
import org.apache.cayenne.modeler.log.ModelerLogFactory;
import org.apache.cayenne.modeler.platform.UIInitializer;
-import org.apache.cayenne.modeler.pref.ClasspathPrefs;
-import org.apache.cayenne.modeler.pref.DBConnectorPrefs;
-import org.apache.cayenne.modeler.pref.GeneralPrefs;
+import org.apache.cayenne.modeler.pref.adapters.ClasspathPrefs;
+import org.apache.cayenne.modeler.pref.adapters.DBConnectorPrefs;
+import org.apache.cayenne.modeler.pref.adapters.GeneralPrefs;
import org.apache.cayenne.modeler.pref.PrefsLocator;
import org.apache.cayenne.modeler.pref.PrefsManager;
-import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
+import org.apache.cayenne.modeler.pref.adapters.RecentProjectsPrefs;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
import
org.apache.cayenne.modeler.service.validator.ConfigurableProjectValidator;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectors.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectors.java
index 4b0fc8a0d..57534ea5a 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectors.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectors.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler.dbconnector;
-import org.apache.cayenne.modeler.pref.DBConnectorPrefs;
+import org.apache.cayenne.modeler.pref.adapters.DBConnectorPrefs;
import java.util.ArrayList;
import java.util.Collections;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesCopier.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java
similarity index 96%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesCopier.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java
index b22165cc1..df5707f91 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesCopier.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java
@@ -27,11 +27,11 @@ import java.util.prefs.Preferences;
/**
* Recursive {@link Preferences} subtree copy and move helpers.
*/
-public final class PreferencesCopier {
+public final class PrefsCopier {
- private static final Logger LOGGER =
LoggerFactory.getLogger(PreferencesCopier.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(PrefsCopier.class);
- private PreferencesCopier() {
+ private PrefsCopier() {
}
/**
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesJsonExporter.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java
similarity index 98%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesJsonExporter.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java
index 9091ce47a..dbf1c39d7 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesJsonExporter.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java
@@ -26,9 +26,9 @@ import java.util.Arrays;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
-class PreferencesJsonExporter {
+public class PrefsExporter {
- private static final Logger LOGGER =
LoggerFactory.getLogger(PreferencesJsonExporter.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(PrefsExporter.class);
public static String exportAsJson(Preferences node) {
StringBuilder sb = new StringBuilder();
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java
index 693cdee77..a466ddf40 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.pref;
import java.util.prefs.Preferences;
/**
- * Resolves preference nodes against the common root.
+ * Resolves common types of preference nodes against the common root.
*/
public final class PrefsLocator {
@@ -91,14 +91,4 @@ public final class PrefsLocator {
public Preferences handshakeNode(String nonce) {
return root.node(HANDSHAKE_ROOT).node(nonce);
}
-
- /**
- * Serializes the entire Modeler preferences subtree ({@link
#modelerRoot()})
- * as a pretty-printed JSON string. Each {@link Preferences} node becomes
a JSON
- * object whose own keys map to string values and whose child node names
map to
- * nested objects.
- */
- public String exportAsJson() {
- return PreferencesJsonExporter.exportAsJson(modelerRoot());
- }
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java
index 31a7935f3..2c6ca9985 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java
@@ -330,7 +330,7 @@ public class PrefsManager {
}
private static void relocate(Function<String, Preferences> nodeForId,
String oldId, String newId) {
- PreferencesCopier.move(nodeForId.apply(oldId), nodeForId.apply(newId));
+ PrefsCopier.move(nodeForId.apply(oldId), nodeForId.apply(newId));
}
private static String projectPath(Project project) {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java
similarity index 98%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java
index 4b99da40b..7d23c14e4 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.toolkit.table;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
+import org.apache.cayenne.modeler.toolkit.table.CMTable;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ListSelectionEvent;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ClasspathPrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java
similarity index 96%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ClasspathPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java
index bf306c360..c514f3513 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ClasspathPrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java
@@ -17,8 +17,9 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.pref;
+package org.apache.cayenne.modeler.pref.adapters;
+import org.apache.cayenne.modeler.pref.PreferenceAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/component/CMComponentGeometryPrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java
similarity index 94%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/component/CMComponentGeometryPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java
index bfcb914b0..6acf954a6 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/component/CMComponentGeometryPrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.toolkit.component;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
@@ -26,14 +26,14 @@ import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.util.prefs.Preferences;
-public final class CMComponentGeometryPrefs extends PreferenceAdapter {
+public final class ComponentGeometryPrefs extends PreferenceAdapter {
private static final String HEIGHT_PROPERTY = "height";
private static final String WIDTH_PROPERTY = "width";
private static final String X_PROPERTY = "x";
private static final String Y_PROPERTY = "y";
- public CMComponentGeometryPrefs(Preferences prefs) {
+ public ComponentGeometryPrefs(Preferences prefs) {
super(prefs);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectorPrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorPrefs.java
similarity index 97%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectorPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorPrefs.java
index 3c4adde9f..4259f3729 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectorPrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorPrefs.java
@@ -17,11 +17,12 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.pref;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.modeler.dbconnector.DBConnector;
import org.apache.cayenne.modeler.dbconnector.DBConnectors;
+import org.apache.cayenne.modeler.pref.PreferenceAdapter;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
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/pref/adapters/DBGeneratorPrefs.java
similarity index 98%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBGeneratorPrefs.java
index db7c7b27a..699fef1f0 100644
---
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/pref/adapters/DBGeneratorPrefs.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.dbgen;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapPrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java
similarity index 97%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java
index 4f9b7c955..83926e8c4 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataMapPrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataMapPrefs.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.pref;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.modeler.dbconnector.DBConnector;
+import org.apache.cayenne.modeler.pref.PreferenceAdapter;
import java.util.prefs.Preferences;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataNodePrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataNodePrefs.java
similarity index 90%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataNodePrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataNodePrefs.java
index 79c00d94f..b3b449e79 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DataNodePrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DataNodePrefs.java
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.pref;
+package org.apache.cayenne.modeler.pref.adapters;
+
+import org.apache.cayenne.modeler.pref.PreferenceAdapter;
+import org.apache.cayenne.modeler.pref.PrefsCopier;
import java.util.prefs.Preferences;
@@ -36,7 +39,7 @@ public final class DataNodePrefs extends PreferenceAdapter {
DataNodePrefs renamed = new DataNodePrefs(newPrefs);
// TODO: is this the correct behavior? In the DataMapPrefs we are
doing "copy", not "move" to handle reverts
- PreferencesCopier.move(prefs, renamed.prefs);
+ PrefsCopier.move(prefs, renamed.prefs);
return renamed;
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserPrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java
similarity index 92%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java
index 53017e727..119ea52d4 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/filechooser/CMFileChooserPrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/FileChooserPrefs.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.toolkit.filechooser;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
@@ -25,11 +25,11 @@ import javax.swing.JFileChooser;
import java.io.File;
import java.util.prefs.Preferences;
-public final class CMFileChooserPrefs extends PreferenceAdapter {
+public final class FileChooserPrefs extends PreferenceAdapter {
private static final String PATH_PROPERTY = "path";
- public CMFileChooserPrefs(Preferences prefs) {
+ public FileChooserPrefs(Preferences prefs) {
super(prefs);
}
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/adapters/GeneralPrefs.java
similarity index 95%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/GeneralPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/GeneralPrefs.java
index dc3eb10f8..95b58f99d 100644
---
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/adapters/GeneralPrefs.java
@@ -17,7 +17,9 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.pref;
+package org.apache.cayenne.modeler.pref.adapters;
+
+import org.apache.cayenne.modeler.pref.PreferenceAdapter;
import java.util.prefs.Preferences;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsolePrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java
similarity index 97%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsolePrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java
index 42e63f0dc..3e371264b 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsolePrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/LogConsolePrefs.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.logconsole;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectPrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java
similarity index 99%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java
index 52724664b..b9da3f04e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectPrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ProjectPrefs.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.project;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.DataChannelDescriptor;
@@ -53,6 +53,7 @@ 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.pref.PreferenceAdapter;
+import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.util.CayenneMapEntry;
import java.util.ArrayList;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/RecentProjectsPrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java
similarity index 96%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/RecentProjectsPrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java
index 3e78898b0..924211b40 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/RecentProjectsPrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/RecentProjectsPrefs.java
@@ -17,8 +17,9 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.pref;
+package org.apache.cayenne.modeler.pref.adapters;
+import org.apache.cayenne.modeler.pref.PreferenceAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/splitpane/CMSplitPanePrefs.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java
similarity index 91%
rename from
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/splitpane/CMSplitPanePrefs.java
rename to
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java
index de53da223..30bb7bb6d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/splitpane/CMSplitPanePrefs.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/SplitPanePrefs.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.toolkit.splitpane;
+package org.apache.cayenne.modeler.pref.adapters;
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
@@ -25,11 +25,11 @@ import javax.swing.*;
import java.beans.PropertyChangeListener;
import java.util.prefs.Preferences;
-public final class CMSplitPanePrefs extends PreferenceAdapter {
+public final class SplitPanePrefs extends PreferenceAdapter {
private PropertyChangeListener listener;
- public CMSplitPanePrefs(Preferences prefs) {
+ public SplitPanePrefs(Preferences prefs) {
super(prefs);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java
index 5aa0bf1f2..2cf8bc67e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_1_DbConnectorsMigration.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler.pref.migration.toV5;
import org.apache.cayenne.modeler.pref.PreferenceMigration;
-import org.apache.cayenne.modeler.pref.PreferencesCopier;
+import org.apache.cayenne.modeler.pref.PrefsCopier;
import org.apache.cayenne.modeler.pref.PrefsLocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,6 +57,6 @@ public class _1_DbConnectorsMigration implements
PreferenceMigration {
}
Preferences target = locator.appNode("dbConnectors");
- PreferencesCopier.copy(legacy, target);
+ PrefsCopier.copy(legacy, target);
}
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java
index 5ffe91621..126add458 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_2_ClasspathMigration.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.modeler.pref.migration.toV5;
-import org.apache.cayenne.modeler.pref.ClasspathPrefs;
+import org.apache.cayenne.modeler.pref.adapters.ClasspathPrefs;
import org.apache.cayenne.modeler.pref.PreferenceMigration;
import org.apache.cayenne.modeler.pref.PrefsLocator;
import org.slf4j.Logger;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java
index de337e68b..c97128857 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_3_GeneralPrefsMigration.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.modeler.pref.migration.toV5;
-import org.apache.cayenne.modeler.pref.GeneralPrefs;
+import org.apache.cayenne.modeler.pref.adapters.GeneralPrefs;
import org.apache.cayenne.modeler.pref.PreferenceMigration;
import org.apache.cayenne.modeler.pref.PrefsLocator;
import org.slf4j.Logger;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java
index 902015893..7c0498f40 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_4_RecentProjectsMigration.java
@@ -19,9 +19,9 @@
package org.apache.cayenne.modeler.pref.migration.toV5;
import org.apache.cayenne.modeler.pref.PreferenceMigration;
-import org.apache.cayenne.modeler.pref.PreferencesCopier;
+import org.apache.cayenne.modeler.pref.PrefsCopier;
import org.apache.cayenne.modeler.pref.PrefsLocator;
-import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
+import org.apache.cayenne.modeler.pref.adapters.RecentProjectsPrefs;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,6 +59,6 @@ public class _4_RecentProjectsMigration implements
PreferenceMigration {
}
Preferences target = locator.appNode(RecentProjectsPrefs.NODE);
- PreferencesCopier.copy(legacy, target);
+ PrefsCopier.copy(legacy, target);
}
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java
index c3b6494b2..eb1a253a4 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectSession.java
@@ -38,6 +38,7 @@ import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.event.display.*;
import org.apache.cayenne.modeler.event.model.*;
+import org.apache.cayenne.modeler.pref.adapters.ProjectPrefs;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import
org.apache.cayenne.modeler.ui.project.editor.objentity.callbacks.CallbackType;
import
org.apache.cayenne.modeler.ui.project.editor.objentity.callbacks.ObjCallbackMethod;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
index 4d30c5998..cd9322d03 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
@@ -22,14 +22,14 @@ package org.apache.cayenne.modeler.ui;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.mcp.McpHandshakeWriter;
-import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
+import org.apache.cayenne.modeler.pref.adapters.RecentProjectsPrefs;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.service.os.OperatingSystem;
import org.apache.cayenne.modeler.toolkit.AppFrame;
import org.apache.cayenne.modeler.toolkit.border.TopBorder;
-import org.apache.cayenne.modeler.toolkit.component.CMComponentGeometryPrefs;
+import org.apache.cayenne.modeler.pref.adapters.ComponentGeometryPrefs;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
-import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
+import org.apache.cayenne.modeler.pref.adapters.SplitPanePrefs;
import org.apache.cayenne.modeler.ui.action.ExitAction;
import org.apache.cayenne.modeler.ui.action.OpenProjectAction;
import org.apache.cayenne.modeler.ui.action.RevertAction;
@@ -86,7 +86,7 @@ public class MainFrame extends AppFrame {
private final ProjectSession session;
private final JSplitPane splitPane;
- private final CMSplitPanePrefs splitPanePrefs;
+ private final SplitPanePrefs splitPanePrefs;
private final JLabel status;
private final WelcomeScreen welcomePanel;
private final MainMenuBar menuBar;
@@ -114,7 +114,7 @@ public class MainFrame extends AppFrame {
splitPane.getInsets().right = 5;
splitPane.setResizeWeight(0.7);
- this.splitPanePrefs = new
CMSplitPanePrefs(app.getPrefsManager().uiNode("frame/splitPane"));
+ this.splitPanePrefs = new
SplitPanePrefs(app.getPrefsManager().uiNode("frame/splitPane"));
JPanel statusBar = new JPanel(new FlowLayout(FlowLayout.LEFT, 3, 1));
statusBar.setBorder(TopBorder.create());
@@ -238,7 +238,7 @@ public class MainFrame extends AppFrame {
}
});
- new
CMComponentGeometryPrefs(app.getPrefsManager().uiNode("frame/geometry")).bind(this,
1200, 720);
+ new
ComponentGeometryPrefs(app.getPrefsManager().uiNode("frame/geometry")).bind(this,
1200, 720);
setVisible(true);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java
index 03d66a625..cd031645d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainMenuBar.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.ui;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.event.model.RecentFileListener;
-import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
+import org.apache.cayenne.modeler.pref.adapters.RecentProjectsPrefs;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.ui.action.*;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java
index ee39e62e7..349396b29 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/DBConnectionAwareAction.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.toolkit.AppAction;
import org.apache.cayenne.modeler.ui.datasource.DataSourceDialog;
import org.apache.cayenne.modeler.dbconnector.DBConnector;
-import org.apache.cayenne.modeler.pref.DataMapPrefs;
+import org.apache.cayenne.modeler.pref.adapters.DataMapPrefs;
/**
* Base action that provides DBConnectionInfo for the current DataMap or calls
{@link DataSourceDialog} dialog to
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java
index aacb87743..0a0408659 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.dbsync.naming.NameBuilder;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.toolkit.AppAction;
-import org.apache.cayenne.modeler.toolkit.filechooser.CMFileChooserPrefs;
+import org.apache.cayenne.modeler.pref.adapters.FileChooserPrefs;
import org.apache.cayenne.modeler.toolkit.filechooser.FileFilters;
import org.apache.cayenne.resource.Resource;
import org.apache.cayenne.resource.URLResource;
@@ -102,7 +102,7 @@ public class ImportDataMapAction extends AppAction {
JFileChooser chooser = new JFileChooser();
chooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
- new
CMFileChooserPrefs(app.getPrefsManager().uiNode("importDataMap/lastDir")).bind(chooser);
+ new
FileChooserPrefs(app.getPrefsManager().uiNode("importDataMap/lastDir")).bind(chooser);
chooser.addChoosableFileFilter(FileFilters.getDataMapFilter());
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
index 27382c5fc..cb7906797 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
@@ -53,7 +53,7 @@ import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
import org.apache.cayenne.modeler.event.model.QueryEvent;
import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.toolkit.AppAction;
-import org.apache.cayenne.modeler.toolkit.filechooser.CMFileChooserPrefs;
+import org.apache.cayenne.modeler.pref.adapters.FileChooserPrefs;
import org.apache.cayenne.modeler.ui.errors.ErrorDialog;
import org.apache.cayenne.wocompat.EOModelProcessor;
import org.slf4j.Logger;
@@ -325,7 +325,7 @@ public class ImportEOModelAction extends AppAction {
eoModelChooser = new EOModelChooser("Select EOModel");
}
- new
CMFileChooserPrefs(app.getPrefsManager().uiNode("importEOModel/lastDir")).bind(eoModelChooser);
+ new
FileChooserPrefs(app.getPrefsManager().uiNode("importEOModel/lastDir")).bind(eoModelChooser);
return eoModelChooser;
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
index 6a5a36fa3..01d4fb85c 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ProjectOpener.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.ui.action;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
+import org.apache.cayenne.modeler.pref.adapters.RecentProjectsPrefs;
import org.apache.cayenne.modeler.ui.project.overwrite.OverwriteDialog;
import org.apache.cayenne.modeler.toolkit.filechooser.FileFilters;
import org.apache.cayenne.project.Project;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java
index 3baa53e33..cef41e1a0 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ShowLogConsoleAction.java
@@ -20,7 +20,7 @@ package org.apache.cayenne.modeler.ui.action;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.toolkit.AppAction;
-import org.apache.cayenne.modeler.ui.logconsole.LogConsolePrefs;
+import org.apache.cayenne.modeler.pref.adapters.LogConsolePrefs;
import javax.swing.Action;
import java.awt.event.ActionEvent;
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 8a5ca3fad..50fb321ba 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
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler.ui.confirmremove;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.pref.GeneralPrefs;
+import org.apache.cayenne.modeler.pref.adapters.GeneralPrefs;
import javax.swing.*;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
index b7564ca6e..14a604a0a 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
@@ -25,8 +25,8 @@ import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.modeler.dbconnector.DBConnector;
import org.apache.cayenne.modeler.dbconnector.DBConnectors;
-import org.apache.cayenne.modeler.pref.DataMapPrefs;
-import org.apache.cayenne.modeler.pref.GeneralPrefs;
+import org.apache.cayenne.modeler.pref.adapters.DataMapPrefs;
+import org.apache.cayenne.modeler.pref.adapters.GeneralPrefs;
import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
import org.apache.cayenne.modeler.toolkit.ProjectDialog;
import org.apache.cayenne.modeler.ui.preferences.PreferenceDialog;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
index 8fc897991..520e13b05 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
@@ -28,6 +28,7 @@ import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.log.NoopJdbcEventLogger;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.dbconnector.DBConnector;
+import org.apache.cayenne.modeler.pref.adapters.DBGeneratorPrefs;
import org.apache.cayenne.modeler.toolkit.border.TopBorder;
import org.apache.cayenne.modeler.toolkit.ProjectDialog;
import org.apache.cayenne.modeler.ui.datasource.DataSourceDialog;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java
index 5c8e632fa..ddb77346d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java
@@ -38,7 +38,7 @@ import
org.apache.cayenne.modeler.toolkit.combobox.AutoCompletion;
import org.apache.cayenne.modeler.toolkit.combobox.CMComboBox;
import org.apache.cayenne.modeler.toolkit.table.CMComboBoxCellEditor;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.ProjectDialog;
import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.undo.CreateRelationshipUndoableEdit;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java
index f64da5827..fb16611cf 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsole.java
@@ -20,6 +20,7 @@ package org.apache.cayenne.modeler.ui.logconsole;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.log.LogAppender;
+import org.apache.cayenne.modeler.pref.adapters.LogConsolePrefs;
import org.apache.cayenne.modeler.toolkit.border.TopBorder;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
import org.apache.cayenne.modeler.toolkit.AppPanel;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
index 90918ac56..9aacfa88b 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
@@ -24,8 +24,8 @@ import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.pref.ClasspathPrefs;
-import org.apache.cayenne.modeler.toolkit.filechooser.CMFileChooserPrefs;
+import org.apache.cayenne.modeler.pref.adapters.ClasspathPrefs;
+import org.apache.cayenne.modeler.pref.adapters.FileChooserPrefs;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.toolkit.AppPanel;
import
org.apache.cayenne.modeler.ui.preferences.classpath.maven.MavenDependencyDialog;
@@ -139,7 +139,7 @@ public class ClasspathPrefsPanel extends AppPanel {
chooser.setDialogType(JFileChooser.OPEN_DIALOG);
chooser.setAcceptAllFileFilterUsed(true);
- new
CMFileChooserPrefs(app.getPrefsManager().uiNode("classpath/lastDir")).bind(chooser);
+ new
FileChooserPrefs(app.getPrefsManager().uiNode("classpath/lastDir")).bind(chooser);
if (filter != null) {
chooser.addChoosableFileFilter(filter);
chooser.setFileFilter(filter);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java
index 87e966019..4e8dc5c1e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPrefsPanel.java
@@ -23,7 +23,7 @@ import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.pref.GeneralPrefs;
+import org.apache.cayenne.modeler.pref.adapters.GeneralPrefs;
import org.apache.cayenne.modeler.toolkit.AppPanel;
import javax.swing.DefaultComboBoxModel;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
index bb042c282..20c583387 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
@@ -23,6 +23,7 @@ import com.jgoodies.forms.builder.PanelBuilder;
import com.jgoodies.forms.layout.CellConstraints;
import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.pref.PrefsExporter;
import org.apache.cayenne.modeler.toolkit.AppPanel;
import org.apache.cayenne.modeler.ui.action.CloseProjectAction;
@@ -80,7 +81,7 @@ public class MorePrefsPanel extends AppPanel {
}
private void copyAllClicked() {
- String json = app.getPrefsLocator().exportAsJson();
+ String json =
PrefsExporter.exportAsJson(app.getPrefsLocator().modelerRoot());
Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new
StringSelection(json), null);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
index 25f998bd6..45d4ef2d3 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectView.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.ui.project;
import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.service.action.GlobalActions;
-import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
+import org.apache.cayenne.modeler.pref.adapters.SplitPanePrefs;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
import org.apache.cayenne.modeler.ui.action.CollapseTreeAction;
import org.apache.cayenne.modeler.ui.action.FilterAction;
@@ -102,7 +102,7 @@ public class ProjectView extends ProjectPanel {
this.filterPopup = new TreeFilterPopup(treePanel);
- new
CMSplitPanePrefs(app.getPrefsManager().uiNode("project/splitPane")).bind(splitPane,
300);
+ new
SplitPanePrefs(app.getPrefsManager().uiNode("project/splitPane")).bind(splitPane,
300);
}
public EditorPanelView getEditorPanel() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java
index 6136f1905..b9327c765 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenTab.java
@@ -27,7 +27,7 @@ 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.pref.adapters.GeneralPrefs;
import org.apache.cayenne.modeler.project.CgenOps;
import org.apache.cayenne.modeler.project.ProjectSession;
import
org.apache.cayenne.modeler.ui.project.editor.datadomain.DataDomainGeneratorsTab;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java
index 10d6f494c..6551f19de 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPanel.java
@@ -43,7 +43,7 @@ import
org.apache.cayenne.modeler.event.model.EmbeddableListener;
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.pref.GeneralPrefs;
+import org.apache.cayenne.modeler.pref.adapters.GeneralPrefs;
import org.apache.cayenne.modeler.project.CgenOps;
import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
index 63946cfec..910f60692 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
@@ -27,9 +27,9 @@ import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.gen.TemplateType;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.toolkit.component.CMComponentGeometryPrefs;
+import org.apache.cayenne.modeler.pref.adapters.ComponentGeometryPrefs;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
-import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
+import org.apache.cayenne.modeler.pref.adapters.SplitPanePrefs;
import org.apache.cayenne.modeler.toolkit.AppFrame;
import
org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.CgenConfigPanel;
import org.apache.velocity.exception.ParseErrorException;
@@ -256,8 +256,8 @@ public class TemplateEditor extends AppFrame {
}
private void bindGeometry() {
- new
CMSplitPanePrefs(app.getPrefsManager().uiNode("templateEditor/splitPane")).bind(split,
600);
- new
CMComponentGeometryPrefs(app.getPrefsManager().uiNode("templateEditor/geometry")).bind(this,
1200, 700);
+ new
SplitPanePrefs(app.getPrefsManager().uiNode("templateEditor/splitPane")).bind(split,
600);
+ new
ComponentGeometryPrefs(app.getPrefsManager().uiNode("templateEditor/geometry")).bind(this,
1200, 700);
}
private void mapVelocityTokenMaker() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
index 8766966f4..e6532de26 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/DataMapMainView.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.event.model.DataMapEvent;
-import org.apache.cayenne.modeler.pref.DataMapPrefs;
+import org.apache.cayenne.modeler.pref.adapters.DataMapPrefs;
import org.apache.cayenne.modeler.project.ProjectComparators;
import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorPanel.java
index 44f022242..8c8e4d997 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorPanel.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory;
import org.apache.cayenne.modeler.dbconnector.DBConnector;
import org.apache.cayenne.modeler.event.model.DataNodeEvent;
-import org.apache.cayenne.modeler.pref.DataNodePrefs;
+import org.apache.cayenne.modeler.pref.adapters.DataNodePrefs;
import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
import org.apache.cayenne.modeler.toolkit.combobox.CMUndoableComboBox;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourcePanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourcePanel.java
index 096194d0c..4e5a22ea1 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourcePanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourcePanel.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.configuration.DataSourceDescriptor;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dbconnector.DBConnector;
-import org.apache.cayenne.modeler.pref.DataNodePrefs;
+import org.apache.cayenne.modeler.pref.adapters.DataNodePrefs;
import org.apache.cayenne.modeler.toolkit.text.CMPasswordField;
import org.apache.cayenne.modeler.toolkit.text.CMUndoableTextField;
import org.apache.cayenne.modeler.ui.MainFrame;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
index f07866ead..0e6d80dd5 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
@@ -36,7 +36,7 @@ import
org.apache.cayenne.modeler.toolkit.table.BoardTableCellRenderer;
import org.apache.cayenne.modeler.toolkit.table.CMComboBoxCellEditor;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.toolkit.table.CMTablePanel;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.ui.action.CopyAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.action.CutAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.action.PasteAction;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
index 2479ea0f1..556491015 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.modeler.event.model.DbEntityEvent;
import org.apache.cayenne.modeler.event.model.DbEntityListener;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
-import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
+import org.apache.cayenne.modeler.pref.adapters.SplitPanePrefs;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
import org.apache.cayenne.modeler.ui.action.CopyAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.action.CreateAttributeAction;
@@ -71,7 +71,7 @@ public class DbEntityPropertiesView extends ProjectPanel
implements DbEntityDisp
splitPane.setOneTouchExpandable(true);
splitPane.setResizeWeight(0.5);
- new
CMSplitPanePrefs(app.getPrefsManager().uiNode("dbEntity/splitPane")).bind(splitPane,
-1);
+ new
SplitPanePrefs(app.getPrefsManager().uiNode("dbEntity/splitPane")).bind(splitPane,
-1);
add(splitPane);
toolBar.setFloatable(false);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
index db9f0d02a..c28b7e093 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
@@ -38,7 +38,7 @@ import
org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.TablePopupHandler;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.table.BoardTableCellRenderer;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.toolkit.table.CMTablePanel;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
index 0d67b86bc..e3ca0b3e3 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.modeler.toolkit.combobox.CMComboBox;
import org.apache.cayenne.modeler.toolkit.table.CMComboBoxCellEditor;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.toolkit.table.CMTablePanel;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
import org.apache.cayenne.modeler.ui.action.CopyAttributeAction;
import org.apache.cayenne.modeler.ui.action.CopyAttributeRelationshipAction;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java
index c92145ddc..1871b3607 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialog.java
@@ -41,7 +41,7 @@ import
org.apache.cayenne.modeler.toolkit.buttons.CMButtonPanel;
import org.apache.cayenne.modeler.toolkit.combobox.AutoCompletion;
import org.apache.cayenne.modeler.toolkit.combobox.CMComboBox;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.ProjectDialog;
import org.apache.cayenne.modeler.project.ProjectSession;
import
org.apache.cayenne.modeler.ui.project.editor.objentity.properties.ObjAttributeTableModel;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
index 6ecdab5a4..c13497efd 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/callbacks/ObjEntityCallbacksView.java
@@ -30,7 +30,7 @@ import
org.apache.cayenne.modeler.event.display.CallbackTypeDisplayEvent;
import org.apache.cayenne.modeler.event.display.TablePopupHandler;
import org.apache.cayenne.modeler.event.model.CallbackMethodEvent;
import org.apache.cayenne.modeler.event.model.CallbackMethodListener;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.ui.action.CopyCallbackMethodAction;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
index d194fe63e..da3b6fca6 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
@@ -34,7 +34,7 @@ import
org.apache.cayenne.modeler.event.model.ObjEntityListener;
import org.apache.cayenne.modeler.event.model.ProjectBeforeSaveEvent;
import org.apache.cayenne.modeler.event.model.ProjectBeforeSaveListener;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.project.ObjEntityOps;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.toolkit.combobox.AutoCompletion;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
index 57317de21..6d539341e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
@@ -22,7 +22,7 @@ import
org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
import org.apache.cayenne.modeler.event.model.ObjEntityListener;
-import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
+import org.apache.cayenne.modeler.pref.adapters.SplitPanePrefs;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
import org.apache.cayenne.modeler.ui.action.CopyAttributeRelationshipAction;
@@ -67,7 +67,7 @@ public class ObjEntityPropertiesView extends ProjectPanel
implements ObjEntityDi
splitPane.setOneTouchExpandable(true);
splitPane.setResizeWeight(0.5);
- new
CMSplitPanePrefs(app.getPrefsManager().uiNode("objEntity/splitPane")).bind(splitPane,
-1);
+ new
SplitPanePrefs(app.getPrefsManager().uiNode("objEntity/splitPane")).bind(splitPane,
-1);
add(splitPane);
toolBar.setFloatable(false);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
index ab61cd1f7..bc62df29f 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
@@ -41,7 +41,7 @@ import
org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.TablePopupHandler;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.toolkit.table.CMTablePanel;
import org.apache.cayenne.modeler.toolkit.Renderers;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
index 0d642f9d2..f071f1f44 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
import org.apache.cayenne.modeler.toolkit.table.CMComboBoxCellEditor;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.toolkit.table.CMTablePanel;
-import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
+import org.apache.cayenne.modeler.pref.adapters.CMTablePrefs;
import org.apache.cayenne.modeler.ui.action.CopyAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.action.CopyProcedureParameterAction;
import org.apache.cayenne.modeler.ui.action.CreateProcedureParameterAction;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
index 409f84803..af8a3a8ed 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/selectquery/SelectQueryOrderingTab.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.map.SelectQueryDescriptor;
import org.apache.cayenne.modeler.event.model.QueryEvent;
import org.apache.cayenne.modeler.toolkit.columnview.ColumnViewPanel;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
-import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
+import org.apache.cayenne.modeler.pref.adapters.SplitPanePrefs;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.modeler.toolkit.ProjectPanel;
import org.apache.cayenne.modeler.toolkit.AppAction;
@@ -81,7 +81,7 @@ public class SelectQueryOrderingTab extends ProjectPanel {
//As of CAY-888 #3 main pane is now a JSplitPane. Top component is a
bit larger.
JSplitPane mainPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
- new
CMSplitPanePrefs(app.getPrefsManager().uiNode("selectQuery/orderingSplit")).bind(mainPanel,
defLocation);
+ new
SplitPanePrefs(app.getPrefsManager().uiNode("selectQuery/orderingSplit")).bind(mainPanel,
defLocation);
mainPanel.setTopComponent(createEditorPanel());
mainPanel.setBottomComponent(createSelectorPanel());
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
index dea02e82b..b90cda3d0 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/query/sqltemplate/SQLTemplatePrefetchTab.java
@@ -34,7 +34,7 @@ import
org.apache.cayenne.modeler.toolkit.tree.EntityTreeFilter;
import org.apache.cayenne.modeler.toolkit.tree.EntityTreeModel;
import org.apache.cayenne.modeler.toolkit.columnview.ColumnViewPanel;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
-import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
+import org.apache.cayenne.modeler.pref.adapters.SplitPanePrefs;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
import org.apache.cayenne.util.CayenneMapEntry;
@@ -92,7 +92,7 @@ public class SQLTemplatePrefetchTab extends ProjectPanel {
//As of CAY-888 #3 main pane is now a JSplitPane. Top component is a
bit larger.
JSplitPane mainPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
- new
CMSplitPanePrefs(app.getPrefsManager().uiNode("sqlTemplate/prefetchSplit")).bind(mainPanel,
defLocation);
+ new
SplitPanePrefs(app.getPrefsManager().uiNode("sqlTemplate/prefetchSplit")).bind(mainPanel,
defLocation);
mainPanel.setTopComponent(createEditorPanel());
mainPanel.setBottomComponent(createSelectorPanel());
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java
index 83888ade8..ba352fcdb 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ValidationDisplayHandler.java
@@ -29,7 +29,7 @@ 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.pref.DataNodePrefs;
+import org.apache.cayenne.modeler.pref.adapters.DataNodePrefs;
import org.apache.cayenne.modeler.project.ProjectSession;
import org.apache.cayenne.validation.ValidationFailure;
import org.slf4j.Logger;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
index e32f1d547..a86428887 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.modeler.ui.welcome;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
+import org.apache.cayenne.modeler.pref.adapters.RecentProjectsPrefs;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.toolkit.AppPanel;
import org.apache.cayenne.modeler.toolkit.icon.IconFactory;
