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 bda68721b Modeler Cleanup
bda68721b is described below
commit bda68721ba7fe1cc15951180590c779e58d311d6
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sat May 2 21:25:30 2026 -0400
Modeler Cleanup
camel case pref names
---
.../apache/cayenne/modeler/pref/DataNodePrefs.java | 2 +-
.../cayenne/modeler/pref/PreferenceMigration.java | 2 +-
.../modeler/pref/PreferencesRepository.java | 8 ++--
.../toV5/_7_EntityTablePrefsMigration.java | 45 ++++++++++++++++++----
.../modeler/toolkit/table/CMTablePrefs.java | 8 ++--
.../cayenne/modeler/ui/dbgen/DBGeneratorPrefs.java | 2 +-
.../modeler/ui/logconsole/LogConsolePrefs.java | 2 +-
.../modeler/util/NameGeneratorPreferences.java | 2 +-
8 files changed, 50 insertions(+), 21 deletions(-)
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/DataNodePrefs.java
index 3fc7d20cd..78041b97d 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/DataNodePrefs.java
@@ -26,7 +26,7 @@ public final class DataNodePrefs implements PreferenceAdapter
{
public static final String LOCAL_DATA_SOURCE_PROPERTY = "localDataSource";
- static final String NODE = "DataNode";
+ static final String NODE = "dataNode";
private final Preferences pref;
private String localDataSource;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java
index 11a69b09c..793b01191 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferenceMigration.java
@@ -25,7 +25,7 @@ public interface PreferenceMigration {
/**
* Strictly positive, monotonic version. The repository tracks the highest
applied
- * version under {@code app/_meta/migrations.appliedVersion} and runs every
+ * version under {@code app/_meta/migrationsAppliedVersion} and runs every
* migration with a higher version, in ascending order.
*/
int version();
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
index 3ff7a1c2a..2a1530e78 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesRepository.java
@@ -63,7 +63,7 @@ public class PreferencesRepository {
static final String PROJECT_INDEX_NODE = "projectIndex";
static final String DATAMAP_INDEX_NODE = "dataMapIndex";
- static final String MIGRATIONS_VERSION_KEY = "migrations.appliedVersion";
+ static final String MIGRATIONS_VERSION_KEY = "migrationsAppliedVersion";
static final String PATH_KEY = "path";
static final String UNSAVED_PREFIX = "unsaved-";
@@ -196,13 +196,13 @@ public class PreferencesRepository {
* subtrees.
*
* <p>If {@code importLegacyPreferences} is {@code true}, the wipe includes
- * {@code app/_meta/migrations.appliedVersion}, so {@link #runMigrations()}
+ * {@code app/_meta/migrationsAppliedVersion}, so {@link #runMigrations()}
* will re-run every registered migration on next startup and import
* preferences from earlier Cayenne versions.
*
* <p>If {@code false}, after the wipe the repository writes the highest
* registered migration version under
- * {@code app/_meta/migrations.appliedVersion}, marking all migrations as
+ * {@code app/_meta/migrationsAppliedVersion}, marking all migrations as
* already applied so legacy preferences are not re-imported on next
startup.
*/
public void resetToDefaults(boolean importLegacyPreferences) {
@@ -231,7 +231,7 @@ public class PreferencesRepository {
/**
* Idempotent. Applies any registered {@link PreferenceMigration}s whose
- * version exceeds {@code app/_meta/migrations.appliedVersion}.
+ * version exceeds {@code app/_meta/migrationsAppliedVersion}.
*/
public void runMigrations() {
Preferences meta = appPref(META_NODE);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java
index 5e54e1591..980445266 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/migration/toV5/_7_EntityTablePrefsMigration.java
@@ -19,7 +19,6 @@
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.PreferencesRepository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,12 +29,11 @@ import java.util.prefs.Preferences;
/**
* Copies legacy column widths / order / sort prefs for the four primary entity
* tables (ObjAttribute, ObjRelationship, DbAttribute, DbRelationship) into the
- * new {@code app/ui/...} layout. Legacy nodes were derived from
- * {@code userNodeForPackage(<table-model class>).node(<sub-path>)}; the
- * {@code width_*}, {@code order_*}, {@code sort_column}, and {@code
sort_order}
- * key formats are identical to the new layout, so a recursive subtree copy
- * suffices. Leaves the legacy nodes intact so an older Modeler installation on
- * the same machine still works.
+ * new {@code app/ui/...} layout. Legacy keys used snake_case (sort_column,
+ * sort_order, width_<n>, order_<n>); the new layout uses camelCase
+ * (sortColumn, sortOrder, colWidth<n>, colOrder<n>), so each key
is
+ * renamed during the copy. Leaves the legacy nodes intact so an older Modeler
+ * installation on the same machine still works.
*/
public class _7_EntityTablePrefsMigration implements PreferenceMigration {
@@ -49,6 +47,11 @@ public class _7_EntityTablePrefsMigration implements
PreferenceMigration {
{"org/apache/cayenne/modeler/editor/dbentity/relationshipTable",
"dbEntity/relationshipTable"},
};
+ private static final String LEGACY_SORT_COLUMN = "sort_column";
+ private static final String LEGACY_SORT_ORDER = "sort_order";
+ private static final String LEGACY_WIDTH_PREFIX = "width_";
+ private static final String LEGACY_ORDER_PREFIX = "order_";
+
@Override
public int version() {
return 7;
@@ -63,16 +66,42 @@ public class _7_EntityTablePrefsMigration implements
PreferenceMigration {
private static void copyTable(PreferencesRepository repo, String
legacyPath, String uiPath) {
Preferences legacy;
+ String[] legacyKeys;
try {
if (!Preferences.userRoot().nodeExists(legacyPath)) {
return;
}
legacy = Preferences.userRoot().node(legacyPath);
+ legacyKeys = legacy.keys();
} catch (BackingStoreException e) {
LOGGER.warn("Error checking legacy table prefs node '{}'",
legacyPath, e);
return;
}
- PreferencesCopier.copy(legacy, repo.uiPref(uiPath));
+ Preferences target = repo.uiPref(uiPath);
+ for (String key : legacyKeys) {
+ switch (key) {
+ case LEGACY_SORT_COLUMN:
+ target.putInt("sortColumn", legacy.getInt(key, 0));
+ break;
+ case LEGACY_SORT_ORDER:
+ target.putBoolean("sortOrder", legacy.getBoolean(key,
true));
+ break;
+ default:
+ if (key.startsWith(LEGACY_WIDTH_PREFIX)) {
+ int v = legacy.getInt(key, -1);
+ if (v >= 0) {
+ target.putInt("colWidth" +
key.substring(LEGACY_WIDTH_PREFIX.length()), v);
+ }
+ } else if (key.startsWith(LEGACY_ORDER_PREFIX)) {
+ int v = legacy.getInt(key, -1);
+ if (v >= 0) {
+ target.putInt("colOrder" +
key.substring(LEGACY_ORDER_PREFIX.length()), v);
+ }
+ }
+ // unknown legacy key — silently skip
+ break;
+ }
+ }
}
}
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/toolkit/table/CMTablePrefs.java
index f08840b7e..6aa66c856 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/toolkit/table/CMTablePrefs.java
@@ -33,10 +33,10 @@ import java.util.prefs.Preferences;
public final class CMTablePrefs implements PreferenceAdapter {
- private static final String SORT_COLUMN_KEY = "sort_column";
- private static final String SORT_ORDER_KEY = "sort_order";
- private static final String WIDTH_KEY = "width_";
- private static final String ORDER_KEY = "order_";
+ private static final String SORT_COLUMN_KEY = "sortColumn";
+ private static final String SORT_ORDER_KEY = "sortOrder";
+ private static final String WIDTH_KEY = "colWidth";
+ private static final String ORDER_KEY = "colOrder";
private static final String LISTENER_PROPERTY = "TablePrefs.listener";
private final Preferences prefs;
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
index 71a338a75..2d624c348 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/ui/dbgen/DBGeneratorPrefs.java
@@ -34,7 +34,7 @@ import java.util.prefs.Preferences;
*/
public class DBGeneratorPrefs implements PreferenceAdapter {
- static final String NODE = "DbGenerator";
+ static final String NODE = "dbGenerator";
private static final String CREATE_FK_PROPERTY = "createFK";
private static final String CREATE_PK_PROPERTY = "createPK";
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/ui/logconsole/LogConsolePrefs.java
index 03c7c9bea..171f12347 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/ui/logconsole/LogConsolePrefs.java
@@ -27,7 +27,7 @@ import java.util.prefs.Preferences;
public final class LogConsolePrefs implements PreferenceAdapter {
static final String NODE = "logConsole";
- static final String SHOW_CONSOLE = "show.log.console";
+ static final String SHOW_CONSOLE = "showLogConsole";
public static LogConsolePrefs of(PreferencesRepository repository) {
return new LogConsolePrefs(repository.appPref(NODE));
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
index e67aeac4b..b61db590e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
@@ -31,7 +31,7 @@ import java.util.prefs.Preferences;
*/
public class NameGeneratorPreferences {
- private static final String STRATEGIES_PREFERENCE =
"name.generators.recent";
+ private static final String STRATEGIES_PREFERENCE = "recentNameGenerators";
/**
* Naming strategies to appear in combobox by default
