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 f3c501e48 CAY-2925 Remove "cayenne-modeler-maven-plugin"
new d77698ed2 Modeler - controller free architecture
new 354b6255d Modeler cleanup
new f1f4a0e19 Modeler cleanup
new 4eec71d1a Modeler cleanup
new baa4036fe Modeler cleanup
new 2f5d210b2 Modeler MainFrame - subtle resizing bug
The 6 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:
.claude/rules/modeler/modeler-architecture.md | 24 +-
.../org/apache/cayenne/modeler/Application.java | 33 +-
.../event/model/CallbackMethodListener.java | 12 +-
.../modeler/event/model/DataMapListener.java | 1 -
.../modeler/event/model/ProjectAfterSaveEvent.java | 8 +-
.../cayenne/modeler/graph/BaseGraphBuilder.java | 25 +-
.../cayenne/modeler/graph/DbGraphBuilder.java | 18 +-
.../apache/cayenne/modeler/graph/GraphBuilder.java | 4 +-
.../org/apache/cayenne/modeler/graph/GraphMap.java | 213 +++++---
.../cayenne/modeler/graph/GraphRegistry.java | 23 +-
.../cayenne/modeler/graph/ObjGraphBuilder.java | 18 +-
.../cayenne/modeler/mvc/ChildController.java | 55 ---
.../apache/cayenne/modeler/mvc/RootController.java | 118 -----
.../apache/cayenne/modeler/project/CgenOps.java | 9 +-
.../modeler/project/ProjectDirtyListener.java | 27 +-
.../{ui => }/project/ProjectFileChangeTracker.java | 32 +-
.../{ui => }/project/ProjectNavigationHistory.java | 28 +-
.../modeler/{ui => }/project/ProjectPrefs.java | 198 ++++----
.../ProjectSession.java} | 148 +++---
.../modeler/service/graph/GraphHandler.java | 23 +-
.../validator/ConfigurableProjectValidator.java | 2 +-
.../apache/cayenne/modeler/toolkit/AppDialog.java | 101 ++++
.../AppFrame.java} | 20 +-
.../AboutAction.java => toolkit/AppPanel.java} | 25 +-
.../apache/cayenne/modeler/toolkit/AppToolBar.java | 14 +
.../cayenne/modeler/toolkit/ProjectDialog.java | 26 +-
.../cayenne/modeler/toolkit/ProjectPanel.java | 28 +-
.../ProjectTabbedPane.java} | 36 +-
.../apache/cayenne/modeler/toolkit/Renderers.java | 14 +-
.../cayenne/modeler/toolkit/dialog/CMDialog.java | 90 ----
.../modeler/toolkit/table/CMTableModel.java | 16 +-
.../org/apache/cayenne/modeler/ui/MainFrame.java | 423 ++++++++++++++++
.../ui/{ModelerMenuBar.java => MainMenuBar.java} | 84 ++--
.../org/apache/cayenne/modeler/ui/MainToolBar.java | 77 +--
.../cayenne/modeler/ui/ModelerController.java | 252 ----------
.../apache/cayenne/modeler/ui/ModelerFrame.java | 189 -------
.../org/apache/cayenne/modeler/ui/SearchPanel.java | 41 +-
.../ui/about/{AboutDialog.java => AboutFrame.java} | 69 ++-
.../cayenne/modeler/ui/action/AboutAction.java | 4 +-
.../modeler/ui/action/BaseViewEntityAction.java | 10 +-
.../modeler/ui/action/CollapseTreeAction.java | 2 +-
.../ui/action/ConfigurePreferencesAction.java | 6 +-
.../cayenne/modeler/ui/action/CopyAction.java | 12 +-
.../modeler/ui/action/CopyAttributeAction.java | 10 +-
.../ui/action/CopyAttributeRelationshipAction.java | 8 +-
.../ui/action/CopyCallbackMethodAction.java | 6 +-
.../ui/action/CopyProcedureParameterAction.java | 6 +-
.../modeler/ui/action/CopyRelationshipAction.java | 8 +-
.../modeler/ui/action/CreateAttributeAction.java | 69 ++-
.../ui/action/CreateCallbackMethodAction.java | 13 +-
.../modeler/ui/action/CreateDataMapAction.java | 23 +-
.../modeler/ui/action/CreateDbEntityAction.java | 18 +-
.../modeler/ui/action/CreateEmbeddableAction.java | 17 +-
.../modeler/ui/action/CreateNodeAction.java | 17 +-
.../modeler/ui/action/CreateObjEntityAction.java | 22 +-
.../modeler/ui/action/CreateProcedureAction.java | 19 +-
.../ui/action/CreateProcedureParameterAction.java | 27 +-
.../modeler/ui/action/CreateQueryAction.java | 15 +-
.../ui/action/CreateRelationshipAction.java | 43 +-
.../cayenne/modeler/ui/action/CutAction.java | 6 +-
.../modeler/ui/action/CutAttributeAction.java | 4 +-
.../modeler/ui/action/CutCallbackMethodAction.java | 4 +-
.../ui/action/CutProcedureParameterAction.java | 4 +-
.../modeler/ui/action/CutRelationshipAction.java | 4 +-
.../modeler/ui/action/DBConnectionAwareAction.java | 17 +-
.../ui/action/DbEntityCounterpartAction.java | 2 +-
.../modeler/ui/action/DbEntitySyncAction.java | 22 +-
.../action/DisableValidationInspectionAction.java | 10 +-
.../cayenne/modeler/ui/action/FilterAction.java | 10 +-
.../cayenne/modeler/ui/action/FindAction.java | 82 ++--
.../modeler/ui/action/GenerateDBAction.java | 13 +-
.../modeler/ui/action/ImportDataMapAction.java | 12 +-
.../modeler/ui/action/ImportEOModelAction.java | 57 ++-
.../ui/action/InferRelationshipsAction.java | 9 +-
.../modeler/ui/action/LinkDataMapAction.java | 14 +-
.../modeler/ui/action/LinkDataMapsAction.java | 14 +-
.../cayenne/modeler/ui/action/MigrateAction.java | 24 +-
.../modeler/ui/action/ModelerAbstractAction.java | 26 +-
.../cayenne/modeler/ui/action/NavigateAction.java | 6 +-
.../modeler/ui/action/NavigateBackwardAction.java | 6 +-
.../modeler/ui/action/NavigateForwardAction.java | 6 +-
.../modeler/ui/action/NewProjectAction.java | 6 +-
.../ui/action/ObjEntityCounterpartAction.java | 2 +-
.../modeler/ui/action/ObjEntitySyncAction.java | 20 +-
.../ui/action/ObjEntityToSuperEntityAction.java | 2 +-
.../modeler/ui/action/OpenProjectAction.java | 28 +-
.../cayenne/modeler/ui/action/PasteAction.java | 62 +--
.../cayenne/modeler/ui/action/ProjectAction.java | 18 +-
.../cayenne/modeler/ui/action/ProjectOpener.java | 6 +-
.../cayenne/modeler/ui/action/RedoAction.java | 2 +-
.../cayenne/modeler/ui/action/RemoveAction.java | 270 +++++-----
.../modeler/ui/action/RemoveAttributeAction.java | 44 +-
.../ui/action/RemoveCallbackMethodAction.java | 19 +-
.../ui/action/RemoveProcedureParameterAction.java | 17 +-
.../ui/action/RemoveRelationshipAction.java | 30 +-
.../cayenne/modeler/ui/action/RevertAction.java | 12 +-
.../cayenne/modeler/ui/action/SaveAction.java | 10 +-
.../cayenne/modeler/ui/action/SaveAsAction.java | 27 +-
.../modeler/ui/action/ShowLogConsoleAction.java | 4 +-
.../ui/action/ShowValidationConfigAction.java | 8 +-
.../ui/action/ShowValidationOptionAction.java | 8 +-
.../cayenne/modeler/ui/action/UndoAction.java | 2 +-
.../ui/action/UpdateValidationConfigAction.java | 10 +-
.../cayenne/modeler/ui/action/ValidateAction.java | 39 +-
.../InferRelationshipsController.java | 439 -----------------
.../autorelationship/InferRelationshipsDialog.java | 383 +++++++++++++--
.../InferRelationshipsTabController.java | 18 +-
.../ui/confirmremove/ConfirmRemoveDialog.java | 2 +-
.../ui/datasource/DataSourceController.java | 254 ----------
.../modeler/ui/datasource/DataSourceDialog.java | 278 +++++++++++
.../modeler/ui/datasource/DataSourceView.java | 82 ----
.../ui/dbactionoptions/DbActionOptionsDialog.java | 16 +-
.../ui/dbgen/DBGeneratorOptionsController.java | 300 ------------
.../modeler/ui/dbgen/DBGeneratorOptionsDialog.java | 398 +++++++++++++++
.../modeler/ui/dbgen/DBGeneratorOptionsView.java | 228 ---------
.../modeler/ui/dbgen/TableSelectorController.java | 157 ------
.../modeler/ui/dbgen/TableSelectorPanel.java | 251 ++++++++++
.../modeler/ui/dbgen/TableSelectorView.java | 140 ------
...onsController.java => MergerOptionsDialog.java} | 277 ++++++-----
.../modeler/ui/dbmerge/MergerOptionsView.java | 138 ------
...torController.java => MergerTokenSelector.java} | 240 +++++----
.../ui/dbmerge/MergerTokenSelectorView.java | 99 ----
.../modeler/ui/dbmerge/MergerTokenTableModel.java | 6 +-
.../ui/dbrelationship/DbJoinTableModel.java | 10 +-
...ogController.java => DbRelationshipDialog.java} | 478 ++++++++++--------
.../dbrelationship/DbRelationshipDialogView.java | 211 --------
.../ui/entitysync/EntitySyncController.java | 127 -----
.../modeler/ui/entitysync/EntitySyncDialog.java | 129 ++++-
.../cayenne/modeler/ui/errors/ErrorDialog.java | 15 +-
.../apache/cayenne/modeler/ui/find/FindDialog.java | 190 +++++++
.../modeler/ui/find/FindDialogController.java | 106 ----
.../cayenne/modeler/ui/find/FindDialogView.java | 107 ----
.../{LogConsoleController.java => LogConsole.java} | 139 +++---
.../modeler/ui/logconsole/LogConsoleView.java | 96 ----
.../modeler/ui/preferences/PreferenceDialog.java | 224 +++++++++
.../ui/preferences/PreferenceDialogController.java | 147 ------
.../ui/preferences/PreferenceDialogView.java | 146 ------
.../classpath/ClasspathPreferencesController.java | 116 -----
.../classpath/ClasspathPreferencesView.java | 127 -----
.../preferences/classpath/ClasspathPrefsPanel.java | 188 +++++++
...gController.java => MavenDependencyDialog.java} | 130 +++--
.../classpath/maven/MavenDependencyDialogView.java | 96 ----
...ectorEditorView.java => DBConnectorEditor.java} | 77 ++-
.../dbconnector/DBConnectorEditorController.java | 79 ---
.../DBConnectorPreferencesController.java | 271 ----------
.../dbconnector/DBConnectorPreferencesView.java | 84 ----
.../dbconnector/DBConnectorPrefsPanel.java | 307 ++++++++++++
.../creator/DBConnectorCreatorController.java | 131 -----
.../creator/DBConnectorCreatorDialog.java | 166 +++++++
.../creator/DBConnectorCreatorView.java | 82 ----
.../DBConnectorDuplicatorController.java | 125 -----
.../duplicator/DBConnectorDuplicatorDialog.java | 144 ++++++
.../duplicator/DBConnectorDuplicatorView.java | 61 ---
.../general/GeneralPreferencesController.java | 58 ---
...PreferencesView.java => GeneralPrefsPanel.java} | 73 +--
.../more/MorePreferencesController.java | 88 ----
.../ui/preferences/more/MorePreferencesView.java | 60 ---
.../ui/preferences/more/MorePrefsPanel.java | 123 +++++
.../cayenne/modeler/ui/project/ProjectView.java | 55 ++-
.../modeler/ui/project/editor/EditorPanelView.java | 75 ++-
.../datadomain/DataDomainGeneratorsPanel.java | 20 +-
.../editor/datadomain/DataDomainGeneratorsTab.java | 227 +++++++++
.../datadomain/DataDomainGeneratorsView.java | 113 -----
.../DataDomainGeneratorsViewController.java | 180 -------
.../project/editor/datadomain/DataDomainView.java | 69 ++-
...nCgenController.java => DataDomainCgenTab.java} | 42 +-
.../editor/datadomain/cgen/DataDomainCgenView.java | 47 --
...tController.java => DataDomainDbImportTab.java} | 22 +-
.../dbimport/DataDomainDbImportView.java | 32 --
.../datadomain/graph/DataDomainGraphTab.java | 32 +-
.../graph/action/EntityDisplayAction.java | 2 +-
.../graph/action/RemoveEntityAction.java | 4 +-
.../datadomain/graph/action/SaveAsImageAction.java | 6 +-
.../graph/action/ShowGraphEntityAction.java | 21 +-
.../editor/datadomain/main/DataDomainMainView.java | 36 +-
.../datadomain/validation/ValidationTab.java | 143 +++++-
.../validation/ValidationTabController.java | 147 ------
.../ui/project/editor/datamap/DataMapView.java | 29 +-
.../cgen/CgenArtefactSelectorController.java | 194 --------
.../datamap/cgen/CgenArtefactSelectorPanel.java | 177 ++++++-
.../editor/datamap/cgen/CgenConfigController.java | 262 ----------
.../editor/datamap/cgen/CgenConfigPanel.java | 440 ++++++++++-------
.../ui/project/editor/datamap/cgen/CgenPane.java | 133 -----
.../cgen/{CgenController.java => CgenPanel.java} | 545 +++++++++++----------
.../cgen/templateeditor/EditorTemplateLoader.java | 2 +-
.../templateeditor/FindAndReplaceController.java | 118 -----
.../cgen/templateeditor/FindAndReplaceView.java | 85 ----
.../cgen/templateeditor/FindController.java | 107 ----
.../datamap/cgen/templateeditor/FindView.java | 98 ----
.../templateeditor/PreviewActionConfigurator.java | 16 +-
.../cgen/templateeditor/TemplateEditor.java | 373 ++++++++++++++
.../templateeditor/TemplateEditorController.java | 267 ----------
.../TemplateEditorFindAndReplaceDialog.java | 118 +++++
.../templateeditor/TemplateEditorFindDialog.java | 132 +++++
.../cgen/templateeditor/TemplateEditorView.java | 207 --------
.../datamap/dbimport/DbImportController.java | 89 ----
.../datamap/dbimport/DbImportResultDialog.java} | 123 +++--
.../editor/datamap/dbimport/DbImportView.java | 83 ++--
.../dbimport/ReverseEngineeringConfigPanel.java | 196 ++++----
.../dbimport/ReverseEngineeringTreePanel.java | 51 +-
...ggableTreePanel.java => SourceTargetPanel.java} | 130 ++---
.../datamap/dbimport/action/DeleteNodeAction.java | 4 +-
.../dbimport/action/DragAndDropNodeAction.java | 4 +-
.../dbimport/action/GetDbConnectionAction.java | 6 +-
.../dbimport/action/LoadDbSchemaAction.java | 48 +-
.../dbimport/action/ModelerDbImportAction.java | 32 +-
.../dbimport/action/MoveImportNodeAction.java | 10 +-
.../datamap/dbimport/action/SortNodesAction.java | 2 +-
.../dbimport/action/TreeManipulationAction.java | 6 +-
.../dbimport/progress/DbImportProgressDialog.java | 12 +-
.../dbimport/runner/DbImportProjectSaver.java | 13 +-
.../dbimport/runner/DbSyncDbImportAction.java | 13 +-
.../dbimport/runner/ModelerDbImportModule.java | 4 +-
.../dbimport/runner/ModelerDbLoaderContext.java | 14 +-
.../dbimport/runner/ModelerDbLoaderDelegate.java | 3 +-
.../defaults/DefaultsPreferencesController.java | 48 --
...ferencesView.java => DefaultsUpdateDialog.java} | 75 ++-
.../editor/datamap/main/DataMapMainView.java | 180 ++++---
...ateController.java => CatalogUpdateDialog.java} | 59 +--
.../main/locking/LockingUpdateController.java | 106 ----
.../datamap/main/locking/LockingUpdateDialog.java | 150 ++++++
.../datamap/main/locking/LockingUpdateView.java | 100 ----
...ateController.java => PackageUpdateDialog.java} | 97 ++--
...dateController.java => SchemaUpdateDialog.java} | 57 +--
...Controller.java => SuperclassUpdateDialog.java} | 64 +--
.../editor/datanode/DataNodeController.java | 321 ------------
.../editor/datanode/DataNodeEditorPanel.java | 330 +++++++++++++
.../ui/project/editor/datanode/DataNodeView.java | 129 -----
...eEditorController.java => DataSourcePanel.java} | 24 +-
.../custom/CustomDataSourceEditorController.java | 74 ---
...aSourceView.java => CustomDataSourcePanel.java} | 65 ++-
.../datanode/jdbc/JDBCDataSourceController.java | 142 ------
.../editor/datanode/jdbc/JDBCDataSourcePanel.java | 184 +++++++
.../editor/datanode/jdbc/JDBCDataSourceView.java | 111 -----
.../ui/project/editor/dbentity/DbEntityView.java | 36 +-
.../editor/dbentity/main/DbEntityMainView.java | 132 +++--
.../main/PKCustomSequenceGeneratorPanel.java | 26 +-
.../editor/dbentity/main/PKDBGeneratorPanel.java | 19 +-
.../dbentity/main/PKDefaultGeneratorPanel.java | 6 +-
.../editor/dbentity/main/PKGeneratorPanel.java | 14 +-
.../dbentity/properties/DbAttributePanel.java | 52 +-
.../dbentity/properties/DbAttributeTableModel.java | 14 +-
.../properties/DbEntityPropertiesView.java | 53 +-
.../dbentity/properties/DbRelationshipPanel.java | 64 +--
.../properties/DbRelationshipTableModel.java | 22 +-
.../project/editor/embeddable/EmbeddableView.java | 43 +-
.../attributes/EmbeddableAttributeTableModel.java | 8 +-
.../attributes/EmbeddableAttributesView.java | 91 ++--
.../editor/embeddable/main/EmbeddableMainView.java | 48 +-
.../ui/project/editor/objentity/ObjEntityView.java | 39 +-
...Controller.java => ObjAttributeInfoDialog.java} | 498 +++++++++++--------
.../attrinfo/ObjAttributeInfoDialogView.java | 253 ----------
.../OverrideEmbeddableAttributeTableModel.java | 9 +-
.../callbacks/CallbackDescriptorTableModel.java | 10 +-
.../callbacks/ObjEntityCallbacksView.java | 70 +--
.../classname/ClassNameUpdaterController.java | 16 +-
.../duplicates/DuplicatedAttributesDialog.java | 30 +-
.../editor/objentity/main/ObjEntityMainView.java | 161 +++---
.../DbRelationshipPathComboBoxEditor.java | 12 +-
.../objentity/properties/ObjAttributePanel.java | 93 ++--
.../properties/ObjAttributeTableModel.java | 34 +-
.../properties/ObjEntityPropertiesView.java | 33 +-
.../objentity/properties/ObjRelationshipPanel.java | 84 ++--
.../properties/ObjRelationshipTableModel.java | 12 +-
...troller.java => ObjRelationshipInfoDialog.java} | 471 +++++++++---------
.../objentity/relinfo/ObjRelationshipInfoView.java | 213 --------
.../editor/procedure/ProcedureParameterTab.java | 35 +-
.../procedure/ProcedureParameterTableModel.java | 8 +-
.../editor/procedure/ProcedureQueryView.java | 63 ++-
.../ui/project/editor/procedure/ProcedureTab.java | 54 +-
.../editor/procedure/ProcedureTabbedView.java | 36 +-
.../ui/project/editor/query/BaseQueryMainTab.java | 20 +-
.../editor/query/ObjectQueryPropertiesPanel.java | 8 +-
.../editor/query/RawQueryPropertiesPanel.java | 12 +-
.../project/editor/query/RootSelectionHandler.java | 4 +-
.../editor/query/SelectPropertiesPanel.java | 22 +-
.../editor/query/ejbql/EjbqlQueryMainTab.java | 47 +-
.../query/ejbql/EjbqlQueryPropertiesPanel.java | 6 +-
.../editor/query/ejbql/EjbqlQueryScriptsTab.java | 19 +-
.../editor/query/ejbql/EjbqlTabbedView.java | 29 +-
.../query/selectquery/SelectQueryMainTab.java | 36 +-
.../query/selectquery/SelectQueryOrderingTab.java | 22 +-
.../query/selectquery/SelectQueryPrefetchTab.java | 14 +-
.../query/selectquery/SelectQueryTabbedView.java | 31 +-
.../query/sqltemplate/SQLTemplateMainTab.java | 34 +-
.../query/sqltemplate/SQLTemplatePrefetchTab.java | 24 +-
.../query/sqltemplate/SQLTemplateScriptsTab.java | 24 +-
.../query/sqltemplate/SQLTemplateTabbedView.java | 34 +-
.../ui/project/querytype/QueryTypeController.java | 129 -----
.../ui/project/querytype/QueryTypeDialog.java | 143 ++++++
.../ui/project/querytype/QueryTypeView.java | 117 -----
...ProjectTreeController.java => ProjectTree.java} | 466 +++++++++++-------
.../modeler/ui/project/tree/ProjectTreeView.java | 200 --------
.../modeler/ui/project/tree/TreeDragSource.java | 10 +-
.../modeler/ui/project/tree/TreeDropTarget.java | 10 +-
.../tree/treefilter/TreeFilterController.java | 125 -----
.../project/tree/treefilter/TreeFilterPopup.java | 101 +++-
.../ui/project/validator/AttributeErrorMsg.java | 12 +-
.../ui/project/validator/DataMapErrorMsg.java | 6 +-
.../ui/project/validator/DataNodeErrorMsg.java | 6 +-
.../ui/project/validator/DomainErrorMsg.java | 6 +-
.../validator/EmbeddableAttributeErrorMsg.java | 8 +-
.../ui/project/validator/EmbeddableErrorMsg.java | 6 +-
.../ui/project/validator/EntityErrorMsg.java | 8 +-
.../ui/project/validator/ProcedureErrorMsg.java | 10 +-
.../validator/ProcedureParameterErrorMsg.java | 12 +-
...DialogView.java => ProjectValidatorDialog.java} | 121 +++--
.../ProjectValidatorDialogController.java | 89 ----
.../ui/project/validator/QueryErrorMsg.java | 10 +-
.../ui/project/validator/RelationshipErrorMsg.java | 12 +-
.../validator/ValidationDisplayHandler.java | 10 +-
.../ui/validation/ValidationController.java | 111 -----
.../modeler/ui/validation/ValidationDialog.java | 144 ++++++
.../modeler/ui/validation/ValidationView.java | 94 ----
.../cayenne/modeler/ui/welcome/WelcomeScreen.java | 68 +--
.../modeler/ui/welcome/WelcomeScreenMainPanel.java | 23 +
.../undo/BaseRemovePropertyUndoableEdit.java | 10 +-
.../cayenne/modeler/undo/CayenneUndoableEdit.java | 10 +-
.../undo/ChangePKGeneratorUndoableEdit.java | 12 +-
.../modeler/undo/CreateAttributeUndoableEdit.java | 14 +-
.../undo/CreateCallbackMethodUndoableEdit.java | 6 +-
.../modeler/undo/CreateDataMapUndoableEdit.java | 10 +-
.../modeler/undo/CreateDbEntityUndoableEdit.java | 6 +-
.../undo/CreateEmbAttributeUndoableEdit.java | 6 +-
.../modeler/undo/CreateEmbeddableUndoableEdit.java | 6 +-
.../modeler/undo/CreateNodeUndoableEdit.java | 8 +-
.../modeler/undo/CreateObjEntityUndoableEdit.java | 6 +-
.../undo/CreateProcedureParameterUndoableEdit.java | 8 +-
.../modeler/undo/CreateProcedureUndoableEdit.java | 6 +-
.../modeler/undo/CreateQueryUndoableEdit.java | 6 +-
.../undo/CreateRelationshipUndoableEdit.java | 16 +-
.../modeler/undo/DbEntitySyncUndoableEdit.java | 14 +-
.../modeler/undo/DbImportTreeUndoableEdit.java | 16 +-
.../modeler/undo/LinkDataMapUndoableEdit.java | 10 +-
.../modeler/undo/LinkDataMapsUndoableEdit.java | 12 +-
.../cayenne/modeler/undo/PasteUndoableEdit.java | 6 +-
.../modeler/undo/RelationshipUndoableEdit.java | 10 +-
.../modeler/undo/RemoveAttributeUndoableEdit.java | 14 +-
.../undo/RemoveCallbackMethodUndoableEdit.java | 6 +-
.../undo/RemoveRelationshipUndoableEdit.java | 10 +-
.../cayenne/modeler/undo/RemoveUndoableEdit.java | 48 +-
.../undo/UpdateValidationConfigUndoableEdit.java | 6 +-
.../modeler/util/NameGeneratorPreferences.java | 2 +-
.../templateeditor/EditorTemplateSaverTest.java | 1 -
.../PreviewActionConfiguratorTest.java | 18 +-
...trollerTest.java => GeneralPrefsPanelTest.java} | 6 +-
346 files changed, 11198 insertions(+), 14445 deletions(-)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/mvc/ChildController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/mvc/RootController.java
copy
cayenne-gradle-plugin/src/test/resources/org/apache/cayenne/tools/dbimport_simple_db.gradle
=>
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/project/ProjectDirtyListener.java
(77%)
rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ui =>
}/project/ProjectFileChangeTracker.java (86%)
rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ui =>
}/project/ProjectNavigationHistory.java (88%)
rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ui =>
}/project/ProjectPrefs.java (76%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ui/project/ProjectController.java
=> project/ProjectSession.java} (91%)
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppDialog.java
copy
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ui/action/CreateObjEntityFromDbAction.java
=> toolkit/AppFrame.java} (68%)
copy
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ui/action/AboutAction.java
=> toolkit/AppPanel.java} (68%)
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/AppToolBar.java
copy
cayenne-cgen/src/main/java/org/apache/cayenne/gen/property/StringPropertyDescriptorCreator.java
=>
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectDialog.java
(58%)
copy
cayenne-cgen/src/main/java/org/apache/cayenne/gen/ArtifactsGenerationMode.java
=>
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/ProjectPanel.java
(62%)
copy
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/{ui/action/ObjEntityCounterpartAction.java
=> toolkit/ProjectTabbedPane.java} (58%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/toolkit/dialog/CMDialog.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/MainFrame.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/{ModelerMenuBar.java
=> MainMenuBar.java} (63%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/ModelerController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/ModelerFrame.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/about/{AboutDialog.java
=> AboutFrame.java} (73%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/datasource/DataSourceView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/DBGeneratorOptionsView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorPanel.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbgen/TableSelectorView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/{MergerOptionsController.java
=> MergerOptionsDialog.java} (59%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerOptionsView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/{MergerTokenSelectorController.java
=> MergerTokenSelector.java} (51%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbmerge/MergerTokenSelectorView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/{DbRelationshipDialogController.java
=> DbRelationshipDialog.java} (51%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/entitysync/EntitySyncController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialog.java
delete mode 100755
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogController.java
delete mode 100755
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/find/FindDialogView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/{LogConsoleController.java
=> LogConsole.java} (59%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/logconsole/LogConsoleView.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/PreferenceDialogView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPreferencesView.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/ClasspathPrefsPanel.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/{MavenDependencyDialogController.java
=> MavenDependencyDialog.java} (52%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/classpath/maven/MavenDependencyDialogView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/{DBConnectorEditorView.java
=> DBConnectorEditor.java} (64%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorEditorController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPreferencesController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPreferencesView.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/DBConnectorPrefsPanel.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/creator/DBConnectorCreatorView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/dbconnector/duplicator/DBConnectorDuplicatorView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/GeneralPreferencesController.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/general/{GeneralPreferencesView.java
=> GeneralPrefsPanel.java} (63%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePreferencesView.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/preferences/more/MorePrefsPanel.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsTab.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainGeneratorsViewController.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/{DataDomainCgenController.java
=> DataDomainCgenTab.java} (74%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/{DataDomainDbImportController.java
=> DataDomainDbImportTab.java} (71%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/validation/ValidationTabController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenArtefactSelectorController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenConfigController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/CgenPane.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/{CgenController.java
=> CgenPanel.java} (64%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindAndReplaceView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/FindView.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditor.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindAndReplaceDialog.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorFindDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/cgen/templateeditor/TemplateEditorView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/DbImportController.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/{dbloadresult/DbLoadResultDialog.java
=> project/editor/datamap/dbimport/DbImportResultDialog.java} (58%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/dbimport/{DraggableTreePanel.java
=> SourceTargetPanel.java} (93%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/DefaultsPreferencesController.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/defaults/{DefaultsPreferencesView.java
=> DefaultsUpdateDialog.java} (57%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/catalog/{CatalogUpdateController.java
=> CatalogUpdateDialog.java} (57%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/locking/LockingUpdateView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/pkg/{PackageUpdateController.java
=> PackageUpdateDialog.java} (51%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/schema/{SchemaUpdateController.java
=> SchemaUpdateDialog.java} (57%)
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datamap/main/superclass/{SuperclassUpdateController.java
=> SuperclassUpdateDialog.java} (50%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeEditorPanel.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/DataNodeView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/{DataSourceEditorController.java
=> DataSourcePanel.java} (68%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/custom/CustomDataSourceEditorController.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/custom/{CustomDataSourceView.java
=> CustomDataSourcePanel.java} (51%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourceController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourcePanel.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datanode/jdbc/JDBCDataSourceView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/{ObjAttributeInfoDialogController.java
=> ObjAttributeInfoDialog.java} (59%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/{ObjRelationshipInfoController.java
=> ObjRelationshipInfoDialog.java} (53%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeView.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/{ProjectTreeController.java
=> ProjectTree.java} (68%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeView.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/treefilter/TreeFilterController.java
rename
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/{ProjectValidatorDialogView.java
=> ProjectValidatorDialog.java} (63%)
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProjectValidatorDialogController.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationController.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationDialog.java
delete mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/validation/ValidationView.java
create mode 100644
modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/welcome/WelcomeScreenMainPanel.java
rename
modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/ui/preferences/general/{GeneralPreferencesControllerTest.java
=> GeneralPrefsPanelTest.java} (87%)
