Skip to content

Commit d10c084

Browse files
andrusandrus
committed
Prefs reorg
1 parent eab63df commit d10c084

60 files changed

Lines changed: 106 additions & 101 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Application.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
import org.apache.cayenne.modeler.dbconnector.DBConnectors;
3232
import org.apache.cayenne.modeler.log.ModelerLogFactory;
3333
import org.apache.cayenne.modeler.platform.UIInitializer;
34-
import org.apache.cayenne.modeler.pref.ClasspathPrefs;
35-
import org.apache.cayenne.modeler.pref.DBConnectorPrefs;
36-
import org.apache.cayenne.modeler.pref.GeneralPrefs;
34+
import org.apache.cayenne.modeler.pref.adapters.ClasspathPrefs;
35+
import org.apache.cayenne.modeler.pref.adapters.DBConnectorPrefs;
36+
import org.apache.cayenne.modeler.pref.adapters.GeneralPrefs;
3737
import org.apache.cayenne.modeler.pref.PrefsLocator;
3838
import org.apache.cayenne.modeler.pref.PrefsManager;
39-
import org.apache.cayenne.modeler.pref.RecentProjectsPrefs;
39+
import org.apache.cayenne.modeler.pref.adapters.RecentProjectsPrefs;
4040
import org.apache.cayenne.modeler.service.action.GlobalActions;
4141
import org.apache.cayenne.modeler.service.classloader.ModelerClassLoader;
4242
import org.apache.cayenne.modeler.service.validator.ConfigurableProjectValidator;

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbconnector/DBConnectors.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.cayenne.modeler.dbconnector;
2121

22-
import org.apache.cayenne.modeler.pref.DBConnectorPrefs;
22+
import org.apache.cayenne.modeler.pref.adapters.DBConnectorPrefs;
2323

2424
import java.util.ArrayList;
2525
import java.util.Collections;

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesCopier.java renamed to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsCopier.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
/**
2828
* Recursive {@link Preferences} subtree copy and move helpers.
2929
*/
30-
public final class PreferencesCopier {
30+
public final class PrefsCopier {
3131

32-
private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesCopier.class);
32+
private static final Logger LOGGER = LoggerFactory.getLogger(PrefsCopier.class);
3333

34-
private PreferencesCopier() {
34+
private PrefsCopier() {
3535
}
3636

3737
/**

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PreferencesJsonExporter.java renamed to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsExporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import java.util.prefs.BackingStoreException;
2727
import java.util.prefs.Preferences;
2828

29-
class PreferencesJsonExporter {
29+
public class PrefsExporter {
3030

31-
private static final Logger LOGGER = LoggerFactory.getLogger(PreferencesJsonExporter.class);
31+
private static final Logger LOGGER = LoggerFactory.getLogger(PrefsExporter.class);
3232

3333
public static String exportAsJson(Preferences node) {
3434
StringBuilder sb = new StringBuilder();

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsLocator.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import java.util.prefs.Preferences;
2222

2323
/**
24-
* Resolves preference nodes against the common root.
24+
* Resolves common types of preference nodes against the common root.
2525
*/
2626
public final class PrefsLocator {
2727

@@ -91,14 +91,4 @@ public Preferences dataMapNode(String dataMapId) {
9191
public Preferences handshakeNode(String nonce) {
9292
return root.node(HANDSHAKE_ROOT).node(nonce);
9393
}
94-
95-
/**
96-
* Serializes the entire Modeler preferences subtree ({@link #modelerRoot()})
97-
* as a pretty-printed JSON string. Each {@link Preferences} node becomes a JSON
98-
* object whose own keys map to string values and whose child node names map to
99-
* nested objects.
100-
*/
101-
public String exportAsJson() {
102-
return PreferencesJsonExporter.exportAsJson(modelerRoot());
103-
}
10494
}

‎modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/PrefsManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ private void reconcileDataMap(DataMap map) {
330330
}
331331

332332
private static void relocate(Function<String, Preferences> nodeForId, String oldId, String newId) {
333-
PreferencesCopier.move(nodeForId.apply(oldId), nodeForId.apply(newId));
333+
PrefsCopier.move(nodeForId.apply(oldId), nodeForId.apply(newId));
334334
}
335335

336336
private static String projectPath(Project project) {

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/table/CMTablePrefs.java renamed to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/CMTablePrefs.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
****************************************************************/
19-
package org.apache.cayenne.modeler.toolkit.table;
19+
package org.apache.cayenne.modeler.pref.adapters;
2020

2121
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
22+
import org.apache.cayenne.modeler.toolkit.table.CMTable;
2223

2324
import javax.swing.event.ChangeEvent;
2425
import javax.swing.event.ListSelectionEvent;

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ClasspathPrefs.java renamed to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ClasspathPrefs.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717
* under the License.
1818
****************************************************************/
1919

20-
package org.apache.cayenne.modeler.pref;
20+
package org.apache.cayenne.modeler.pref.adapters;
2121

22+
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
2223
import org.slf4j.Logger;
2324
import org.slf4j.LoggerFactory;
2425

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/component/CMComponentGeometryPrefs.java renamed to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/ComponentGeometryPrefs.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
****************************************************************/
1919

20-
package org.apache.cayenne.modeler.toolkit.component;
20+
package org.apache.cayenne.modeler.pref.adapters;
2121

2222
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
2323

@@ -26,14 +26,14 @@
2626
import java.awt.event.ComponentEvent;
2727
import java.util.prefs.Preferences;
2828

29-
public final class CMComponentGeometryPrefs extends PreferenceAdapter {
29+
public final class ComponentGeometryPrefs extends PreferenceAdapter {
3030

3131
private static final String HEIGHT_PROPERTY = "height";
3232
private static final String WIDTH_PROPERTY = "width";
3333
private static final String X_PROPERTY = "x";
3434
private static final String Y_PROPERTY = "y";
3535

36-
public CMComponentGeometryPrefs(Preferences prefs) {
36+
public ComponentGeometryPrefs(Preferences prefs) {
3737
super(prefs);
3838
}
3939

modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/DBConnectorPrefs.java renamed to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/adapters/DBConnectorPrefs.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@
1717
* under the License.
1818
****************************************************************/
1919

20-
package org.apache.cayenne.modeler.pref;
20+
package org.apache.cayenne.modeler.pref.adapters;
2121

2222
import org.apache.cayenne.CayenneRuntimeException;
2323
import org.apache.cayenne.modeler.dbconnector.DBConnector;
2424
import org.apache.cayenne.modeler.dbconnector.DBConnectors;
25+
import org.apache.cayenne.modeler.pref.PreferenceAdapter;
2526

2627
import java.util.prefs.BackingStoreException;
2728
import java.util.prefs.Preferences;

0 commit comments

Comments
 (0)
⚡