Merge remote-tracking branch 'remotes/parent/pr/266' 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/e8cae770 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e8cae770 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e8cae770 Branch: refs/heads/master Commit: e8cae770ed781c96bb949737a805b84e29bf1536 Parents: 383cfb0 221bed6 Author: Nikita Timofeev <[email protected]> Authored: Wed Feb 7 14:55:42 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Wed Feb 7 14:55:42 2018 +0300 ---------------------------------------------------------------------- .../apache/cayenne/modeler/ProjectTreeView.java | 76 +++++++++-------- .../cayenne/modeler/graph/BaseGraphBuilder.java | 90 +++++++++++--------- 2 files changed, 94 insertions(+), 72 deletions(-) ----------------------------------------------------------------------
