Merge PR #324
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/20f9d389 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/20f9d389 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/20f9d389 Branch: refs/heads/STABLE-4.0 Commit: 20f9d38992e01e5319b02f0f6c50ebf6662a09f9 Parents: 15471c0 467371d Author: Nikita Timofeev <stari...@gmail.com> Authored: Mon Oct 1 18:03:23 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Mon Oct 1 18:03:23 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../objentity/ObjAttributeInfoDialog.java | 10 +-- .../modeler/editor/ObjAttributeTableModel.java | 32 +++------ .../modeler/editor/ObjEntityAttributePanel.java | 75 +++++++++++--------- .../editor/ObjEntityRelationshipPanel.java | 44 +++++++++++- .../util/DbRelationshipPathComboBoxEditor.java | 32 ++++++--- 6 files changed, 125 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/20f9d389/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --cc RELEASE-NOTES.txt index 2ec587f,e2e491c..7b5e681 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@@ -15,7 -15,7 +15,8 @@@ Date ======= Changes/New Features: +CAY-2473 Modeler: cleanup attributes and relationship editors + CAY-2475 Modeler: move inheritance icon to name column in objAttr table and objRel table Bug Fixes: http://git-wip-us.apache.org/repos/asf/cayenne/blob/20f9d389/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/20f9d389/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java ----------------------------------------------------------------------
