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 2018/10/01 15:05:22 UTC
[3/3] cayenne git commit: Merge PR #325
Merge PR #325
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/37d83244
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/37d83244
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/37d83244
Branch: refs/heads/STABLE-4.0
Commit: 37d8324438e618099fcf8e1ff179d961c069e25a
Parents: 20f9d38 7bd2ca9
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Oct 1 18:04:53 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Oct 1 18:04:53 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 2 +
.../cayenne/gen/ClassGenerationAction.java | 2 +-
.../gen/ClientClassGenerationAction.java | 9 +-
.../cayenne/modeler/CodeTemplateManager.java | 3 +
.../modeler/action/GenerateCodeAction.java | 30 +----
.../dialog/codegen/ClassesTabController.java | 132 +++++++++++++++---
.../modeler/dialog/codegen/ClassesTabPanel.java | 89 +++++++++++--
.../dialog/codegen/ClientModeController.java | 39 ------
.../dialog/codegen/CodeGeneratorController.java | 18 ++-
.../codegen/CodeGeneratorControllerBase.java | 133 ++++++++++++++++---
.../dialog/codegen/CodeGeneratorDialog.java | 24 ++--
.../dialog/codegen/CustomModeController.java | 100 ++++++--------
.../modeler/dialog/codegen/CustomModePanel.java | 57 +++-----
.../dialog/codegen/GeneratorController.java | 91 ++++---------
.../dialog/codegen/GeneratorTabController.java | 13 +-
.../dialog/codegen/StandardModeController.java | 30 +----
.../dialog/codegen/StandardModePanel.java | 18 +--
17 files changed, 441 insertions(+), 349 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/37d83244/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc RELEASE-NOTES.txt
index 7b5e681,6b18383..ef6fa06
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@@ -12,11 -12,10 +12,13 @@@ Release: 4.0.
Date:
----------------------------------
+=======
Changes/New Features:
-CAY-2479 Modeler: update cgen dialog
+CAY-2473 Modeler: cleanup attributes and relationship editors
+CAY-2475 Modeler: move inheritance icon to name column in objAttr table and objRel table
+ CAY-2476 Modeler: Fixed wrong behaviour of code generation dialog
++CAY-2479 Modeler: update cgen dialog
Bug Fixes: