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 17:11:14 UTC

(cayenne) branch master updated (fd5e8d8ad -> ea13f1a26)

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

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


    from fd5e8d8ad Modeler refactoring - package per component
     new 3abbfd9ea Modeler refactoring - package per component
     new 9072e0e26 Modeler refactoring - package per component
     new 7838927fa Modeler refactoring - package per component
     new f2bb4ef5b Modeler refactoring - package per component
     new fbc9186bd Modeler refactoring - package per component
     new 9739e2f23 Modeler refactoring - package per component
     new ea13f1a26 Modeler refactoring - package per component

The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../org/apache/cayenne/modeler/Application.java    |   2 +-
 .../main/java/org/apache/cayenne/modeler/Main.java |   2 +-
 .../cayenne/modeler/ProjectFileChangeTracker.java  |   2 +-
 .../apache/cayenne/modeler/action/AboutAction.java |   2 +-
 .../modeler/action/ConfigurePreferencesAction.java |   2 +-
 .../cayenne/modeler/action/CreateQueryAction.java  |   2 +-
 .../modeler/action/CreateRelationshipAction.java   |   2 +-
 .../modeler/action/DBConnectionAwareAction.java    |   2 +-
 .../cayenne/modeler/action/DbEntitySyncAction.java |   2 +-
 .../apache/cayenne/modeler/action/FindAction.java  |   2 +-
 .../cayenne/modeler/action/GenerateDBAction.java   |   2 +-
 .../modeler/action/GetDbConnectionAction.java      |   2 +-
 .../modeler/action/ImportEOModelAction.java        |   2 +-
 .../modeler/action/InferRelationshipsAction.java   |   2 +-
 .../cayenne/modeler/action/LoadDbSchemaAction.java |   2 +-
 .../cayenne/modeler/action/MigrateAction.java      |   6 +-
 .../modeler/action/ObjEntitySyncAction.java        |   2 +-
 .../cayenne/modeler/action/OpenProjectAction.java  |   2 +-
 .../apache/cayenne/modeler/action/PasteAction.java |   4 +-
 .../cayenne/modeler/action/ProjectAction.java      |   2 +-
 .../cayenne/modeler/action/ProjectOpener.java      |   2 +-
 .../cayenne/modeler/action/RemoveAction.java       |   2 +-
 .../modeler/action/RemoveAttributeAction.java      |   2 +-
 .../modeler/action/RemoveCallbackMethodAction.java |   2 +-
 .../action/RemoveProcedureParameterAction.java     |   2 +-
 .../modeler/action/RemoveRelationshipAction.java   |   2 +-
 .../modeler/action/ReverseEngineeringAction.java   |   6 +-
 .../cayenne/modeler/action/SaveAsAction.java       |   2 +-
 .../cayenne/modeler/action/SortNodesAction.java    |   2 +-
 .../cayenne/modeler/action/ValidateAction.java     |   2 +-
 .../modeler/action/dbimport/AddCatalogAction.java  |   2 +-
 .../action/dbimport/AddIncludeTableAction.java     |   2 +-
 .../action/dbimport/AddPatternParamAction.java     |   2 +-
 .../modeler/action/dbimport/AddSchemaAction.java   |   2 +-
 .../modeler/action/dbimport/DeleteNodeAction.java  |   2 +-
 .../action/dbimport/DragAndDropNodeAction.java     |   2 +-
 .../action/dbimport/MoveImportNodeAction.java      |   2 +-
 .../action/dbimport/TreeManipulationAction.java    |   2 +-
 .../db/load => dbimport}/DbImportProjectSaver.java |   2 +-
 .../db/load => dbimport}/DbLoaderContext.java      |   2 +-
 .../db/load => dbimport}/LoadDataMapTask.java      |   2 +-
 .../db/load => dbimport}/LoaderDelegate.java       |   2 +-
 .../load => dbimport}/ModelerDbImportAction.java   |   4 +-
 .../db/load => dbimport}/ModelerSyncModule.java    |   2 +-
 .../dialog/pref/EncodingPreferencesView.java       |  73 --------------
 .../dialog/pref/GeneralPreferencesController.java  | 112 ---------------------
 .../modeler/ui/CayenneModelerController.java       |   2 +-
 .../cayenne/modeler/ui/CayenneModelerFrame.java    |   2 +-
 .../modeler/{dialog => ui/about}/AboutDialog.java  |   2 +-
 .../InferRelationshipsController.java              |   2 +-
 .../autorelationship/InferRelationshipsDialog.java |   2 +-
 .../autorelationship/InferRelationshipsPanel.java  |   2 +-
 .../InferRelationshipsTabController.java           |   2 +-
 .../autorelationship/InferredRelationship.java     |   2 +-
 .../confirmremove}/ConfirmRemoveDialog.java        |   4 +-
 .../DataSourceWizardController.java                |   6 +-
 .../datasourcewizard}/DataSourceWizardView.java    |   4 +-
 .../dbactionoptions}/DbActionOptionsDialog.java    |   2 +-
 .../dbgen}/DBGeneratorOptionsController.java       |   6 +-
 .../gen => ui/dbgen}/DBGeneratorOptionsView.java   |   2 +-
 .../gen => ui/dbgen}/TableSelectorController.java  |   2 +-
 .../db/gen => ui/dbgen}/TableSelectorView.java     |   2 +-
 .../dbloadresult}/DbLoadResultDialog.java          |   2 +-
 .../dbmerge}/MergerOptionsController.java          |   4 +-
 .../db/merge => ui/dbmerge}/MergerOptionsView.java |   2 +-
 .../dbmerge}/MergerTokenSelectorController.java    |   2 +-
 .../dbmerge}/MergerTokenSelectorView.java          |   2 +-
 .../dbmerge}/MergerTokenTableModel.java            |   2 +-
 .../dbrelationship}/DbJoinTableModel.java          |   2 +-
 .../DbRelationshipDialogController.java            |   5 +-
 .../dbrelationship}/DbRelationshipDialogView.java  |   4 +-
 .../entitysync}/EntitySyncController.java          |   2 +-
 .../entitysync}/EntitySyncDialog.java              |   2 +-
 .../errordebug}/ErrorDebugDialog.java              |   3 +-
 .../filedeleted}/FileDeletedDialog.java            |   2 +-
 .../{dialog => ui/find}/FindDialogController.java  |   2 +-
 .../{dialog => ui/find}/FindDialogView.java        |   2 +-
 .../{dialog => ui/overwrite}/OverwriteDialog.java  |   2 +-
 .../preferences}/PreferenceDialogContext.java      |   2 +-
 .../preferences}/PreferenceDialogController.java   |   5 +-
 .../preferences}/PreferenceDialogView.java         |   2 +-
 .../classpath}/ClasspathPreferencesController.java |   4 +-
 .../classpath}/ClasspathPreferencesView.java       |   2 +-
 .../maven}/MavenDependencyDialogController.java    |   3 +-
 .../maven}/MavenDependencyDialogView.java          |   2 +-
 .../DBConnectionInfoEditorController.java          |   2 +-
 .../datasource}/DBConnectionInfoEditorView.java    |   2 +-
 .../DataSourcePreferencesController.java           |   6 +-
 .../datasource}/DataSourcePreferencesView.java     |   2 +-
 .../creator}/DataSourceCreatorController.java      |   3 +-
 .../datasource/creator}/DataSourceCreatorView.java |   2 +-
 .../DataSourceDuplicatorController.java            |   3 +-
 .../duplicator}/DataSourceDuplicatorView.java      |   2 +-
 .../general/GeneralPreferencesController.java}     |  97 ++++++++++++++----
 .../general}/GeneralPreferencesView.java           |  43 +++++++-
 .../editor/datadomain/cgen/CgenTabController.java  |   2 +-
 .../graph/action/RemoveEntityAction.java           |   2 +-
 .../editor/datamap/cgen/CgenController.java        |   2 +-
 .../editor/datamap/dbimport}/CatalogPopUpMenu.java |   2 +-
 .../datamap/dbimport/DatabaseSchemaLoader.java     |   2 +-
 .../datamap/dbimport/DbImportController.java       |   2 +-
 .../editor/datamap/dbimport/DbImportModel.java     |   2 +-
 .../editor/datamap/dbimport/DbImportSorter.java    |   2 +-
 .../editor/datamap/dbimport/DbImportTree.java      |   4 +-
 .../datamap/dbimport/DbImportTreeCellEditor.java   |   2 +-
 .../datamap/dbimport/DbImportTreeCellRenderer.java |   2 +-
 .../editor/datamap/dbimport/DbImportView.java      |   4 +-
 .../editor/datamap/dbimport}/DefaultPopUpMenu.java |   3 +-
 .../datamap/dbimport/DraggableTreePanel.java       |   4 +-
 .../datamap/dbimport}/IncludeTablePopUpMenu.java   |   2 +-
 .../datamap/dbimport/PrintColumnsBiFunction.java   |   2 +-
 .../datamap/dbimport/PrintTablesBiFunction.java    |   4 +-
 .../dbimport/ReverseEngineeringTreePanel.java      |  12 +--
 .../editor/datamap/dbimport}/RootPopUpMenu.java    |   2 +-
 .../editor/datamap/dbimport}/SchemaPopUpMenu.java  |   2 +-
 .../editor/datamap/dbimport/TreeToolbarPanel.java  |   2 +-
 .../datamap/dbimport/tree/ColorTreeRenderer.java   |   2 +-
 .../datamap/dbimport/tree}/DbImportTreeNode.java   |   2 +-
 .../datamap/dbimport/tree}/TransferableNode.java   |   2 +-
 .../editor/datanode/DataNodeEditorController.java  |   2 +-
 .../editor/dbentity/DbEntityRelationshipPanel.java |   2 +-
 .../relinfo/ObjRelationshipInfoController.java     |   2 +-
 .../querytype}/QueryTypeController.java            |   2 +-
 .../query => ui/querytype}/QueryTypeView.java      |   2 +-
 .../unsavedchanges}/UnsavedChangesDialog.java      |   2 +-
 .../ValidationResultBrowserController.java         |   2 +-
 .../ValidationResultBrowserView.java               |   2 +-
 .../validator/AttributeErrorMsg.java               |   2 +-
 .../{dialog => ui}/validator/DataMapErrorMsg.java  |   2 +-
 .../{dialog => ui}/validator/DataNodeErrorMsg.java |   2 +-
 .../{dialog => ui}/validator/DomainErrorMsg.java   |   2 +-
 .../validator/EmbeddableAttributeErrorMsg.java     |   2 +-
 .../validator/EmbeddableErrorMsg.java              |   2 +-
 .../{dialog => ui}/validator/EntityErrorMsg.java   |   2 +-
 .../validator/ProcedureErrorMsg.java               |   2 +-
 .../validator/ProcedureParameterErrorMsg.java      |   2 +-
 .../{dialog => ui}/validator/QueryErrorMsg.java    |   2 +-
 .../validator/RelationshipErrorMsg.java            |   2 +-
 .../validator/ValidationDisplayHandler.java        |   2 +-
 .../{dialog => ui}/validator/ValidatorDialog.java  |   2 +-
 .../{dialog => ui/warning}/WarningDialog.java      |   3 +-
 .../warning}/WarningDialogByDbTargetChange.java    |  15 +--
 .../welcome/RecentFileListModel.java               |   2 +-
 .../welcome/RecentFileListRenderer.java            |   2 +-
 .../{dialog => ui}/welcome/WelcomeScreen.java      |   2 +-
 .../modeler/undo/DbImportTreeUndoableEdit.java     |   2 +-
 .../apache/cayenne/modeler/util/CayenneAction.java |   2 +-
 .../cayenne/modeler/util/JTextFieldValidator.java  |   2 +-
 .../apache/cayenne/modeler/util/TextAdapter.java   |   2 +-
 .../editor/dbimport/DbImportSorterTest.java        |   2 +-
 150 files changed, 308 insertions(+), 386 deletions(-)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => dbimport}/DbImportProjectSaver.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => dbimport}/DbLoaderContext.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => dbimport}/LoadDataMapTask.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => dbimport}/LoaderDelegate.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => dbimport}/ModelerDbImportAction.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => dbimport}/ModelerSyncModule.java (97%)
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingPreferencesView.java
 delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesController.java
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/about}/AboutDialog.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/autorelationship/InferRelationshipsController.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/autorelationship/InferRelationshipsDialog.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/autorelationship/InferRelationshipsPanel.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/autorelationship/InferRelationshipsTabController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/autorelationship/InferredRelationship.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/confirmremove}/ConfirmRemoveDialog.java (96%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db => ui/datasourcewizard}/DataSourceWizardController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db => ui/datasourcewizard}/DataSourceWizardView.java (95%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db => ui/dbactionoptions}/DbActionOptionsDialog.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/gen => ui/dbgen}/DBGeneratorOptionsController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/gen => ui/dbgen}/DBGeneratorOptionsView.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/gen => ui/dbgen}/TableSelectorController.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/gen => ui/dbgen}/TableSelectorView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/dbloadresult}/DbLoadResultDialog.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/merge => ui/dbmerge}/MergerOptionsController.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/merge => ui/dbmerge}/MergerOptionsView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/merge => ui/dbmerge}/MergerTokenSelectorController.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/merge => ui/dbmerge}/MergerTokenSelectorView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/merge => ui/dbmerge}/MergerTokenTableModel.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/dbrelationship}/DbJoinTableModel.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/dbrelationship}/DbRelationshipDialogController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ => ui/dbrelationship}/DbRelationshipDialogView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/objentity => ui/entitysync}/EntitySyncController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/objentity => ui/entitysync}/EntitySyncDialog.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/errordebug}/ErrorDebugDialog.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/filedeleted}/FileDeletedDialog.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/find}/FindDialogController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/find}/FindDialogView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/overwrite}/OverwriteDialog.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences}/PreferenceDialogContext.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences}/PreferenceDialogController.java (93%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences}/PreferenceDialogView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/classpath}/ClasspathPreferencesController.java (96%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/classpath}/ClasspathPreferencesView.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/classpath/maven}/MavenDependencyDialogController.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/classpath/maven}/MavenDependencyDialogView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource}/DBConnectionInfoEditorController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource}/DBConnectionInfoEditorView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource}/DataSourcePreferencesController.java (95%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource}/DataSourcePreferencesView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource/creator}/DataSourceCreatorController.java (96%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource/creator}/DataSourceCreatorView.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource/duplicator}/DataSourceDuplicatorController.java (96%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/datasource/duplicator}/DataSourceDuplicatorView.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref/EncodingPreferencesController.java => ui/preferences/general/GeneralPreferencesController.java} (55%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/pref => ui/preferences/general}/GeneralPreferencesView.java (67%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/project/editor/datamap/dbimport}/CatalogPopUpMenu.java (94%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/project/editor/datamap/dbimport}/DefaultPopUpMenu.java (94%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/project/editor/datamap/dbimport}/IncludeTablePopUpMenu.java (95%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/project/editor/datamap/dbimport}/RootPopUpMenu.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/project/editor/datamap/dbimport}/SchemaPopUpMenu.java (94%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/project/editor/datamap/dbimport/tree}/DbImportTreeNode.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/db/load => ui/project/editor/datamap/dbimport/tree}/TransferableNode.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/query => ui/querytype}/QueryTypeController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog/query => ui/querytype}/QueryTypeView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/unsavedchanges}/UnsavedChangesDialog.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/validationbrowser}/ValidationResultBrowserController.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/validationbrowser}/ValidationResultBrowserView.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/AttributeErrorMsg.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/DataMapErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/DataNodeErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/DomainErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/EmbeddableAttributeErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/EmbeddableErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/EntityErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/ProcedureErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/ProcedureParameterErrorMsg.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/QueryErrorMsg.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/RelationshipErrorMsg.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/ValidationDisplayHandler.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/validator/ValidatorDialog.java (99%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/warning}/WarningDialog.java (94%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui/warning}/WarningDialogByDbTargetChange.java (94%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/welcome/RecentFileListModel.java (97%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/welcome/RecentFileListRenderer.java (98%)
 rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{dialog => ui}/welcome/WelcomeScreen.java (99%)


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

Posted by 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 7838927fa7d95e1406abee40d5151651371f84a6
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:55:11 2026 -0400

    Modeler refactoring - package per component
    
    * move remaining global component-dialogs to their own subpackages under ui/:
      - find/: FindDialogController/View
      - validationbrowser/: ValidationResultBrowserController/View
      - validator/: ValidatorDialog, ValidationDisplayHandler, 11 *ErrorMsg classes
      - welcome/: WelcomeScreen, RecentFileListModel, RecentFileListRenderer
      - querytype/: QueryTypeController/View
      - autorelationship/: InferRelationshipsController, InferRelationshipsDialog,
        InferRelationshipsPanel, InferRelationshipsTabController, InferredRelationship
      - entitysync/: EntitySyncController, EntitySyncDialog
      - dbrelationship/: consolidate DbRelationshipDialogView (was at modeler root)
        + DbRelationshipDialogController + DbJoinTableModel (from dialog/)
    * add imports in DbRelationshipDialogView (Application) and
      DbRelationshipDialogController (WarningDialogByDbTargetChange, still in
      dialog/ until 4d) for peers that were previously same-package
---
 .../java/org/apache/cayenne/modeler/action/CreateQueryAction.java    | 2 +-
 .../org/apache/cayenne/modeler/action/CreateRelationshipAction.java  | 2 +-
 .../java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java   | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/action/FindAction.java  | 2 +-
 .../org/apache/cayenne/modeler/action/InferRelationshipsAction.java  | 2 +-
 .../java/org/apache/cayenne/modeler/action/ObjEntitySyncAction.java  | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/action/PasteAction.java | 2 +-
 .../main/java/org/apache/cayenne/modeler/action/SaveAsAction.java    | 2 +-
 .../main/java/org/apache/cayenne/modeler/action/ValidateAction.java  | 2 +-
 .../java/org/apache/cayenne/modeler/ui/CayenneModelerController.java | 2 +-
 .../main/java/org/apache/cayenne/modeler/ui/CayenneModelerFrame.java | 2 +-
 .../autorelationship/InferRelationshipsController.java               | 2 +-
 .../{dialog => ui}/autorelationship/InferRelationshipsDialog.java    | 2 +-
 .../{dialog => ui}/autorelationship/InferRelationshipsPanel.java     | 2 +-
 .../autorelationship/InferRelationshipsTabController.java            | 2 +-
 .../{dialog => ui}/autorelationship/InferredRelationship.java        | 2 +-
 .../cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java       | 2 +-
 .../apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java   | 2 +-
 .../modeler/{dialog => ui/dbrelationship}/DbJoinTableModel.java      | 2 +-
 .../dbrelationship}/DbRelationshipDialogController.java              | 5 +++--
 .../modeler/{ => ui/dbrelationship}/DbRelationshipDialogView.java    | 4 +++-
 .../{dialog/objentity => ui/entitysync}/EntitySyncController.java    | 2 +-
 .../{dialog/objentity => ui/entitysync}/EntitySyncDialog.java        | 2 +-
 .../cayenne/modeler/{dialog => ui/find}/FindDialogController.java    | 2 +-
 .../apache/cayenne/modeler/{dialog => ui/find}/FindDialogView.java   | 2 +-
 .../ui/project/editor/dbentity/DbEntityRelationshipPanel.java        | 2 +-
 .../editor/objentity/relinfo/ObjRelationshipInfoController.java      | 2 +-
 .../modeler/{dialog/query => ui/querytype}/QueryTypeController.java  | 2 +-
 .../modeler/{dialog/query => ui/querytype}/QueryTypeView.java        | 2 +-
 .../validationbrowser}/ValidationResultBrowserController.java        | 2 +-
 .../validationbrowser}/ValidationResultBrowserView.java              | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/AttributeErrorMsg.java  | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/DataMapErrorMsg.java    | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/DataNodeErrorMsg.java   | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/DomainErrorMsg.java     | 2 +-
 .../{dialog => ui}/validator/EmbeddableAttributeErrorMsg.java        | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/EmbeddableErrorMsg.java | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/EntityErrorMsg.java     | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/ProcedureErrorMsg.java  | 2 +-
 .../modeler/{dialog => ui}/validator/ProcedureParameterErrorMsg.java | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/QueryErrorMsg.java      | 2 +-
 .../modeler/{dialog => ui}/validator/RelationshipErrorMsg.java       | 2 +-
 .../modeler/{dialog => ui}/validator/ValidationDisplayHandler.java   | 2 +-
 .../cayenne/modeler/{dialog => ui}/validator/ValidatorDialog.java    | 2 +-
 .../cayenne/modeler/{dialog => ui}/welcome/RecentFileListModel.java  | 2 +-
 .../modeler/{dialog => ui}/welcome/RecentFileListRenderer.java       | 2 +-
 .../apache/cayenne/modeler/{dialog => ui}/welcome/WelcomeScreen.java | 2 +-
 .../java/org/apache/cayenne/modeler/util/JTextFieldValidator.java    | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java   | 2 +-
 49 files changed, 53 insertions(+), 50 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
index 7bdfd4882..ffcd9e6b0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.query.QueryTypeController;
+import org.apache.cayenne.modeler.ui.querytype.QueryTypeController;
 import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
index aadc24cfd..b659b6f15 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.map.event.RelationshipEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.DbRelationshipDialogController;
+import org.apache.cayenne.modeler.ui.dbrelationship.DbRelationshipDialogController;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.relinfo.ObjRelationshipInfoController;
 import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
 import org.apache.cayenne.modeler.util.CayenneAction;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
index 4ba31dda2..b9c181712 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.objentity.EntitySyncController;
+import org.apache.cayenne.modeler.ui.entitysync.EntitySyncController;
 import org.apache.cayenne.modeler.undo.DbEntitySyncUndoableEdit;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
index f22873dac..03a47d5a4 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/FindAction.java
@@ -44,7 +44,7 @@ import org.apache.cayenne.modeler.ui.CayenneModelerFrame;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.tree.ProjectTreeModel;
 import org.apache.cayenne.modeler.ui.project.tree.ProjectTreeView;
-import org.apache.cayenne.modeler.dialog.FindDialogController;
+import org.apache.cayenne.modeler.ui.find.FindDialogController;
 import org.apache.cayenne.modeler.ui.project.ProjectView;
 import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
 import org.apache.cayenne.modeler.event.display.EmbeddableAttributeDisplayEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java
index f0aa37ede..0770e1611 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java
@@ -20,7 +20,7 @@ package org.apache.cayenne.modeler.action;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.autorelationship.InferRelationshipsController;
+import org.apache.cayenne.modeler.ui.autorelationship.InferRelationshipsController;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
 import java.awt.event.ActionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntitySyncAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntitySyncAction.java
index 294950bd3..c1800d712 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntitySyncAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ObjEntitySyncAction.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.objentity.EntitySyncController;
+import org.apache.cayenne.modeler.ui.entitysync.EntitySyncController;
 import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index 01fbcf820..c1d30e7de 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -40,7 +40,7 @@ import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
-import org.apache.cayenne.modeler.dialog.query.QueryTypeController;
+import org.apache.cayenne.modeler.ui.querytype.QueryTypeController;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjCallbackMethod;
 import org.apache.cayenne.modeler.event.model.CallbackMethodEvent;
 import org.apache.cayenne.modeler.undo.PasteCompoundUndoableEdit;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
index a9e9fb1d8..25768ebcf 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SaveAsAction.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.configuration.ConfigurationNode;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
+import org.apache.cayenne.modeler.ui.validator.ValidatorDialog;
 import org.apache.cayenne.modeler.event.model.ProjectOnSaveEvent;
 import org.apache.cayenne.modeler.event.model.ProjectSavedEvent;
 import org.apache.cayenne.modeler.util.CayenneAction;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java
index 875f61944..b0429cae2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ValidateAction.java
@@ -20,7 +20,7 @@
 package org.apache.cayenne.modeler.action;
 
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
+import org.apache.cayenne.modeler.ui.validator.ValidatorDialog;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.project.validation.ProjectValidator;
 import org.apache.cayenne.validation.ValidationResult;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerController.java
index 9c6d203df..cc36361ef 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerController.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.ProjectView;
 import org.apache.cayenne.modeler.action.ExitAction;
 import org.apache.cayenne.modeler.action.OpenProjectAction;
-import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
+import org.apache.cayenne.modeler.ui.validator.ValidatorDialog;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportController;
 import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
 import org.apache.cayenne.modeler.mvc.RootController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerFrame.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerFrame.java
index 5cfc3ff4d..2d49c091e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerFrame.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/CayenneModelerFrame.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.ui;
 import org.apache.cayenne.modeler.ui.project.ProjectView;
 import org.apache.cayenne.modeler.action.*;
 import org.apache.cayenne.modeler.ui.logconsole.LogConsoleController;
-import org.apache.cayenne.modeler.dialog.welcome.WelcomeScreen;
+import org.apache.cayenne.modeler.ui.welcome.WelcomeScreen;
 import org.apache.cayenne.modeler.event.model.RecentFileListListener;
 import org.apache.cayenne.modeler.pref.ComponentGeometry;
 import org.apache.cayenne.modeler.util.ModelerUtil;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsController.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsController.java
index e230e2f4d..7bb385768 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsController.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.autorelationship;
+package org.apache.cayenne.modeler.ui.autorelationship;
 
 import org.apache.cayenne.dbsync.naming.ObjectNameGenerator;
 import org.apache.cayenne.map.DataMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java
index 4c995a51c..543889799 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.autorelationship;
+package org.apache.cayenne.modeler.ui.autorelationship;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.util.NameGeneratorPreferences;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java
index 4c647e719..69d7baab9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsPanel.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.autorelationship;
+package org.apache.cayenne.modeler.ui.autorelationship;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java
index a8cb9417e..703917623 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferRelationshipsTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsTabController.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.autorelationship;
+package org.apache.cayenne.modeler.ui.autorelationship;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.util.TableSizer;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferredRelationship.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferredRelationship.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java
index 0ad4b5c43..956dd3de1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/autorelationship/InferredRelationship.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferredRelationship.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.autorelationship;
+package org.apache.cayenne.modeler.ui.autorelationship;
 
 import org.apache.cayenne.map.DbAttribute;
 import org.apache.cayenne.map.DbEntity;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
index 3e0858f5a..b0acc7580 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.log.NoopJdbcEventLogger;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ValidationResultBrowserController;
+import org.apache.cayenne.modeler.ui.validationbrowser.ValidationResultBrowserController;
 import org.apache.cayenne.modeler.ui.datasourcewizard.DataSourceWizardController;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java
index 0f8a1e2d1..7f2cb53ba 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java
@@ -45,7 +45,7 @@ import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ValidationResultBrowserController;
+import org.apache.cayenne.modeler.ui.validationbrowser.ValidationResultBrowserController;
 import org.apache.cayenne.modeler.event.model.DataMapEvent;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java
index c09a83f4b..cf8e53311 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbJoinTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbJoinTableModel.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.dbrelationship;
 
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbJoin;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbRelationshipDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbRelationshipDialogController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
index ca36292b6..00ec5910b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/DbRelationshipDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
@@ -17,8 +17,9 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.dbrelationship;
 
+import org.apache.cayenne.modeler.dialog.WarningDialogByDbTargetChange;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.dbsync.naming.NameBuilder;
@@ -28,7 +29,7 @@ import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.map.event.RelationshipEvent;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.DbRelationshipDialogView;
+import org.apache.cayenne.modeler.ui.dbrelationship.DbRelationshipDialogView;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
 import org.apache.cayenne.modeler.mvc.ChildController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/DbRelationshipDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/DbRelationshipDialogView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogView.java
index d17eb1a9b..d13457b9b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/DbRelationshipDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogView.java
@@ -17,7 +17,9 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler;
+package org.apache.cayenne.modeler.ui.dbrelationship;
+
+import org.apache.cayenne.modeler.Application;
 
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncController.java
index 09d34dafa..bba1ddf38 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncController.java
@@ -17,7 +17,7 @@
  *    under the License.
  */
 
-package org.apache.cayenne.modeler.dialog.objentity;
+package org.apache.cayenne.modeler.ui.entitysync;
 
 import org.apache.cayenne.dbsync.filter.NamePatternMatcher;
 import org.apache.cayenne.dbsync.merge.context.EntityMergeSupport;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java
index 17103acbf..552db4bc0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/EntitySyncDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.objentity;
+package org.apache.cayenne.modeler.ui.entitysync;
 
 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/FindDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogController.java
index cd8f8a958..568920d97 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogController.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.find;
 
 import org.apache.cayenne.modeler.action.FindAction;
 import org.apache.cayenne.modeler.mvc.ChildController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java
index 70a1230bc..f18dbced9 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FindDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.find;
 
 import org.apache.cayenne.modeler.action.FindAction;
 import org.apache.cayenne.modeler.util.CellRenderers;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
index e61709474..5a551aefe 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityRelationshipPanel.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.modeler.action.CopyAttributeRelationshipAction;
 import org.apache.cayenne.modeler.action.CutAttributeRelationshipAction;
 import org.apache.cayenne.modeler.action.PasteAction;
 import org.apache.cayenne.modeler.action.RemoveAttributeRelationshipAction;
-import org.apache.cayenne.modeler.dialog.DbRelationshipDialogController;
+import org.apache.cayenne.modeler.ui.dbrelationship.DbRelationshipDialogController;
 import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
 import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
 import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
index c6044dfef..66013da78 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.map.event.RelationshipEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.DbRelationshipDialogController;
+import org.apache.cayenne.modeler.ui.dbrelationship.DbRelationshipDialogController;
 import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.undo.CreateRelationshipUndoableEdit;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/querytype/QueryTypeController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/querytype/QueryTypeController.java
index d344d9c4b..8d5b330af 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/querytype/QueryTypeController.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.query;
+package org.apache.cayenne.modeler.ui.querytype;
 
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.dbsync.naming.NameBuilder;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/querytype/QueryTypeView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/querytype/QueryTypeView.java
index 440653ea7..f02e3a3d0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryTypeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/querytype/QueryTypeView.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.query;
+package org.apache.cayenne.modeler.ui.querytype;
 
 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/ValidationResultBrowserController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validationbrowser/ValidationResultBrowserController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validationbrowser/ValidationResultBrowserController.java
index e3706044b..7a69cc5ae 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validationbrowser/ValidationResultBrowserController.java
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.validationbrowser;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.mvc.RootController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validationbrowser/ValidationResultBrowserView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validationbrowser/ValidationResultBrowserView.java
index d78ffc59b..94cc25f85 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ValidationResultBrowserView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validationbrowser/ValidationResultBrowserView.java
@@ -18,7 +18,7 @@
  ****************************************************************/
 
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.validationbrowser;
 
 import javax.swing.JButton;
 import javax.swing.JComponent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/AttributeErrorMsg.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/AttributeErrorMsg.java
index a68772232..5a21089e9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/AttributeErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/AttributeErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DataMapErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DataMapErrorMsg.java
index 2dc72d821..c284c4db8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataMapErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DataMapErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DataNodeErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DataNodeErrorMsg.java
index c4b4bf1ab..bf717f1c0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DataNodeErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DataNodeErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DomainErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DomainErrorMsg.java
index ee2a22ec8..195308a15 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/DomainErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/DomainErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EmbeddableAttributeErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EmbeddableAttributeErrorMsg.java
index 61f400ced..636ec7dd6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableAttributeErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EmbeddableAttributeErrorMsg.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EmbeddableErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EmbeddableErrorMsg.java
index f83bfb1be..5cbeb8c1c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EmbeddableErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EmbeddableErrorMsg.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EntityErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EntityErrorMsg.java
index e750c5689..53337f151 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/EntityErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/EntityErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ProcedureErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ProcedureErrorMsg.java
index 88ffc1cac..9a01851aa 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ProcedureErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ProcedureParameterErrorMsg.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ProcedureParameterErrorMsg.java
index 85dc11032..e506f366a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ProcedureParameterErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ProcedureParameterErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/QueryErrorMsg.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/QueryErrorMsg.java
index 600312035..1737fa7a2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/QueryErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/QueryErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/RelationshipErrorMsg.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/RelationshipErrorMsg.java
index 25d6cabca..30b6bc429 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/RelationshipErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/RelationshipErrorMsg.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ValidationDisplayHandler.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ValidationDisplayHandler.java
index a15e9fc04..3612d823e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidationDisplayHandler.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ValidationDisplayHandler.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ValidatorDialog.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ValidatorDialog.java
index 7216b5cba..0e09651c9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/validator/ValidatorDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validator/ValidatorDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.validator;
+package org.apache.cayenne.modeler.ui.validator;
 
 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/welcome/RecentFileListModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/RecentFileListModel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java
index d3818815a..638f86fb4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/RecentFileListModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListModel.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.welcome;
+package org.apache.cayenne.modeler.ui.welcome;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/RecentFileListRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/RecentFileListRenderer.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java
index 83eb05fc2..fc756e55a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/RecentFileListRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/RecentFileListRenderer.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.welcome;
+package org.apache.cayenne.modeler.ui.welcome;
 
 import java.awt.Color;
 import java.awt.Component;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/WelcomeScreen.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/WelcomeScreen.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
index 18851bd91..7662888ff 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/welcome/WelcomeScreen.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreen.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.welcome;
+package org.apache.cayenne.modeler.ui.welcome;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ModelerPreferences;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JTextFieldValidator.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JTextFieldValidator.java
index 56f3f4931..12bfc930e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JTextFieldValidator.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/JTextFieldValidator.java
@@ -18,7 +18,7 @@
  ****************************************************************/
 package org.apache.cayenne.modeler.util;
 
-import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
+import org.apache.cayenne.modeler.ui.validator.ValidatorDialog;
 
 import javax.swing.JTextField;
 import java.awt.event.FocusEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java
index c7750b23f..56aa4264c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/TextAdapter.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.modeler.util;
 
-import org.apache.cayenne.modeler.dialog.validator.ValidatorDialog;
+import org.apache.cayenne.modeler.ui.validator.ValidatorDialog;
 import org.apache.cayenne.modeler.undo.JTextFieldUndoListener;
 import org.apache.cayenne.validation.ValidationException;
 


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

Posted by 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 9739e2f2390a2fff0043dace3cf4fdaedc4151a2
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:56:39 2026 -0400

    Modeler refactoring - package per component
---
 .../classpath/ClasspathPreferencesController.java           |  2 +-
 .../maven/MavenDependencyDialogController.java              |  2 +-
 .../{ => classpath}/maven/MavenDependencyDialogView.java    |  2 +-
 .../modeler/ui/warning/WarningDialogByDbTargetChange.java   | 13 ++++---------
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java
index 52a7f23b5..e8eee4853 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.ui.preferences.classpath;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
-import org.apache.cayenne.modeler.ui.preferences.maven.MavenDependencyDialogController;
+import org.apache.cayenne.modeler.ui.preferences.classpath.maven.MavenDependencyDialogController;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialogController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialogController.java
index 90f6c2b0e..a84f846cb 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialogController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.ui.preferences.maven;
+package org.apache.cayenne.modeler.ui.preferences.classpath.maven;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.mvc.ChildController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialogView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialogView.java
index e4cc427b7..f01353942 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialogView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.ui.preferences.maven;
+package org.apache.cayenne.modeler.ui.preferences.classpath.maven;
 
 import java.awt.BorderLayout;
 import java.awt.Dialog;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialogByDbTargetChange.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialogByDbTargetChange.java
index 2ddb8f607..e9a72faf8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialogByDbTargetChange.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialogByDbTargetChange.java
@@ -19,15 +19,6 @@
 
 package org.apache.cayenne.modeler.ui.warning;
 
-import javax.swing.DefaultListModel;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import java.awt.BorderLayout;
-import java.util.Collection;
-
 import org.apache.cayenne.map.DbRelationship;
 import org.apache.cayenne.map.ObjAttribute;
 import org.apache.cayenne.map.ObjRelationship;
@@ -35,6 +26,10 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.util.ProjectUtil;
 
+import javax.swing.*;
+import java.awt.*;
+import java.util.Collection;
+
 /**
  * @since 4.0
  */


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

Posted by 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 9072e0e2655912311f1f149451205854e94aa273
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:53:18 2026 -0400

    Modeler refactoring - package per component
    
    * move DataSourceWizard* from dialog/db/ to ui/datasourcewizard/
    * move dialog/db/gen/** to ui/dbgen/
    * move dialog/db/merge/** to ui/dbmerge/
    * move DbLoadResultDialog (only) from dialog/db/load/ to ui/dbloadresult/
    * move DbActionOptionsDialog to ui/dbactionoptions/
    * add DbLoadResultDialog import in ModelerDbImportAction (was in same package)
    
    Leaving behind in dialog/db/load/: task/action/model classes that are not UI
    components (DbImportProjectSaver, DbLoaderContext, LoadDataMapTask,
    LoaderDelegate, ModelerDbImportAction, ModelerSyncModule, TransferableNode,
    DbImportTreeNode, and the 4 PopUpMenu classes) — their relocation to
    modeler.dbimport or similar is a follow-up, not part of this UI refactor.
---
 .../org/apache/cayenne/modeler/action/DBConnectionAwareAction.java  | 2 +-
 .../java/org/apache/cayenne/modeler/action/GenerateDBAction.java    | 2 +-
 .../org/apache/cayenne/modeler/action/GetDbConnectionAction.java    | 2 +-
 .../main/java/org/apache/cayenne/modeler/action/MigrateAction.java  | 6 +++---
 .../org/apache/cayenne/modeler/action/ReverseEngineeringAction.java | 2 +-
 .../cayenne/modeler/dialog/db/load/ModelerDbImportAction.java       | 2 ++
 .../db => ui/datasourcewizard}/DataSourceWizardController.java      | 2 +-
 .../{dialog/db => ui/datasourcewizard}/DataSourceWizardView.java    | 2 +-
 .../{dialog/db => ui/dbactionoptions}/DbActionOptionsDialog.java    | 2 +-
 .../{dialog/db/gen => ui/dbgen}/DBGeneratorOptionsController.java   | 4 ++--
 .../modeler/{dialog/db/gen => ui/dbgen}/DBGeneratorOptionsView.java | 2 +-
 .../{dialog/db/gen => ui/dbgen}/TableSelectorController.java        | 2 +-
 .../modeler/{dialog/db/gen => ui/dbgen}/TableSelectorView.java      | 2 +-
 .../{dialog/db/load => ui/dbloadresult}/DbLoadResultDialog.java     | 2 +-
 .../{dialog/db/merge => ui/dbmerge}/MergerOptionsController.java    | 2 +-
 .../modeler/{dialog/db/merge => ui/dbmerge}/MergerOptionsView.java  | 2 +-
 .../db/merge => ui/dbmerge}/MergerTokenSelectorController.java      | 2 +-
 .../{dialog/db/merge => ui/dbmerge}/MergerTokenSelectorView.java    | 2 +-
 .../{dialog/db/merge => ui/dbmerge}/MergerTokenTableModel.java      | 2 +-
 .../ui/project/editor/datamap/dbimport/DbImportController.java      | 2 +-
 20 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBConnectionAwareAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBConnectionAwareAction.java
index f8d435c56..2c792b7de 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBConnectionAwareAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DBConnectionAwareAction.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.action;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.DataSourceWizardController;
+import org.apache.cayenne.modeler.ui.datasourcewizard.DataSourceWizardController;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 import org.apache.cayenne.modeler.pref.DataMapDefaults;
 import org.apache.cayenne.modeler.util.CayenneAction;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GenerateDBAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GenerateDBAction.java
index 3e6d34d01..e1f499436 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GenerateDBAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GenerateDBAction.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.gen.DBGeneratorOptionsController;
+import org.apache.cayenne.modeler.ui.dbgen.DBGeneratorOptionsController;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.project.Project;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GetDbConnectionAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GetDbConnectionAction.java
index 5b392a31b..ab5d57848 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GetDbConnectionAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/GetDbConnectionAction.java
@@ -20,7 +20,7 @@
 package org.apache.cayenne.modeler.action;
 
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.DataSourceWizardController;
+import org.apache.cayenne.modeler.ui.datasourcewizard.DataSourceWizardController;
 
 import java.awt.event.ActionEvent;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java
index c294e33b3..8f82914ef 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java
@@ -23,9 +23,9 @@ import org.apache.cayenne.dbsync.merge.factory.MergerTokenFactoryProvider;
 import org.apache.cayenne.dbsync.reverse.dbload.DbLoader;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.DataSourceWizardController;
-import org.apache.cayenne.modeler.dialog.db.DbActionOptionsDialog;
-import org.apache.cayenne.modeler.dialog.db.merge.MergerOptionsController;
+import org.apache.cayenne.modeler.ui.datasourcewizard.DataSourceWizardController;
+import org.apache.cayenne.modeler.ui.dbactionoptions.DbActionOptionsDialog;
+import org.apache.cayenne.modeler.ui.dbmerge.MergerOptionsController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
index 0a89c482a..66801bf2c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.action;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbLoadResultDialog;
+import org.apache.cayenne.modeler.ui.dbloadresult.DbLoadResultDialog;
 import org.apache.cayenne.modeler.dialog.db.load.DbLoaderContext;
 import org.apache.cayenne.modeler.dialog.db.load.LoadDataMapTask;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
index 03de4ebbb..f1c606e08 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
@@ -19,6 +19,8 @@
 
 package org.apache.cayenne.modeler.dialog.db.load;
 
+import org.apache.cayenne.modeler.ui.dbloadresult.DbLoadResultDialog;
+
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.util.Collection;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasourcewizard/DataSourceWizardController.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasourcewizard/DataSourceWizardController.java
index d7fb64bfa..6394a50ca 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasourcewizard/DataSourceWizardController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db;
+package org.apache.cayenne.modeler.ui.datasourcewizard;
 
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.modeler.ClassLoadingService;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasourcewizard/DataSourceWizardView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasourcewizard/DataSourceWizardView.java
index db3941770..dd3f47ebe 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasourcewizard/DataSourceWizardView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db;
+package org.apache.cayenne.modeler.ui.datasourcewizard;
 
 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/db/DbActionOptionsDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbActionOptionsDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java
index e9fed2f4f..e050c8ca5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbActionOptionsDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbactionoptions/DbActionOptionsDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db;
+package org.apache.cayenne.modeler.ui.dbactionoptions;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptionsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptionsController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
index 8e509f428..3e0858f5a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptionsController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.gen;
+package org.apache.cayenne.modeler.ui.dbgen;
 
 import org.apache.cayenne.access.DbGenerator;
 import org.apache.cayenne.dba.DbAdapter;
@@ -25,7 +25,7 @@ import org.apache.cayenne.log.NoopJdbcEventLogger;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.dialog.ValidationResultBrowserController;
-import org.apache.cayenne.modeler.dialog.db.DataSourceWizardController;
+import org.apache.cayenne.modeler.ui.datasourcewizard.DataSourceWizardController;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 import org.apache.cayenne.modeler.pref.DBGeneratorDefaults;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptionsView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptionsView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java
index 8f5eff690..d91a36214 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/DBGeneratorOptionsView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.gen;
+package org.apache.cayenne.modeler.ui.dbgen;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorController.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorController.java
index 580ec0b52..909d0dcd8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.gen;
+package org.apache.cayenne.modeler.ui.dbgen;
 
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbAttribute;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorView.java
index 785b97c51..60af77741 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/gen/TableSelectorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.gen;
+package org.apache.cayenne.modeler.ui.dbgen;
 
 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/db/load/DbLoadResultDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbloadresult/DbLoadResultDialog.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbloadresult/DbLoadResultDialog.java
index 2e83d63cf..c009f10c5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbloadresult/DbLoadResultDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.dbloadresult;
 
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptionsController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptionsController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java
index 40b14e5c0..0f8a1e2d1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptionsController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.merge;
+package org.apache.cayenne.modeler.ui.dbmerge;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.dba.DbAdapter;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptionsView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptionsView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java
index 475c86106..91fd1f4c5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerOptionsView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.merge;
+package org.apache.cayenne.modeler.ui.dbmerge;
 
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.factories.Borders;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorController.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorController.java
index 968415a0e..dc28e36ec 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.merge;
+package org.apache.cayenne.modeler.ui.dbmerge;
 
 import org.apache.cayenne.dbsync.merge.context.MergeDirection;
 import org.apache.cayenne.dbsync.merge.token.MergerToken;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorView.java
index 4f3402775..6d09c1343 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenSelectorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.merge;
+package org.apache.cayenne.modeler.ui.dbmerge;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenTableModel.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java
index 638222eaf..407653c8a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/merge/MergerTokenTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenTableModel.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.merge;
+package org.apache.cayenne.modeler.ui.dbmerge;
 
 import org.apache.cayenne.dbsync.merge.context.MergeDirection;
 import org.apache.cayenne.dbsync.merge.token.MergerToken;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportController.java
index f6c5983e1..374e1f776 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportController.java
@@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentMap;
 import org.apache.cayenne.modeler.event.model.DataMapEvent;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbLoadResultDialog;
+import org.apache.cayenne.modeler.ui.dbloadresult.DbLoadResultDialog;
 
 /**
  * @since 4.1


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

Posted by 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 3abbfd9ea423b9a1c5258df150344a5ade19b626
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:51:27 2026 -0400

    Modeler refactoring - package per component
    
    * move dialog/pref/** to ui/preferences/ with subpackage split:
      - root: PreferenceDialogController/View/Context
      - general/: GeneralPreferences*
      - encoding/: EncodingPreferences*
      - classpath/: ClasspathPreferences*
      - datasource/: DataSourcePreferences*, DBConnectionInfoEditor*
        - creator/: DataSourceCreator*
        - duplicator/: DataSourceDuplicator*
      - maven/: MavenDependencyDialog*
    * add cross-subpackage imports where siblings reference each other
      (PreferenceDialogController referencing sub-controllers; sub-controllers
      referencing PreferenceDialogController parent; General↔Encoding sibling
      pair; DataSource↔creator/duplicator parent-child; Classpath↔Maven)
---
 .../src/main/java/org/apache/cayenne/modeler/Application.java       | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/Main.java              | 2 +-
 .../apache/cayenne/modeler/action/ConfigurePreferencesAction.java   | 2 +-
 .../java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java | 2 +-
 .../cayenne/modeler/dialog/db/DataSourceWizardController.java       | 4 ++--
 .../org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.java  | 2 +-
 .../{dialog/pref => ui/preferences}/PreferenceDialogContext.java    | 2 +-
 .../{dialog/pref => ui/preferences}/PreferenceDialogController.java | 5 ++++-
 .../{dialog/pref => ui/preferences}/PreferenceDialogView.java       | 2 +-
 .../preferences/classpath}/ClasspathPreferencesController.java      | 4 +++-
 .../pref => ui/preferences/classpath}/ClasspathPreferencesView.java | 2 +-
 .../preferences/datasource}/DBConnectionInfoEditorController.java   | 2 +-
 .../preferences/datasource}/DBConnectionInfoEditorView.java         | 2 +-
 .../preferences/datasource}/DataSourcePreferencesController.java    | 6 +++++-
 .../preferences/datasource}/DataSourcePreferencesView.java          | 2 +-
 .../datasource/creator}/DataSourceCreatorController.java            | 3 ++-
 .../preferences/datasource/creator}/DataSourceCreatorView.java      | 2 +-
 .../datasource/duplicator}/DataSourceDuplicatorController.java      | 3 ++-
 .../datasource/duplicator}/DataSourceDuplicatorView.java            | 2 +-
 .../preferences/encoding}/EncodingPreferencesController.java        | 3 ++-
 .../pref => ui/preferences/encoding}/EncodingPreferencesView.java   | 2 +-
 .../preferences/general}/GeneralPreferencesController.java          | 5 ++++-
 .../pref => ui/preferences/general}/GeneralPreferencesView.java     | 4 +++-
 .../preferences/maven}/MavenDependencyDialogController.java         | 3 ++-
 .../pref => ui/preferences/maven}/MavenDependencyDialogView.java    | 2 +-
 .../ui/project/editor/datadomain/cgen/CgenTabController.java        | 2 +-
 .../modeler/ui/project/editor/datamap/cgen/CgenController.java      | 2 +-
 .../ui/project/editor/datanode/DataNodeEditorController.java        | 2 +-
 28 files changed, 47 insertions(+), 29 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 f10be9b21..192ac00ab 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
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.Inject;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.modeler.action.ActionManager;
 import org.apache.cayenne.modeler.ui.logconsole.LogConsoleController;
-import org.apache.cayenne.modeler.dialog.pref.ClasspathPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesController;
 import org.apache.cayenne.modeler.ui.CayenneModelerController;
 import org.apache.cayenne.modeler.ui.CayenneModelerFrame;
 import org.apache.cayenne.modeler.undo.CayenneUndoManager;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
index 48820a26d..c404b619e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/Main.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.di.DIBootstrap;
 import org.apache.cayenne.di.Injector;
 import org.apache.cayenne.di.Module;
 import org.apache.cayenne.modeler.action.OpenProjectAction;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.init.CayenneModelerModule;
 import org.apache.cayenne.modeler.init.platform.PlatformInitializer;
 import org.apache.cayenne.project.ProjectModule;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
index c9169ef1d..1dc11c002 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.action;
 import java.awt.event.ActionEvent;
 
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.pref.PreferenceDialogController;
+import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
index e8f56042a..f612ff464 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
@@ -24,7 +24,7 @@ import javax.swing.JCheckBox;
 import javax.swing.JOptionPane;
 
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 
 /**
  * Used to confirm deleting items in the model.
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
index da19160bc..d7fb64bfa 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardController.java
@@ -22,8 +22,8 @@ package org.apache.cayenne.modeler.dialog.db;
 import org.apache.cayenne.dba.DbAdapter;
 import org.apache.cayenne.modeler.ClassLoadingService;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
-import org.apache.cayenne.modeler.dialog.pref.PreferenceDialogController;
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
 import org.apache.cayenne.modeler.event.model.DataSourceEvent;
 import org.apache.cayenne.modeler.event.model.DataSourceListener;
 import org.apache.cayenne.modeler.mvc.ChildController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.java
index 52b7ba06c..db3941770 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DataSourceWizardView.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.dialog.pref.DBConnectionInfoEditorController;
+import org.apache.cayenne.modeler.ui.preferences.datasource.DBConnectionInfoEditorController;
 import org.apache.cayenne.modeler.mvc.RootController;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogContext.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogContext.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogContext.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogContext.java
index 96e8426ee..ca8ffbda9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogContext.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogContext.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java
similarity index 93%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java
index 12632c6ee..7e620dd04 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java
@@ -17,10 +17,13 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.mvc.RootController;
+import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.datasource.DataSourcePreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java
index a4d0afee8..6679a9b46 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/PreferenceDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences;
 
 import org.apache.cayenne.swing.components.TopBorder;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java
index a50a50e2a..52a7f23b5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java
@@ -17,9 +17,11 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.classpath;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
+import org.apache.cayenne.modeler.ui.preferences.maven.MavenDependencyDialogController;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesView.java
index e1da598cf..c98aed16f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/ClasspathPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.classpath;
 
 import java.awt.BorderLayout;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DBConnectionInfoEditorController.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DBConnectionInfoEditorController.java
index 88fc2fc51..d1562c71d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DBConnectionInfoEditorController.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.mvc.RootController;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DBConnectionInfoEditorView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DBConnectionInfoEditorView.java
index 56b4581db..514b40d3d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DBConnectionInfoEditorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DBConnectionInfoEditorView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource;
 
 import java.awt.BorderLayout;
 import java.util.ArrayList;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DataSourcePreferencesController.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DataSourcePreferencesController.java
index d0db9f2c8..d6f0af4a6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DataSourcePreferencesController.java
@@ -17,8 +17,12 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource;
 
+import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
+import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.datasource.creator.DataSourceCreatorController;
+import org.apache.cayenne.modeler.ui.preferences.datasource.duplicator.DataSourceDuplicatorController;
 import org.apache.cayenne.datasource.DriverDataSource;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.FileClassLoadingService;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DataSourcePreferencesView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DataSourcePreferencesView.java
index 3887323ca..01eb2522f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourcePreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/DataSourcePreferencesView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource;
 
 import java.awt.BorderLayout;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreatorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/creator/DataSourceCreatorController.java
similarity index 96%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreatorController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/creator/DataSourceCreatorController.java
index 6cc80f1d8..459e7903f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreatorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/creator/DataSourceCreatorController.java
@@ -17,9 +17,10 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource.creator;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.ui.preferences.datasource.DataSourcePreferencesController;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 import org.apache.cayenne.modeler.util.AdapterMapping;
 import org.apache.cayenne.modeler.util.DbAdapterInfo;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreatorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/creator/DataSourceCreatorView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreatorView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/creator/DataSourceCreatorView.java
index 3954fc5e2..3a281e590 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceCreatorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/creator/DataSourceCreatorView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource.creator;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicatorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/duplicator/DataSourceDuplicatorController.java
similarity index 96%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicatorController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/duplicator/DataSourceDuplicatorController.java
index e3a0f730f..5344ec512 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicatorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/duplicator/DataSourceDuplicatorController.java
@@ -17,9 +17,10 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource.duplicator;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.ui.preferences.datasource.DataSourcePreferencesController;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicatorView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/duplicator/DataSourceDuplicatorView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicatorView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/duplicator/DataSourceDuplicatorView.java
index 741581d84..112990bdc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/DataSourceDuplicatorView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/datasource/duplicator/DataSourceDuplicatorView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.datasource.duplicator;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesController.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingPreferencesController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesController.java
index ce7edbb24..74acaad72 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesController.java
@@ -18,9 +18,10 @@
  ****************************************************************/
 
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.encoding;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.*;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesView.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingPreferencesView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesView.java
index 8958d0f10..2a411ebbc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/EncodingPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.encoding;
 
 import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.layout.FormLayout;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
similarity index 93%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
index a6eddb6f6..7fa2b2e1e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
@@ -17,9 +17,12 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.general;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
+import org.apache.cayenne.modeler.ui.preferences.encoding.EncodingPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.encoding.EncodingPreferencesView;
 
 import java.awt.*;
 import java.util.HashMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
index a08cca920..7bf8e5c9e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/GeneralPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
@@ -17,7 +17,9 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.general;
+
+import org.apache.cayenne.modeler.ui.preferences.encoding.EncodingPreferencesView;
 
 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/pref/MavenDependencyDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogController.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/MavenDependencyDialogController.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogController.java
index 9907879e6..90f6c2b0e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/MavenDependencyDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogController.java
@@ -17,10 +17,11 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.maven;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.mvc.ChildController;
+import org.apache.cayenne.modeler.ui.preferences.classpath.ClasspathPreferencesController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/MavenDependencyDialogView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogView.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/MavenDependencyDialogView.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogView.java
index 6dea331c3..e4cc427b7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/MavenDependencyDialogView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/maven/MavenDependencyDialogView.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.pref;
+package org.apache.cayenne.modeler.ui.preferences.maven;
 
 import java.awt.BorderLayout;
 import java.awt.Dialog;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/CgenTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/CgenTabController.java
index a9cddee63..161c95cc3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/CgenTabController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/CgenTabController.java
@@ -32,7 +32,7 @@ import org.apache.cayenne.gen.ClassGenerationActionFactory;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.ui.project.editor.datadomain.GeneratorsTabController;
 import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
 import org.apache.cayenne.modeler.util.ModelerUtil;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
index ebc0b5ea0..d3efe1d4e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenController.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.map.event.EmbeddableListener;
 import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.map.event.ObjEntityListener;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.pref.GeneralPreferencesController;
+import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportController;
 import org.apache.cayenne.modeler.event.model.DataMapEvent;
 import org.apache.cayenne.modeler.event.model.DataMapListener;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorController.java
index f9cecc046..7af39c6d9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorController.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.access.dbsync.ThrowOnPartialSchemaStrategy;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.configuration.DataNodeDescriptor;
 import org.apache.cayenne.configuration.runtime.XMLPoolingDataSourceFactory;
-import org.apache.cayenne.modeler.dialog.pref.PreferenceDialogController;
+import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
 import org.apache.cayenne.modeler.event.model.DataNodeEvent;
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;


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

Posted by 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 fbc9186bde1589b99a5a2d017e9394a2da6d1076
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:56:39 2026 -0400

    Modeler refactoring - package per component
---
 .../apache/cayenne/modeler/action/LoadDbSchemaAction.java    |  2 +-
 .../cayenne/modeler/action/ReverseEngineeringAction.java     |  4 ++--
 .../org/apache/cayenne/modeler/action/SortNodesAction.java   |  2 +-
 .../cayenne/modeler/action/dbimport/AddCatalogAction.java    |  2 +-
 .../modeler/action/dbimport/AddIncludeTableAction.java       |  2 +-
 .../modeler/action/dbimport/AddPatternParamAction.java       |  2 +-
 .../cayenne/modeler/action/dbimport/AddSchemaAction.java     |  2 +-
 .../cayenne/modeler/action/dbimport/DeleteNodeAction.java    |  2 +-
 .../modeler/action/dbimport/DragAndDropNodeAction.java       |  2 +-
 .../modeler/action/dbimport/MoveImportNodeAction.java        |  2 +-
 .../modeler/action/dbimport/TreeManipulationAction.java      |  2 +-
 .../{dialog/db/load => dbimport}/DbImportProjectSaver.java   |  2 +-
 .../{dialog/db/load => dbimport}/DbLoaderContext.java        |  2 +-
 .../{dialog/db/load => dbimport}/LoadDataMapTask.java        |  2 +-
 .../modeler/{dialog/db/load => dbimport}/LoaderDelegate.java |  2 +-
 .../{dialog/db/load => dbimport}/ModelerDbImportAction.java  |  2 +-
 .../{dialog/db/load => dbimport}/ModelerSyncModule.java      |  2 +-
 .../project/editor/datamap/dbimport}/CatalogPopUpMenu.java   |  2 +-
 .../editor/datamap/dbimport/DatabaseSchemaLoader.java        |  2 +-
 .../ui/project/editor/datamap/dbimport/DbImportModel.java    |  2 +-
 .../ui/project/editor/datamap/dbimport/DbImportSorter.java   |  2 +-
 .../ui/project/editor/datamap/dbimport/DbImportTree.java     |  4 ++--
 .../editor/datamap/dbimport/DbImportTreeCellEditor.java      |  2 +-
 .../editor/datamap/dbimport/DbImportTreeCellRenderer.java    |  2 +-
 .../ui/project/editor/datamap/dbimport/DbImportView.java     |  4 ++--
 .../project/editor/datamap/dbimport}/DefaultPopUpMenu.java   |  3 ++-
 .../project/editor/datamap/dbimport/DraggableTreePanel.java  |  4 ++--
 .../editor/datamap/dbimport}/IncludeTablePopUpMenu.java      |  2 +-
 .../editor/datamap/dbimport/PrintColumnsBiFunction.java      |  2 +-
 .../editor/datamap/dbimport/PrintTablesBiFunction.java       |  4 ++--
 .../editor/datamap/dbimport/ReverseEngineeringTreePanel.java | 12 ++++++------
 .../project/editor/datamap/dbimport}/RootPopUpMenu.java      |  2 +-
 .../project/editor/datamap/dbimport}/SchemaPopUpMenu.java    |  2 +-
 .../ui/project/editor/datamap/dbimport/TreeToolbarPanel.java |  2 +-
 .../editor/datamap/dbimport/tree/ColorTreeRenderer.java      |  2 +-
 .../editor/datamap/dbimport/tree}/DbImportTreeNode.java      |  2 +-
 .../editor/datamap/dbimport/tree}/TransferableNode.java      |  2 +-
 .../cayenne/modeler/undo/DbImportTreeUndoableEdit.java       |  2 +-
 .../cayenne/modeler/editor/dbimport/DbImportSorterTest.java  |  2 +-
 39 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
index 8991610aa..ccb2b9b5f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DatabaseSchemaLoader;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportModel;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportView;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
index 66801bf2c..06630fb03 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
@@ -22,8 +22,8 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.dbloadresult.DbLoadResultDialog;
-import org.apache.cayenne.modeler.dialog.db.load.DbLoaderContext;
-import org.apache.cayenne.modeler.dialog.db.load.LoadDataMapTask;
+import org.apache.cayenne.modeler.dbimport.DbLoaderContext;
+import org.apache.cayenne.modeler.dbimport.LoadDataMapTask;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportController;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportView;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SortNodesAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SortNodesAction.java
index a1a590c43..3b1ca4ac8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SortNodesAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/SortNodesAction.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.action.dbimport.TreeManipulationAction;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportSorter;
 
 import java.awt.event.ActionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddCatalogAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddCatalogAction.java
index 0bc9cdd4c..8dcdbbd86 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddCatalogAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddCatalogAction.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.action.dbimport;
 import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 import java.awt.event.ActionEvent;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java
index 2bacc4916..6c75ef47d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddIncludeTableAction.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 import java.awt.event.ActionEvent;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java
index e444a6ea6..b3a50ad1a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.PatternParam;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 import java.awt.event.ActionEvent;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddSchemaAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddSchemaAction.java
index 150541ec6..15b8b0e16 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddSchemaAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddSchemaAction.java
@@ -24,7 +24,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 import java.awt.event.ActionEvent;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java
index 88f3008f5..285e53f76 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java
@@ -31,7 +31,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.PatternParam;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportModel;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportView;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DraggableTreePanel;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DragAndDropNodeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DragAndDropNodeAction.java
index 33f5b6b6f..fcbfd673d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DragAndDropNodeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DragAndDropNodeAction.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.action.dbimport;
 
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportModel;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportSorter;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/MoveImportNodeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/MoveImportNodeAction.java
index c97275665..b1d1c336d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/MoveImportNodeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/MoveImportNodeAction.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportSorter;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportTree;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportView;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java
index 4fd2d17fd..59841bb80 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportTree;
 import org.apache.cayenne.modeler.undo.DbImportTreeUndoableEdit;
 import org.apache.cayenne.modeler.util.CayenneAction;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbImportProjectSaver.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/DbImportProjectSaver.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbImportProjectSaver.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/DbImportProjectSaver.java
index ce86e22ac..de80e6ade 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbImportProjectSaver.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/DbImportProjectSaver.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.dbimport;
 
 import org.apache.cayenne.configuration.ConfigurationNameMapper;
 import org.apache.cayenne.modeler.event.model.DataMapEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/DbLoaderContext.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/DbLoaderContext.java
index 940afdb6b..515f620b2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoaderContext.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/DbLoaderContext.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.dbimport;
 
 import org.apache.cayenne.configuration.xml.DataChannelMetaData;
 import org.apache.cayenne.dbsync.reverse.dbimport.DbImportConfiguration;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/LoadDataMapTask.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/LoadDataMapTask.java
index 46f2eed66..001094aa9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoadDataMapTask.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/LoadDataMapTask.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.dbimport;
 
 import javax.swing.JFrame;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/LoaderDelegate.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/LoaderDelegate.java
index dba94f895..7aa88d36b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/LoaderDelegate.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/LoaderDelegate.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.dbimport;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.dbsync.reverse.dbload.DefaultDbLoaderDelegate;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/ModelerDbImportAction.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/ModelerDbImportAction.java
index f1c606e08..f32b092b2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/ModelerDbImportAction.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.dbimport;
 
 import org.apache.cayenne.modeler.ui.dbloadresult.DbLoadResultDialog;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerSyncModule.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/ModelerSyncModule.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerSyncModule.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/ModelerSyncModule.java
index c073c18f1..e8ceb4577 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerSyncModule.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dbimport/ModelerSyncModule.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.dbimport;
 
 import org.apache.cayenne.di.Binder;
 import org.apache.cayenne.di.Module;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/CatalogPopUpMenu.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java
similarity index 94%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/CatalogPopUpMenu.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java
index 6b1e520f3..3c986c2db 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/CatalogPopUpMenu.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/CatalogPopUpMenu.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 
 /**
  * @since 4.1
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java
index 9646bf486..9e579b77d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DatabaseSchemaLoader.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
 import org.apache.cayenne.modeler.ClassLoadingService;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.pref.DBConnectionInfo;
 
 public class DatabaseSchemaLoader {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportModel.java
index 8fbc95def..c62830cd7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportModel.java
@@ -20,7 +20,7 @@
 package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java
index fe2cb04af..b16f2c9b6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportSorter.java
@@ -25,7 +25,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.NodeType;
 
 import java.util.Collection;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java
index 86873c804..75ca07ab1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTree.java
@@ -29,8 +29,8 @@ import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.action.LoadDbSchemaAction;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import org.apache.cayenne.modeler.dialog.db.load.TransferableNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.TransferableNode;
 
 import javax.swing.JTree;
 import javax.swing.event.TreeExpansionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java
index e82bf0131..bef6da782 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellEditor.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.action.dbimport.DeleteNodeAction;
 import org.apache.cayenne.modeler.action.dbimport.EditNodeAction;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.util.Util;
 
 import javax.swing.JTree;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java
index 634788e17..e251961fa 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportTreeCellRenderer.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeProcedure;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 
 import javax.swing.Icon;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java
index 29503551a..3261c4511 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportView.java
@@ -36,8 +36,8 @@ import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.action.LoadDbSchemaAction;
 import org.apache.cayenne.modeler.action.ReverseEngineeringAction;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import org.apache.cayenne.modeler.dialog.db.load.TransferableNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.TransferableNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.ColorTreeRenderer;
 import org.apache.cayenne.modeler.util.CayenneAction;
 import org.apache.cayenne.modeler.util.ModelerUtil;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DefaultPopUpMenu.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java
similarity index 94%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DefaultPopUpMenu.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java
index 72a78c908..0eb4020d8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DefaultPopUpMenu.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DefaultPopUpMenu.java
@@ -17,8 +17,9 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.action.dbimport.DeleteNodeAction;
 import org.apache.cayenne.modeler.action.dbimport.EditNodeAction;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DraggableTreePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DraggableTreePanel.java
index 99269f1e3..54071a53e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DraggableTreePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DraggableTreePanel.java
@@ -42,8 +42,8 @@ import org.apache.cayenne.modeler.action.dbimport.DragAndDropNodeAction;
 import org.apache.cayenne.modeler.action.dbimport.MoveImportNodeAction;
 import org.apache.cayenne.modeler.action.dbimport.MoveInvertNodeAction;
 import org.apache.cayenne.modeler.action.dbimport.TreeManipulationAction;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import org.apache.cayenne.modeler.dialog.db.load.TransferableNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.TransferableNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.ColorTreeRenderer;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/IncludeTablePopUpMenu.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java
similarity index 95%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/IncludeTablePopUpMenu.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java
index dc96e5323..4fb08ed56 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/IncludeTablePopUpMenu.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/IncludeTablePopUpMenu.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 
 /**
  * @since 4.1
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java
index 25ad69315..4eb006465 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintColumnsBiFunction.java
@@ -23,7 +23,7 @@ import java.util.function.BiFunction;
 
 import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 public class PrintColumnsBiFunction implements BiFunction<FilterContainer, DbImportTreeNode, Void> {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java
index 2537460aa..1accfe4e7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/PrintTablesBiFunction.java
@@ -26,8 +26,8 @@ import java.util.function.BiFunction;
 import org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import org.apache.cayenne.modeler.dialog.db.load.TransferableNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.TransferableNode;
 
 public class PrintTablesBiFunction implements BiFunction<FilterContainer, DbImportTreeNode, Void> {
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java
index fdfa09c5c..440a5d0db 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/ReverseEngineeringTreePanel.java
@@ -30,12 +30,12 @@ import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.db.load.CatalogPopUpMenu;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import org.apache.cayenne.modeler.dialog.db.load.DefaultPopUpMenu;
-import org.apache.cayenne.modeler.dialog.db.load.IncludeTablePopUpMenu;
-import org.apache.cayenne.modeler.dialog.db.load.RootPopUpMenu;
-import org.apache.cayenne.modeler.dialog.db.load.SchemaPopUpMenu;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.CatalogPopUpMenu;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DefaultPopUpMenu;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.IncludeTablePopUpMenu;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.RootPopUpMenu;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.SchemaPopUpMenu;
 
 import javax.swing.JScrollPane;
 import javax.swing.JTree;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/RootPopUpMenu.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/RootPopUpMenu.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java
index ad1e014a6..e76da9bca 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/RootPopUpMenu.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/RootPopUpMenu.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 
 import org.apache.cayenne.modeler.action.dbimport.AddCatalogAction;
 import org.apache.cayenne.modeler.action.dbimport.AddExcludeColumnAction;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/SchemaPopUpMenu.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java
similarity index 94%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/SchemaPopUpMenu.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java
index 03b614a67..4916f0499 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/SchemaPopUpMenu.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/SchemaPopUpMenu.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 
 /**
  * @since 4.1
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/TreeToolbarPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/TreeToolbarPanel.java
index 19630d2e4..5ee2d1456 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/TreeToolbarPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/TreeToolbarPanel.java
@@ -43,7 +43,7 @@ import org.apache.cayenne.modeler.action.dbimport.AddSchemaAction;
 import org.apache.cayenne.modeler.action.dbimport.DeleteNodeAction;
 import org.apache.cayenne.modeler.action.dbimport.EditNodeAction;
 import org.apache.cayenne.modeler.action.dbimport.TreeManipulationAction;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 import javax.swing.JButton;
 import javax.swing.JToolBar;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java
index a43637005..6deb6aeb4 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/ColorTreeRenderer.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.dbsync.reverse.dbimport.PatternParam;
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
 import org.apache.cayenne.dbsync.reverse.dbimport.SchemaContainer;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportTree;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportTreeCellRenderer;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbImportTreeNode.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbImportTreeNode.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java
index be5e57478..747f3f2c9 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbImportTreeNode.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/DbImportTreeNode.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree;
 
 import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
 import org.apache.cayenne.dbsync.reverse.dbimport.ExcludeColumn;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/TransferableNode.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/TransferableNode.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java
index 7a8eaa8f0..18fac9f73 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/TransferableNode.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/tree/TransferableNode.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog.db.load;
+package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree;
 
 import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java
index 20090ecbd..e66623689 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/DbImportTreeUndoableEdit.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.undo;
 
 import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.DbImportTree;
 
 import javax.swing.undo.AbstractUndoableEdit;
diff --git a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java
index da5bfedfa..2a4de6c0d 100644
--- a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java
+++ b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/editor/dbimport/DbImportSorterTest.java
@@ -22,7 +22,7 @@ package org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport;
 import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeColumn;
 import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
+import org.apache.cayenne.modeler.ui.project.editor.datamap.dbimport.tree.DbImportTreeNode;
 
 import org.junit.Before;
 import org.junit.Test;


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

Posted by 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 ea13f1a2601dedc81de69bc27095a6bb4414e2d5
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:56:39 2026 -0400

    Modeler refactoring - package per component
---
 .../encoding/EncodingPreferencesController.java    | 133 ---------------------
 .../encoding/EncodingPreferencesView.java          |  73 -----------
 .../general/GeneralPreferencesController.java      |  94 +++++++++++++--
 .../general/GeneralPreferencesView.java            |  43 ++++++-
 4 files changed, 122 insertions(+), 221 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesController.java
deleted file mode 100644
index 74acaad72..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesController.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-
-
-package org.apache.cayenne.modeler.ui.preferences.encoding;
-
-import org.apache.cayenne.modeler.mvc.ChildController;
-import org.apache.cayenne.modeler.ui.preferences.general.GeneralPreferencesController;
-import org.apache.cayenne.util.Util;
-
-import javax.swing.*;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Vector;
-
-public class EncodingPreferencesController extends ChildController<GeneralPreferencesController> {
-
-    public static final String ENCODING_PROPERTY = "encoding";
-
-    private final EncodingPreferencesView view;
-    private final String systemEncoding;
-
-    private String encoding;
-    private boolean defaultEncoding;
-
-    public EncodingPreferencesController(GeneralPreferencesController parent) {
-        super(parent);
-        this.view = new EncodingPreferencesView();
-
-        // init static models...
-        this.systemEncoding = detectPlatformEncoding();
-
-        Vector allEncodings = supportedEncodings(systemEncoding);
-        view.getEncodingChoices().setModel(new DefaultComboBoxModel(allEncodings));
-        view.getDefaultEncodingLabel().setText("Default (" + systemEncoding + ")");
-        view.getDefaultEncoding().setSelected(true);
-
-        view.getDefaultEncoding().addActionListener(e -> setDefaultEncoding(view.getDefaultEncoding().isSelected()));
-        view.getOtherEncoding().addActionListener(e -> setDefaultEncoding(!view.getOtherEncoding().isSelected()));
-
-        view.getEncodingChoices().addActionListener(e -> {
-            Object sel = view.getEncodingChoices().getSelectedItem();
-            setEncoding(sel != null ? sel.toString() : null);
-        });
-    }
-
-    @Override
-    public EncodingPreferencesView getView() {
-        return view;
-    }
-
-    /**
-     * Returns default encoding on the current platform.
-     */
-    protected String detectPlatformEncoding() {
-        // this info is private until 1.5, so have to hack it...
-        return new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding();
-    }
-
-    /**
-     * Returns an array of charsets that all JVMs must support cross-platform combined
-     * with a default platform charset. See Javadocs for java.nio.charset.Charset for the
-     * list of "standard" charsets.
-     */
-    protected Vector supportedEncodings(String platformEncoding) {
-        String[] defaultCharsets = new String[] {
-                "US-ASCII", "ISO-8859-1", "UTF-8", "UTF-16BE", "UTF-16LE", "UTF-16"
-        };
-
-        Vector charsets = new Vector(Arrays.asList(defaultCharsets));
-        if (!charsets.contains(platformEncoding)) {
-            charsets.add(platformEncoding);
-        }
-
-        Collections.sort(charsets);
-        return charsets;
-    }
-
-    public void setSelectedEncoding(String encoding) {
-        this.encoding = encoding;
-        this.defaultEncoding = encoding == null || encoding.equals(systemEncoding);
-
-        view.getEncodingChoices().setSelectedItem(encoding);
-        view.getDefaultEncoding().setSelected(defaultEncoding);
-        view.getOtherEncoding().setSelected(!defaultEncoding);
-        view.getEncodingChoices().setEnabled(!defaultEncoding);
-        view.getDefaultEncodingLabel().setEnabled(defaultEncoding);
-    }
-
-    private void setEncoding(String encoding) {
-        if (!Util.nullSafeEquals(this.encoding, encoding)) {
-            Object old = this.encoding;
-
-            this.encoding = encoding;
-            firePropertyChange("encoding", old, encoding);
-        }
-    }
-
-    private void setDefaultEncoding(boolean b) {
-        if (b != defaultEncoding) {
-            this.defaultEncoding = b;
-
-            if (b) {
-                setEncoding(systemEncoding);
-                view.getEncodingChoices().setEnabled(false);
-                view.getDefaultEncodingLabel().setEnabled(true);
-            }
-            else {
-                view.getEncodingChoices().setEnabled(true);
-                view.getDefaultEncodingLabel().setEnabled(false);
-            }
-
-        }
-    }
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesView.java
deleted file mode 100644
index 2a411ebbc..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/encoding/EncodingPreferencesView.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************
- *   Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    https://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- ****************************************************************/
-
-package org.apache.cayenne.modeler.ui.preferences.encoding;
-
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * A panel for file encoding selection.
- */
-public class EncodingPreferencesView extends JPanel {
-
-    private final JRadioButton defaultEncoding;
-    private final JRadioButton otherEncoding;
-    private final JComboBox encodingChoices;
-    private final JLabel defaultEncodingLabel;
-
-    public EncodingPreferencesView() {
-        this.defaultEncoding = new JRadioButton();
-        this.otherEncoding = new JRadioButton();
-        this.encodingChoices = new JComboBox();
-        this.defaultEncodingLabel = new JLabel();
-
-        ButtonGroup group = new ButtonGroup();
-        group.add(defaultEncoding);
-        group.add(otherEncoding);
-
-        FormLayout layout = new FormLayout("pref, 3dlu, pref", "");
-        DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-
-        builder.append(defaultEncoding, defaultEncodingLabel);
-        builder.append(otherEncoding, encodingChoices);
-
-        setLayout(new BorderLayout());
-        add(builder.getPanel());
-    }
-
-    public JRadioButton getDefaultEncoding() {
-        return defaultEncoding;
-    }
-
-    public JLabel getDefaultEncodingLabel() {
-        return defaultEncodingLabel;
-    }
-
-    public JComboBox getEncodingChoices() {
-        return encodingChoices;
-    }
-
-    public JRadioButton getOtherEncoding() {
-        return otherEncoding;
-    }
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
index 7fa2b2e1e..7f7c05b51 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
@@ -21,12 +21,17 @@ package org.apache.cayenne.modeler.ui.preferences.general;
 
 import org.apache.cayenne.modeler.mvc.ChildController;
 import org.apache.cayenne.modeler.ui.preferences.PreferenceDialogController;
-import org.apache.cayenne.modeler.ui.preferences.encoding.EncodingPreferencesController;
-import org.apache.cayenne.modeler.ui.preferences.encoding.EncodingPreferencesView;
+import org.apache.cayenne.util.Util;
 
+import javax.swing.*;
 import java.awt.*;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStreamWriter;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Vector;
 import java.util.prefs.Preferences;
 
 public class GeneralPreferencesController extends ChildController<PreferenceDialogController> {
@@ -43,11 +48,13 @@ public class GeneralPreferencesController extends ChildController<PreferenceDial
     public static final String FAVOURITE_DATA_SOURCE = "favouriteDataSource";
 
     private final GeneralPreferencesView view;
+    private final String systemEncoding;
+    private final Preferences preferences;
 
     private boolean autoLoadProjectPreference;
     private String encoding;
+    private boolean defaultEncoding;
     private boolean deletePromptPreference;
-    private final Preferences preferences;
 
     public GeneralPreferencesController(PreferenceDialogController parent) {
         super(parent);
@@ -57,14 +64,25 @@ public class GeneralPreferencesController extends ChildController<PreferenceDial
         this.autoLoadProjectPreference = preferences.getBoolean(AUTO_LOAD_PROJECT_PREFERENCE, false);
         this.deletePromptPreference = preferences.getBoolean(DELETE_PROMPT_PREFERENCE, false);
 
-        // TODO: confusing: "encodingController" is dangling in the air, yet it doesn't go out of scope as it is a
-        //  listener for its own view events
-        EncodingPreferencesController encodingController = new EncodingPreferencesController(this);
-        encodingController.addPropertyChangeListener(EncodingPreferencesController.ENCODING_PROPERTY, evt -> setEncoding((String) evt.getNewValue()));
-        encodingController.setSelectedEncoding(encoding);
+        this.systemEncoding = detectPlatformEncoding();
 
-        this.view = new GeneralPreferencesView(encodingController.getView());
+        this.view = new GeneralPreferencesView();
         this.view.setEnabled(true);
+
+        Vector allEncodings = supportedEncodings(systemEncoding);
+        view.getEncodingChoices().setModel(new DefaultComboBoxModel(allEncodings));
+        view.getDefaultEncodingLabel().setText("Default (" + systemEncoding + ")");
+        view.getDefaultEncoding().setSelected(true);
+
+        view.getDefaultEncoding().addActionListener(e -> setDefaultEncoding(view.getDefaultEncoding().isSelected()));
+        view.getOtherEncoding().addActionListener(e -> setDefaultEncoding(!view.getOtherEncoding().isSelected()));
+        view.getEncodingChoices().addActionListener(e -> {
+            Object sel = view.getEncodingChoices().getSelectedItem();
+            setEncoding(sel != null ? sel.toString() : null);
+        });
+
+        setSelectedEncoding(encoding);
+
         this.view.getAutoLoadProject().addActionListener(e -> setAutoLoadProject(view.getAutoLoadProject().isSelected()));
         this.view.getDeletePrompt().addActionListener(e -> setDeletePrompt(view.getDeletePrompt().isSelected()));
         this.view.getAutoLoadProject().setSelected(autoLoadProjectPreference);
@@ -81,8 +99,64 @@ public class GeneralPreferencesController extends ChildController<PreferenceDial
     }
 
     public void setEncoding(String encoding) {
-        addChangedPreferences(ENCODING_PREFERENCE, encoding);
+        if (!Util.nullSafeEquals(this.encoding, encoding)) {
+            addChangedPreferences(ENCODING_PREFERENCE, encoding);
+            this.encoding = encoding;
+        }
+    }
+
+    /**
+     * Returns default encoding on the current platform.
+     */
+    protected String detectPlatformEncoding() {
+        // this info is private until 1.5, so have to hack it...
+        return new OutputStreamWriter(new ByteArrayOutputStream()).getEncoding();
+    }
+
+    /**
+     * Returns an array of charsets that all JVMs must support cross-platform combined
+     * with a default platform charset. See Javadocs for java.nio.charset.Charset for the
+     * list of "standard" charsets.
+     */
+    protected Vector supportedEncodings(String platformEncoding) {
+        String[] defaultCharsets = new String[] {
+                "US-ASCII", "ISO-8859-1", "UTF-8", "UTF-16BE", "UTF-16LE", "UTF-16"
+        };
+
+        Vector charsets = new Vector(Arrays.asList(defaultCharsets));
+        if (!charsets.contains(platformEncoding)) {
+            charsets.add(platformEncoding);
+        }
+
+        Collections.sort(charsets);
+        return charsets;
+    }
+
+    private void setSelectedEncoding(String encoding) {
         this.encoding = encoding;
+        this.defaultEncoding = encoding == null || encoding.equals(systemEncoding);
+
+        view.getEncodingChoices().setSelectedItem(encoding);
+        view.getDefaultEncoding().setSelected(defaultEncoding);
+        view.getOtherEncoding().setSelected(!defaultEncoding);
+        view.getEncodingChoices().setEnabled(!defaultEncoding);
+        view.getDefaultEncodingLabel().setEnabled(defaultEncoding);
+    }
+
+    private void setDefaultEncoding(boolean b) {
+        if (b != defaultEncoding) {
+            this.defaultEncoding = b;
+
+            if (b) {
+                setEncoding(systemEncoding);
+                view.getEncodingChoices().setEnabled(false);
+                view.getDefaultEncodingLabel().setEnabled(true);
+            }
+            else {
+                view.getEncodingChoices().setEnabled(true);
+                view.getDefaultEncodingLabel().setEnabled(false);
+            }
+        }
     }
 
     private void setAutoLoadProject(boolean autoLoadProject) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
index 7bf8e5c9e..6106f2e90 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesView.java
@@ -19,8 +19,7 @@
 
 package org.apache.cayenne.modeler.ui.preferences.general;
 
-import org.apache.cayenne.modeler.ui.preferences.encoding.EncodingPreferencesView;
-
+import com.jgoodies.forms.builder.DefaultFormBuilder;
 import com.jgoodies.forms.builder.PanelBuilder;
 import com.jgoodies.forms.layout.CellConstraints;
 import com.jgoodies.forms.layout.FormLayout;
@@ -31,13 +30,31 @@ import java.awt.*;
 
 public class GeneralPreferencesView extends JPanel {
 
-    private final EncodingPreferencesView encodingSelector;
+    private final JRadioButton defaultEncoding;
+    private final JRadioButton otherEncoding;
+    private final JComboBox encodingChoices;
+    private final JLabel defaultEncodingLabel;
+    private final JPanel encodingSelector;
     private final JLabel encodingSelectorLabel;
     private final JCheckBox autoLoadProjectBox;
     private final JCheckBox deletePromptBox;
 
-    public GeneralPreferencesView(EncodingPreferencesView encodingSelector) {
-        this.encodingSelector = encodingSelector;
+    public GeneralPreferencesView() {
+        this.defaultEncoding = new JRadioButton();
+        this.otherEncoding = new JRadioButton();
+        this.encodingChoices = new JComboBox();
+        this.defaultEncodingLabel = new JLabel();
+
+        ButtonGroup group = new ButtonGroup();
+        group.add(defaultEncoding);
+        group.add(otherEncoding);
+
+        FormLayout encodingLayout = new FormLayout("pref, 3dlu, pref", "");
+        DefaultFormBuilder encodingBuilder = new DefaultFormBuilder(encodingLayout);
+        encodingBuilder.append(defaultEncoding, defaultEncodingLabel);
+        encodingBuilder.append(otherEncoding, encodingChoices);
+        this.encodingSelector = encodingBuilder.getPanel();
+
         this.encodingSelectorLabel = new JLabel("File Encoding:");
         this.autoLoadProjectBox = new JCheckBox("Automatically Load Last Opened Project");
         this.deletePromptBox = new JCheckBox("Always Delete Items Without Prompt");
@@ -72,6 +89,22 @@ public class GeneralPreferencesView extends JPanel {
         deletePromptBox.setEnabled(b);
     }
 
+    public JRadioButton getDefaultEncoding() {
+        return defaultEncoding;
+    }
+
+    public JLabel getDefaultEncodingLabel() {
+        return defaultEncodingLabel;
+    }
+
+    public JComboBox getEncodingChoices() {
+        return encodingChoices;
+    }
+
+    public JRadioButton getOtherEncoding() {
+        return otherEncoding;
+    }
+
     public JCheckBox getAutoLoadProject() {
         return autoLoadProjectBox;
     }


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

Posted by 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 f2bb4ef5b5e9518c96842f07cfeef462b42c1b16
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri Apr 24 12:56:39 2026 -0400

    Modeler refactoring - package per component
    
    * move single-class dialogs each to own subpackage directly under ui/:
      - ui/about/AboutDialog
      - ui/confirmremove/ConfirmRemoveDialog
      - ui/overwrite/OverwriteDialog
      - ui/unsavedchanges/UnsavedChangesDialog
      - ui/errordebug/ErrorDebugDialog
      - ui/filedeleted/FileDeletedDialog
      - ui/warning/{WarningDialog, WarningDialogByDbTargetChange}
    * add reciprocal imports between ErrorDebugDialog (warning/) and its subclass
      WarningDialog (warning/) that now live in different packages
---
 .../main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/action/AboutAction.java   | 2 +-
 .../java/org/apache/cayenne/modeler/action/ImportEOModelAction.java    | 2 +-
 .../main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/action/PasteAction.java   | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/action/ProjectAction.java | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java  | 2 +-
 .../java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java  | 2 +-
 .../org/apache/cayenne/modeler/action/RemoveCallbackMethodAction.java  | 2 +-
 .../apache/cayenne/modeler/action/RemoveProcedureParameterAction.java  | 2 +-
 .../org/apache/cayenne/modeler/action/RemoveRelationshipAction.java    | 2 +-
 .../org/apache/cayenne/modeler/{dialog => ui/about}/AboutDialog.java   | 2 +-
 .../modeler/{dialog => ui/confirmremove}/ConfirmRemoveDialog.java      | 2 +-
 .../modeler/ui/dbrelationship/DbRelationshipDialogController.java      | 2 +-
 .../cayenne/modeler/{dialog => ui/errordebug}/ErrorDebugDialog.java    | 3 ++-
 .../cayenne/modeler/{dialog => ui/filedeleted}/FileDeletedDialog.java  | 2 +-
 .../cayenne/modeler/{dialog => ui/overwrite}/OverwriteDialog.java      | 2 +-
 .../ui/project/editor/datadomain/graph/action/RemoveEntityAction.java  | 2 +-
 .../modeler/{dialog => ui/unsavedchanges}/UnsavedChangesDialog.java    | 2 +-
 .../apache/cayenne/modeler/{dialog => ui/warning}/WarningDialog.java   | 3 ++-
 .../modeler/{dialog => ui/warning}/WarningDialogByDbTargetChange.java  | 2 +-
 .../src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java   | 2 +-
 23 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java
index 49c11a558..b4fe81717 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectFileChangeTracker.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.modeler.action.OpenProjectAction;
 import org.apache.cayenne.modeler.action.SaveAction;
-import org.apache.cayenne.modeler.dialog.FileDeletedDialog;
+import org.apache.cayenne.modeler.ui.filedeleted.FileDeletedDialog;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.project.Project;
 import org.slf4j.Logger;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java
index 70da09576..b84d6c797 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java
@@ -20,7 +20,7 @@
 package org.apache.cayenne.modeler.action;
 
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.AboutDialog;
+import org.apache.cayenne.modeler.ui.about.AboutDialog;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
 import java.awt.event.ActionEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index b00fb7cb4..6343c08e8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -37,7 +37,7 @@ import org.apache.cayenne.map.event.EntityEvent;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
+import org.apache.cayenne.modeler.ui.errordebug.ErrorDebugDialog;
 import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
 import org.apache.cayenne.modeler.event.display.DataNodeDisplayEvent;
 import org.apache.cayenne.modeler.pref.FSPath;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
index c1d7d4347..3f4232035 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/OpenProjectAction.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.action;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.CayenneModelerController;
-import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
+import org.apache.cayenne.modeler.ui.errordebug.ErrorDebugDialog;
 import org.apache.cayenne.project.Project;
 import org.apache.cayenne.project.ProjectLoader;
 import org.apache.cayenne.project.upgrade.UpgradeMetaData;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index c1d30e7de..c2d987d14 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -39,7 +39,7 @@ import org.apache.cayenne.map.QueryDescriptor;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
+import org.apache.cayenne.modeler.ui.errordebug.ErrorDebugDialog;
 import org.apache.cayenne.modeler.ui.querytype.QueryTypeController;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjCallbackMethod;
 import org.apache.cayenne.modeler.event.model.CallbackMethodEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectAction.java
index 5284d88a6..9d26917d7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectAction.java
@@ -24,7 +24,7 @@ import java.awt.event.ActionEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.CayenneModelerController;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.UnsavedChangesDialog;
+import org.apache.cayenne.modeler.ui.unsavedchanges.UnsavedChangesDialog;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
index e4c96dc08..b594d7f19 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ProjectOpener.java
@@ -28,7 +28,7 @@ import javax.swing.filechooser.FileFilter;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.OverwriteDialog;
+import org.apache.cayenne.modeler.ui.overwrite.OverwriteDialog;
 import org.apache.cayenne.modeler.util.FileFilters;
 import org.apache.cayenne.project.Project;
 import org.slf4j.Logger;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
index dfa3a2a3b..a6884575a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAction.java
@@ -51,7 +51,7 @@ import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.map.event.RelationshipEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ConfirmRemoveDialog;
+import org.apache.cayenne.modeler.ui.confirmremove.ConfirmRemoveDialog;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.CallbackType;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjCallbackMethod;
 import org.apache.cayenne.modeler.event.model.CallbackMethodEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
index 6d608ec4f..b726a1663 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveAttributeAction.java
@@ -33,7 +33,7 @@ import org.apache.cayenne.map.event.EmbeddableAttributeEvent;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ConfirmRemoveDialog;
+import org.apache.cayenne.modeler.ui.confirmremove.ConfirmRemoveDialog;
 import org.apache.cayenne.modeler.undo.RemoveAttributeUndoableEdit;
 import org.apache.cayenne.modeler.util.ProjectUtil;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveCallbackMethodAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveCallbackMethodAction.java
index a4a1951eb..ad60f4fb5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveCallbackMethodAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveCallbackMethodAction.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.modeler.action;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ConfirmRemoveDialog;
+import org.apache.cayenne.modeler.ui.confirmremove.ConfirmRemoveDialog;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.CallbackType;
 import org.apache.cayenne.modeler.ui.project.editor.objentity.ObjCallbackMethod;
 import org.apache.cayenne.modeler.event.model.CallbackMethodEvent;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java
index 4f3f457a3..407bcd4ae 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveProcedureParameterAction.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.ProcedureParameter;
 import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ConfirmRemoveDialog;
+import org.apache.cayenne.modeler.ui.confirmremove.ConfirmRemoveDialog;
 
 import java.awt.event.ActionEvent;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java
index f23dc75c5..21281989e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/RemoveRelationshipAction.java
@@ -29,7 +29,7 @@ import org.apache.cayenne.map.event.MapEvent;
 import org.apache.cayenne.map.event.RelationshipEvent;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.dialog.ConfirmRemoveDialog;
+import org.apache.cayenne.modeler.ui.confirmremove.ConfirmRemoveDialog;
 import org.apache.cayenne.modeler.undo.RemoveRelationshipUndoableEdit;
 import org.apache.cayenne.modeler.util.ProjectUtil;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/AboutDialog.java
similarity index 99%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/AboutDialog.java
index 097a2a0c0..cbb2bfb31 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/AboutDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/AboutDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.about;
 
 import java.awt.Color;
 import java.awt.FlowLayout;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
index f612ff464..d46e432bd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ConfirmRemoveDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/confirmremove/ConfirmRemoveDialog.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.confirmremove;
 
 import java.util.prefs.Preferences;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
index 00ec5910b..20bf7e7d8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
@@ -19,7 +19,7 @@
 
 package org.apache.cayenne.modeler.ui.dbrelationship;
 
-import org.apache.cayenne.modeler.dialog.WarningDialogByDbTargetChange;
+import org.apache.cayenne.modeler.ui.warning.WarningDialogByDbTargetChange;
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.configuration.DataChannelDescriptor;
 import org.apache.cayenne.dbsync.naming.NameBuilder;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/errordebug/ErrorDebugDialog.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/errordebug/ErrorDebugDialog.java
index c4b591a3e..4e9657641 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ErrorDebugDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/errordebug/ErrorDebugDialog.java
@@ -18,10 +18,11 @@
  ****************************************************************/
 
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.errordebug;
 
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.CayenneModelerFrame;
+import org.apache.cayenne.modeler.ui.warning.WarningDialog;
 import org.apache.cayenne.modeler.util.CayenneDialog;
 import org.apache.cayenne.modeler.util.ModelerUtil;
 import org.apache.cayenne.modeler.util.PanelFactory;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FileDeletedDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FileDeletedDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java
index 592c8b0d1..59004f044 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/FileDeletedDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/filedeleted/FileDeletedDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.filedeleted;
 
 import java.awt.Component;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/OverwriteDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/overwrite/OverwriteDialog.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/OverwriteDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/overwrite/OverwriteDialog.java
index cb06952b8..01926de8a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/OverwriteDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/overwrite/OverwriteDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.overwrite;
 
 import java.awt.Component;
 import java.io.File;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/RemoveEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/RemoveEntityAction.java
index 6b55f8971..665bfafb6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/RemoveEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/RemoveEntityAction.java
@@ -23,7 +23,7 @@ import org.apache.cayenne.map.Entity;
 import org.apache.cayenne.map.ObjEntity;
 import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.action.RemoveAction;
-import org.apache.cayenne.modeler.dialog.ConfirmRemoveDialog;
+import org.apache.cayenne.modeler.ui.confirmremove.ConfirmRemoveDialog;
 import org.apache.cayenne.modeler.graph.GraphBuilder;
 import org.apache.cayenne.modeler.undo.RemoveUndoableEdit;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/UnsavedChangesDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java
similarity index 97%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/UnsavedChangesDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java
index 6fa2e4ad3..980173fb6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/UnsavedChangesDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/unsavedchanges/UnsavedChangesDialog.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.unsavedchanges;
 
 import java.awt.Component;
 import javax.swing.JOptionPane;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/WarningDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialog.java
similarity index 94%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/WarningDialog.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialog.java
index 4bf3ca33d..69111000d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/WarningDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialog.java
@@ -17,9 +17,10 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.warning;
 
 import org.apache.cayenne.modeler.ui.CayenneModelerFrame;
+import org.apache.cayenne.modeler.ui.errordebug.ErrorDebugDialog;
 
 import java.awt.*;
 
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/WarningDialogByDbTargetChange.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialogByDbTargetChange.java
similarity index 98%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/WarningDialogByDbTargetChange.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialogByDbTargetChange.java
index 16dc0d36f..2ddb8f607 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/WarningDialogByDbTargetChange.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/warning/WarningDialogByDbTargetChange.java
@@ -17,7 +17,7 @@
  *  under the License.
  ****************************************************************/
 
-package org.apache.cayenne.modeler.dialog;
+package org.apache.cayenne.modeler.ui.warning;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JLabel;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
index 3535921e3..572617163 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/CayenneAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.Application;
 import org.apache.cayenne.modeler.ui.CayenneModelerFrame;
 import org.apache.cayenne.modeler.ui.project.ProjectController;
 import org.apache.cayenne.modeler.ui.project.tree.ProjectTreeModel;
-import org.apache.cayenne.modeler.dialog.ErrorDebugDialog;
+import org.apache.cayenne.modeler.ui.errordebug.ErrorDebugDialog;
 import org.apache.cayenne.modeler.ui.project.ProjectView;
 import org.apache.cayenne.project.Project;
 import org.apache.cayenne.swing.components.image.FilteredIconFactory;