You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/04/24 16:43:02 UTC
(cayenne) 02/10: Modeler refactoring - package per component
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 9e676fb35e7984eb37611b72cdfc6f8bc2004afb
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:11:02 2026 -0400
Modeler refactoring - package per component
* relocate core cgen from ui/project/editor/cgen/ to ui/project/editor/datamap/cgen/
since CgenController operates on a single DataMap (DataMap-scoped child component);
the DataDomain Class Generation tab remains a batch adapter at
ui/project/editor/datadomain/cgen/
---
.../org/apache/cayenne/modeler/editor/DataMapTabbedView.java | 2 +-
.../{ => datamap}/cgen/CgenArtefactSelectorController.java | 2 +-
.../editor/{ => datamap}/cgen/CgenArtefactSelectorPanel.java | 2 +-
.../editor/{ => datamap}/cgen/CgenConfigController.java | 4 ++--
.../project/editor/{ => datamap}/cgen/CgenConfigPanel.java | 2 +-
.../ui/project/editor/{ => datamap}/cgen/CgenController.java | 2 +-
.../ui/project/editor/{ => datamap}/cgen/CgenPane.java | 2 +-
.../ui/project/editor/{ => datamap}/cgen/CgenValidator.java | 2 +-
.../ui/project/editor/{ => datamap}/cgen/SelectionModel.java | 2 +-
.../cgen/templateeditor/ArtefactsConfigurator.java | 2 +-
.../cgen/templateeditor/DataMapArtefactsConfigurator.java | 2 +-
.../cgen/templateeditor/EditorTemplateLoader.java | 2 +-
.../cgen/templateeditor/EditorTemplateSaver.java | 2 +-
.../cgen/templateeditor/EmbeddableArtefactsConfigurator.java | 2 +-
.../cgen/templateeditor/EntityArtefactsConfigurator.java | 2 +-
.../cgen/templateeditor/FindAndReplaceController.java | 2 +-
.../cgen/templateeditor/FindAndReplaceView.java | 2 +-
.../{ => datamap}/cgen/templateeditor/FindController.java | 2 +-
.../editor/{ => datamap}/cgen/templateeditor/FindView.java | 2 +-
.../cgen/templateeditor/PreviewActionConfigurator.java | 2 +-
.../cgen/templateeditor/PreviewClassGenerationFactory.java | 2 +-
.../cgen/templateeditor/PreviewGenerationAction.java | 2 +-
.../cgen/templateeditor/TemplateEditorController.java | 4 ++--
.../cgen/templateeditor/TemplateEditorView.java | 2 +-
.../cgen/templateeditor/VelocityTokenMaker.java | 2 +-
.../editor/templateeditor/ArtifactsConfiguratorTest.java | 6 +++---
.../editor/templateeditor/EditorTemplateLoaderTest.java | 2 +-
.../editor/templateeditor/EditorTemplateSaverTest.java | 4 ++--
.../editor/templateeditor/PreviewActionConfiguratorTest.java | 12 ++++++------
29 files changed, 39 insertions(+), 39 deletions(-)
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/editor/DataMapTabbedView.java
index bef9f9cd2..0ae436231 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/editor/DataMapTabbedView.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.modeler.editor;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.CgenController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.CgenController;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.cgen.CgenTab;
import org.apache.cayenne.modeler.editor.dbimport.DbImportView;
import org.apache.cayenne.modeler.editor.dbimport.domain.DbImportTab;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenArtefactSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenArtefactSelectorController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java
index f60c268b2..88bda5f12 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenArtefactSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.map.DataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenArtefactSelectorPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenArtefactSelectorPanel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java
index 5eaa4f746..06bc1c1bc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenArtefactSelectorPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorPanel.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenConfigController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenConfigController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigController.java
index a4d36db37..479f43997 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenConfigController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigController.java
@@ -17,12 +17,12 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
import org.apache.cayenne.gen.CgenConfiguration;
import org.apache.cayenne.gen.TemplateType;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.TemplateEditorController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.TemplateEditorController;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.pref.DataMapDefaults;
import org.apache.cayenne.modeler.pref.FSPath;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenConfigPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenConfigPanel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
index b71f3499d..d9a0c3c84 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenConfigPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigPanel.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
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/ui/project/editor/cgen/CgenController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
index 1bc0d2803..7df1e2295 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.configuration.BaseConfigurationNodeVisitor;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenPane.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPane.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenPane.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPane.java
index 759b01c3b..e2fe5015b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenPane.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPane.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
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/ui/project/editor/cgen/CgenValidator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenValidator.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java
index 8ad0c3e49..21ca42be1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/CgenValidator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenValidator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
import java.util.Collection;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/SelectionModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/SelectionModel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java
index c64c3399e..3708dd09f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/SelectionModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/SelectionModel.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/ArtefactsConfigurator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java
similarity index 94%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/ArtefactsConfigurator.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java
index 97fa1f86c..f98e9d06a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/ArtefactsConfigurator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/ArtefactsConfigurator.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.map.DataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/DataMapArtefactsConfigurator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java
similarity index 94%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/DataMapArtefactsConfigurator.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java
index 172507ba3..399d264db 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/DataMapArtefactsConfigurator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/DataMapArtefactsConfigurator.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.map.DataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EditorTemplateLoader.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EditorTemplateLoader.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java
index 0358bfc53..f42474bea 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EditorTemplateLoader.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateLoader.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.CgenConfiguration;
import org.apache.cayenne.gen.TemplateType;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EditorTemplateSaver.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EditorTemplateSaver.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java
index fec540a04..f48c4046f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EditorTemplateSaver.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EditorTemplateSaver.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.CgenConfiguration;
import org.apache.cayenne.gen.CgenTemplate;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EmbeddableArtefactsConfigurator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
similarity index 96%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
index 1f05cd0f2..1c1df9153 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EmbeddableArtefactsConfigurator.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.map.DataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EntityArtefactsConfigurator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java
similarity index 96%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EntityArtefactsConfigurator.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java
index 9db042264..9e8e513da 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/EntityArtefactsConfigurator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/EntityArtefactsConfigurator.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.map.DataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindAndReplaceController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindAndReplaceController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceController.java
index 28561c626..a66d75a91 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindAndReplaceController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceController.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.fife.ui.rtextarea.SearchContext;
import org.fife.ui.rtextarea.SearchEngine;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindAndReplaceView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindAndReplaceView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceView.java
index ec9fec16c..d8a88a7c7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindAndReplaceView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceView.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
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/ui/project/editor/cgen/templateeditor/FindController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindController.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindController.java
index 4965e6980..7b96dde12 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindController.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.util.Util;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindView.java
index 8a289d32e..677fa522a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/FindView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindView.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
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/ui/project/editor/cgen/templateeditor/PreviewActionConfigurator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewActionConfigurator.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java
index 668f07591..b15b1a9a4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewActionConfigurator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewActionConfigurator.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.di.Injector;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewClassGenerationFactory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewClassGenerationFactory.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java
index d2c6dbcc5..cb57bdd9f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewClassGenerationFactory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewClassGenerationFactory.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.gen.CgenConfiguration;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewGenerationAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewGenerationAction.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java
index 640d8247f..4cf84803f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/PreviewGenerationAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/PreviewGenerationAction.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.CgenConfiguration;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/TemplateEditorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/TemplateEditorController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorController.java
index 8612b3e82..33437c05c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/TemplateEditorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorController.java
@@ -17,13 +17,13 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import org.apache.cayenne.gen.CgenConfiguration;
import org.apache.cayenne.gen.ClassGenerationAction;
import org.apache.cayenne.gen.TemplateType;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.CgenConfigController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.CgenConfigController;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.velocity.exception.ParseErrorException;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/TemplateEditorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/TemplateEditorView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorView.java
index ea044221c..8f2683ef7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/TemplateEditorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorView.java
@@ -17,7 +17,7 @@
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
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/ui/project/editor/cgen/templateeditor/VelocityTokenMaker.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/VelocityTokenMaker.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java
index 1f1fae62c..a665c5a60 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/cgen/templateeditor/VelocityTokenMaker.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/VelocityTokenMaker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-package org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor;
import java.io.IOException;
import java.io.InputStream;
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java
index 1eb5c9246..3bfc5bea2 100644
--- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java
+++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/ArtifactsConfiguratorTest.java
@@ -27,9 +27,9 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.QueryDescriptor;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.DataMapArtefactsConfigurator;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.EmbeddableArtefactsConfigurator;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.EntityArtefactsConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.DataMapArtefactsConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EmbeddableArtefactsConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EntityArtefactsConfigurator;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java
index 95e0092d3..1d8f27c0c 100644
--- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java
+++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateLoaderTest.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.editor.templateeditor;
import org.apache.cayenne.gen.CgenConfiguration;
import org.apache.cayenne.gen.CgenTemplate;
import org.apache.cayenne.gen.TemplateType;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.EditorTemplateLoader;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EditorTemplateLoader;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.junit.Before;
import org.junit.Test;
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java
index 53dbd3356..a977777f6 100644
--- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java
+++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/EditorTemplateSaverTest.java
@@ -21,8 +21,8 @@ package org.apache.cayenne.modeler.editor.templateeditor;
import org.apache.cayenne.gen.CgenConfiguration;
import org.apache.cayenne.gen.TemplateType;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.TemplateEditorView;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.EditorTemplateSaver;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.TemplateEditorView;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EditorTemplateSaver;
import org.junit.Before;
import org.junit.Test;
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java
index db31ff693..def79bbb6 100644
--- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java
+++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/templateeditor/PreviewActionConfiguratorTest.java
@@ -27,12 +27,12 @@ import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.ArtefactsConfigurator;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.DataMapArtefactsConfigurator;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.EmbeddableArtefactsConfigurator;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.EntityArtefactsConfigurator;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.PreviewActionConfigurator;
-import org.apache.cayenne.modeler.ui.project.editor.cgen.templateeditor.TemplateEditorController;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.ArtefactsConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.DataMapArtefactsConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EmbeddableArtefactsConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.EntityArtefactsConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.PreviewActionConfigurator;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.cgen.templateeditor.TemplateEditorController;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;