Merge remote-tracking branch 'remotes/parent/pr/251' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/2e077dd3 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/2e077dd3 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/2e077dd3 Branch: refs/heads/master Commit: 2e077dd3b0220436a040b69c47190cc333cabd03 Parents: ab6ec9e a941ea7 Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu Dec 7 14:10:08 2017 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu Dec 7 14:10:08 2017 +0300 ---------------------------------------------------------------------- .../action/DbEntityCounterpartAction.java | 40 ------------------ .../action/ObjEntityCounterpartAction.java | 18 ++++++++ .../modeler/undo/CayenneUndoableEdit.java | 12 ++++++ .../undo/RemoveAttributeUndoableEdit.java | 7 +--- .../undo/RemoveRelationshipUndoableEdit.java | 7 +--- .../cayenne/modeler/util/CayenneAction.java | 44 ++++++++++++++++++++ 6 files changed, 76 insertions(+), 52 deletions(-) ----------------------------------------------------------------------
