You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2022/11/24 13:55:14 UTC
[cayenne] 02/02: Merge branch 'pr/542' into asf-master

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 f95ed0b294a48f2c2415b8179be8e8c310258246
Merge: 6ab2d90bc a80f94673
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Nov 24 16:54:47 2022 +0300

    Merge branch 'pr/542' into asf-master

 .../apache/cayenne/tools/CayenneGeneratorTask.java |  82 ++++++-----
 .../cayenne/tools/CayenneGeneratorTaskTest.java    | 113 +++++++-------
 .../org/apache/cayenne/gen/CgenConfigList.java     |  66 +++++++++
 .../org/apache/cayenne/gen/CgenConfiguration.java  |  15 +-
 .../java/org/apache/cayenne/gen/CgenTemplate.java  |  23 ++-
 .../java/org/apache/cayenne/gen/TemplateType.java  |  10 +-
 .../apache/cayenne/gen/xml/CgenConfigHandler.java  |  30 +++-
 .../apache/cayenne/gen/xml/CgenSaverDelegate.java  |  15 +-
 .../java/org/apache/cayenne/tools/CgenTask.java    |  62 ++++----
 .../org/apache/cayenne/tools/CgenTaskTest.java     |  43 +++---
 .../org/apache/cayenne/schema/11/cgen.xsd          |   1 +
 .../apache/cayenne/tools/CayenneGeneratorMojo.java |  83 ++++++-----
 .../cayenne/tools/CayenneGeneratorMojoTest.java    |  70 ++++-----
 .../generic/GenericPlatformInitializer.java        |   1 +
 .../modeler/osx/OSXPlatformInitializer.java        |   3 +-
 .../modeler/win/WinPlatformInitializer.java        |   1 +
 .../modeler/editor/cgen/CheckBoxHeader.java        |  82 +++++++++++
 .../modeler/editor/cgen/ClassesTabController.java  |  31 ++--
 .../modeler/editor/cgen/ClassesTabPanel.java       |   5 +
 .../editor/cgen/CodeGeneratorController.java       | 164 +++++++++++++++++----
 .../modeler/editor/cgen/CodeGeneratorPane.java     | 110 +++++++++-----
 .../modeler/editor/cgen/SelectionModel.java        |   6 +
 .../editor/cgen/StandardModeController.java        |   1 -
 .../modeler/editor/cgen/StandardModePanel.java     |   7 +-
 .../editor/cgen/domain/CgenTabController.java      |  41 +++---
 .../cgen/templateeditor/EditorTemplateSaver.java   |  12 +-
 .../templateeditor/TemplateEditorController.java   |   1 +
 27 files changed, 728 insertions(+), 350 deletions(-)