This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 9cdf378e1dace9f0964e2f4e7d15050ed6ce504b Merge: 3b0e9a1fe 652ede964 Author: Nikita Timofeev <[email protected]> AuthorDate: Thu Sep 29 15:41:40 2022 +0300 Merge remote-tracking branch 'parent/pr/522' into asf-master .../apache/cayenne/tools/CayenneGeneratorTask.java | 7 +- .../org/apache/cayenne/gen/CgenConfiguration.java | 16 +- .../apache/cayenne/gen/ClassGenerationAction.java | 57 +- .../cayenne/gen/SingleClassGenerationTest.java | 8 +- .../cayenne/gen/SuperClassGenerationTest.java | 8 +- .../java/org/apache/cayenne/tools/CgenTask.java | 7 +- .../apache/cayenne/tools/CayenneGeneratorMojo.java | 7 +- modeler/cayenne-modeler/pom.xml | 6 + .../modeler/dialog/cgen/TemplateDialog.java | 5 +- .../modeler/dialog/pref/TemplatePreferences.java | 9 +- .../dialog/pref/TemplatePreferencesView.java | 7 + .../dialog/templateeditor/FileTemplateSaver.java | 60 ++ .../templateeditor/FindAndReplaceController.java | 121 +++ .../dialog/templateeditor/FindAndReplaceView.java | 88 ++ .../dialog/templateeditor/FindController.java | 110 ++ .../modeler/dialog/templateeditor/FindView.java | 101 ++ .../PreviewClassGenerationFactory.java | 55 + .../templateeditor/PreviewGenerationAction.java | 64 ++ .../templateeditor/TemplateEditorController.java | 201 ++++ .../dialog/templateeditor/TemplateEditorView.java | 187 ++++ .../dialog/templateeditor/TemplateLoader.java | 58 ++ .../dialog/templateeditor/VelocityTokenMaker.java | 1065 ++++++++++++++++++++ .../editor/cgen/StandardModeController.java | 16 +- .../modeler/images/icon-find_and_replace.png | Bin 0 -> 620 bytes pom.xml | 5 + 25 files changed, 2187 insertions(+), 81 deletions(-)
