This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 9a3cd2f46 Merge pull request #520 from Ivan-nikitko/CAY-2758_refactoring_for_a_extended_TemplateType new 652ede964 template editor feature new 9cdf378e1 Merge remote-tracking branch 'parent/pr/522' into asf-master new feb1b89f9 CAY-2761 Modeler: Editor for the cgen templates - minor code cleanup The 3 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: .../apache/cayenne/gen/ClassGenerationAction.java | 19 +- modeler/cayenne-modeler/pom.xml | 6 + .../modeler/dialog/pref/TemplatePreferences.java | 26 +- .../dialog/pref/TemplatePreferencesView.java | 7 + .../dialog/templateeditor/FileTemplateSaver.java | 46 +- .../templateeditor/FindAndReplaceController.java | 121 +++ .../dialog/templateeditor/FindAndReplaceView.java | 88 ++ .../dialog/templateeditor/FindController.java | 110 ++ .../modeler/dialog/templateeditor/FindView.java | 101 ++ .../PreviewClassGenerationFactory.java | 26 +- .../templateeditor/PreviewGenerationAction.java | 45 +- .../templateeditor/TemplateEditorController.java | 198 ++++ .../dialog/templateeditor/TemplateEditorView.java | 187 ++++ .../dialog/templateeditor/TemplateLoader.java | 58 ++ .../dialog/templateeditor/VelocityTokenMaker.java | 1065 ++++++++++++++++++++ .../modeler/images/icon-find_and_replace.png | Bin 0 -> 620 bytes pom.xml | 5 + 17 files changed, 2053 insertions(+), 55 deletions(-) copy cayenne-server/src/main/java/org/apache/cayenne/configuration/xml/DefaultHandlerFactory.java => modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FileTemplateSaver.java (50%) create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceController.java create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindAndReplaceView.java create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindController.java create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FindView.java copy cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java => modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewClassGenerationFactory.java (61%) copy cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java => modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/PreviewGenerationAction.java (51%) create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorController.java create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorView.java create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateLoader.java create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/VelocityTokenMaker.java create mode 100644 modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/images/icon-find_and_replace.png