(cayenne) 07/10: Modeler refactoring - package per component

[aa...@apache.org]

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

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

commit 1911bdc790946f7197b9b3823adfcba0941e3cb4
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:29:17 2026 -0400

    Modeler refactoring - package per component
    
    * move DataMapView, DataMapTabbedView to ui/project/editor/datamap/
    * split dialog/datamap/** into DataMap child subpackages:
      catalog/, defaults/, locking/, pkg/, schema/, superclass/
---
 .../org/apache/cayenne/modeler/ui/project/ProjectView.java   |  2 +-
 .../project/editor/datamap}/DataMapTabbedView.java           |  2 +-
 .../{editor => ui/project/editor/datamap}/DataMapView.java   | 12 ++++++------
 .../editor/datamap/catalog}/CatalogUpdateController.java     |  4 +++-
 .../datamap/defaults}/DefaultsPreferencesController.java     |  2 +-
 .../editor/datamap/defaults}/DefaultsPreferencesView.java    |  2 +-
 .../editor/datamap/locking}/LockingUpdateController.java     |  2 +-
 .../project/editor/datamap/locking}/LockingUpdateView.java   |  2 +-
 .../project/editor/datamap/pkg}/PackageUpdateController.java |  4 +++-
 .../editor/datamap/schema}/SchemaUpdateController.java       |  4 +++-
 .../datamap/superclass}/SuperclassUpdateController.java      |  4 +++-
 11 files changed, 24 insertions(+), 16 deletions(-)

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 4fcb5af9b..7f06c081c 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
@@ -26,7 +26,7 @@ import org.apache.cayenne.modeler.action.CollapseTreeAction;
 import org.apache.cayenne.modeler.action.FilterAction;
 import org.apache.cayenne.modeler.ui.project.tree.filter.FilterController;
 import org.apache.cayenne.modeler.ui.project.editor.datadomain.DataDomainTabbedView;
-import org.apache.cayenne.modeler.editor.DataMapTabbedView;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.DataMapTabbedView;
 import org.apache.cayenne.modeler.editor.EjbqlTabbedView;
 import org.apache.cayenne.modeler.editor.EmbeddableTabbedView;
 import org.apache.cayenne.modeler.editor.ObjEntityTabbedView;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapTabbedView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapTabbedView.java
index 33f168f9e..ee8ee74e9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapTabbedView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapTabbedView.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.editor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap;
 
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.CgenController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
index 85ea982a1..268758936 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DataMapView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/DataMapView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.editor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
@@ -29,11 +29,11 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.action.LinkDataMapAction;
-import org.apache.cayenne.modeler.dialog.datamap.CatalogUpdateController;
-import org.apache.cayenne.modeler.dialog.datamap.LockingUpdateController;
-import org.apache.cayenne.modeler.dialog.datamap.PackageUpdateController;
-import org.apache.cayenne.modeler.dialog.datamap.SchemaUpdateController;
-import org.apache.cayenne.modeler.dialog.datamap.SuperclassUpdateController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.catalog.CatalogUpdateController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.locking.LockingUpdateController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.pkg.PackageUpdateController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.schema.SchemaUpdateController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.superclass.SuperclassUpdateController;
 import org.apache.cayenne.modeler.event.model.ProjectSavedEvent;
 import org.apache.cayenne.modeler.pref.DataMapDefaults;
 import org.apache.cayenne.modeler.util.CellRenderers;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/CatalogUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/catalog/CatalogUpdateController.java
similarity index 93%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/CatalogUpdateController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/catalog/CatalogUpdateController.java
index 1f6464c34..f0ee6fe5c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/CatalogUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/catalog/CatalogUpdateController.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.catalog;
 
 import org.apache.cayenne.modeler.event.model.ProcedureEvent;
 import org.apache.cayenne.map.DataMap;
@@ -24,6 +24,8 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.Procedure;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesView;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/DefaultsPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsPreferencesController.java
similarity index 96%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/DefaultsPreferencesController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsPreferencesController.java
index f550536f6..04802248e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/DefaultsPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsPreferencesController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.defaults;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/DefaultsPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsPreferencesView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/DefaultsPreferencesView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsPreferencesView.java
index b3bb26955..5fc0045a2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/DefaultsPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsPreferencesView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.defaults;
 
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/locking/LockingUpdateController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/locking/LockingUpdateController.java
index 98e662f31..e315b4171 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/locking/LockingUpdateController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.locking;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.ObjAttribute;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/locking/LockingUpdateView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/locking/LockingUpdateView.java
index 9912f35b1..d1240aa3d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/LockingUpdateView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/locking/LockingUpdateView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.locking;
 
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/pkg/PackageUpdateController.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/pkg/PackageUpdateController.java
index 064870e22..ad4962244 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/PackageUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/pkg/PackageUpdateController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.pkg;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.Embeddable;
@@ -28,6 +28,8 @@ import org.apache.cayenne.map.event.AttributeEvent;
 import org.apache.cayenne.map.event.EmbeddableEvent;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesView;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/schema/SchemaUpdateController.java
similarity index 93%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/schema/SchemaUpdateController.java
index 56e77e1e2..a3261fdc0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SchemaUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/schema/SchemaUpdateController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.schema;
 
 import org.apache.cayenne.modeler.event.model.ProcedureEvent;
 import org.apache.cayenne.map.DataMap;
@@ -25,6 +25,8 @@ import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.Procedure;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesView;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SuperclassUpdateController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/superclass/SuperclassUpdateController.java
similarity index 92%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SuperclassUpdateController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/superclass/SuperclassUpdateController.java
index 9f98f0712..978795c0e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/datamap/SuperclassUpdateController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/superclass/SuperclassUpdateController.java
@@ -17,12 +17,14 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.datamap;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.superclass;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.defaults.DefaultsPreferencesView;
 import org.apache.cayenne.modeler.util.Comparators;
 import org.apache.cayenne.util.Util;