Merge PR #342
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b580bdad Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b580bdad Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b580bdad Branch: refs/heads/master Commit: b580bdad32875bec793b6d46bed3a75ac661641f Parents: 1edb4ee d20a03f Author: Nikita Timofeev <stari...@gmail.com> Authored: Wed Nov 14 17:12:29 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Wed Nov 14 17:12:29 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + UPGRADE.txt | 1 + .../cayenne/tools/CayenneGeneratorTask.java | 174 ++++-- .../cayenne/tools/CgenWithConfigTest.java | 158 ++++++ cayenne-ant/src/test/resources/cgenTest.map.xml | 22 + .../cayenne/gen/ArtifactsGenerationMode.java | 2 +- .../apache/cayenne/gen/CgenConfiguration.java | 392 +++++++++++++ .../java/org/apache/cayenne/gen/CgenModule.java | 34 ++ .../cayenne/gen/ClassGenerationAction.java | 480 ++++++---------- .../gen/ClientClassGenerationAction.java | 44 +- .../org/apache/cayenne/gen/EntityArtifact.java | 1 - .../cayenne/gen/xml/CgenConfigHandler.java | 257 +++++++++ .../apache/cayenne/gen/xml/CgenExtension.java | 54 ++ .../cayenne/gen/xml/CgenLoaderDelegate.java | 49 ++ .../cayenne/gen/xml/CgenSaverDelegate.java | 78 +++ .../CayenneGeneratorEmbeddableFilterAction.java | 34 ++ .../CayenneGeneratorEntityFilterAction.java | 29 +- .../cayenne/gen/ClassGenerationActionTest.java | 37 +- .../java/org/apache/cayenne/tools/CgenTask.java | 207 +++++-- .../org/apache/cayenne/tools/BaseTaskIT.java | 15 + .../org/apache/cayenne/tools/CgenTaskIT.java | 99 +++- .../org/apache/cayenne/tools/CgenTaskTest.java | 50 +- .../apache/cayenne/tools/DbGenerateTaskIT.java | 4 +- .../apache/cayenne/tools/GradlePluginIT.java | 2 +- .../org/apache/cayenne/tools/cgenMap.map.xml | 22 + .../tools/cgen_replaceDatamapMode.gradle | 31 + .../cayenne/tools/cgen_with_config.gradle | 27 + .../cayenne/tools/cgen_with_config.map.xml | 22 + .../cayenne/tools/cgen_with_configs.gradle | 32 ++ .../cayenne/project/CompoundSaverDelegate.java | 15 +- .../cayenne/project/FileProjectSaver.java | 2 + .../project/extension/BaseSaverDelegate.java | 13 + .../project/extension/SaverDelegate.java | 4 + .../org/apache/cayenne/schema/10/cgen.xsd | 47 ++ .../cayenne/tools/CayenneGeneratorMojo.java | 201 +++++-- .../cayenne/tools/CayenneGeneratorMojoTest.java | 70 +++ .../resources/cgen/project-to-test/cgen-pom.xml | 46 ++ .../cgen/project-to-test/datamap-and-pom.xml | 53 ++ .../project-to-test/replaceDatamapMode-pom.xml | 53 ++ .../src/test/resources/cgen/testCgen.map.xml | 22 + .../src/test/resources/cgen/testCgenMap.map.xml | 22 + .../cayenne/modeler/CayenneModelerFrame.java | 60 +- .../cayenne/modeler/CodeTemplateManager.java | 97 +++- .../modeler/action/GenerateCodeAction.java | 12 +- .../modeler/dialog/cgen/TemplateDialog.java | 87 +++ .../modeler/dialog/cgen/TemplateDialogView.java | 136 +++++ .../dialog/codegen/ClassesTabController.java | 203 ------- .../modeler/dialog/codegen/ClassesTabPanel.java | 141 ----- .../dialog/codegen/ClientModeController.java | 81 --- .../dialog/codegen/CodeGeneratorController.java | 169 ------ .../codegen/CodeGeneratorControllerBase.java | 380 ------------- .../dialog/codegen/CodeGeneratorDialog.java | 99 ---- .../dialog/codegen/CustomModeController.java | 235 -------- .../modeler/dialog/codegen/CustomModePanel.java | 137 ----- .../codegen/CustomPreferencesUpdater.java | 209 ------- .../dialog/codegen/GeneratorController.java | 563 ------------------- .../codegen/GeneratorControllerPanel.java | 55 -- .../dialog/codegen/GeneratorTabController.java | 115 ---- .../dialog/codegen/GeneratorTabPanel.java | 65 --- .../dialog/codegen/StandardModeController.java | 82 --- .../dialog/codegen/StandardModePanel.java | 42 -- .../dialog/codegen/StandardPanelComponent.java | 81 --- .../dialog/db/load/ModelerDbImportAction.java | 3 + .../modeler/dialog/pref/PreferenceDialog.java | 18 +- .../dialog/pref/TemplatePreferences.java | 37 +- .../modeler/editor/DataDomainTabbedView.java | 183 +++--- .../modeler/editor/DataMapTabbedView.java | 55 +- .../cayenne/modeler/editor/EditorView.java | 3 +- .../editor/cgen/ClassesTabController.java | 135 +++++ .../modeler/editor/cgen/ClassesTabPanel.java | 85 +++ .../editor/cgen/ClientModeController.java | 42 ++ .../editor/cgen/CodeGeneratorController.java | 255 +++++++++ .../cgen/CodeGeneratorControllerBase.java | 492 ++++++++++++++++ .../modeler/editor/cgen/CodeGeneratorPane.java | 51 ++ .../editor/cgen/CustomModeController.java | 188 +++++++ .../modeler/editor/cgen/CustomModePanel.java | 183 ++++++ .../editor/cgen/GeneratorController.java | 391 +++++++++++++ .../editor/cgen/GeneratorControllerPanel.java | 68 +++ .../editor/cgen/GeneratorTabController.java | 113 ++++ .../modeler/editor/cgen/GeneratorTabPanel.java | 104 ++++ .../editor/cgen/StandardModeController.java | 59 ++ .../modeler/editor/cgen/StandardModePanel.java | 45 ++ .../modeler/editor/cgen/domain/CgenPanel.java | 84 +++ .../modeler/editor/cgen/domain/CgenTab.java | 117 ++++ .../editor/cgen/domain/CgenTabController.java | 210 +++++++ .../modeler/init/CayenneModelerModule.java | 4 +- .../cayenne/modeler/util/ComboBoxAdapter.java | 72 +++ .../cayenne/modeler/util/ModelerUtil.java | 46 ++ 88 files changed, 5616 insertions(+), 3382 deletions(-) ----------------------------------------------------------------------
