You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by sk...@apache.org on 2016/11/16 18:46:04 UTC
[9/9] cayenne git commit: Merge branch '129'
Merge branch '129'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/74e5e2f3
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/74e5e2f3
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/74e5e2f3
Branch: refs/heads/master
Commit: 74e5e2f3ce75217c1ddefd32cef85a8ef473059f
Parents: 4bd2cad 1462b2d
Author: Savva Kolbachev <s....@gmail.com>
Authored: Wed Nov 16 21:39:38 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Wed Nov 16 21:39:38 2016 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/merge/AbstractToDbToken.java | 4 +
.../dbsync/merge/AbstractToModelToken.java | 4 +
.../dbsync/merge/AddRelationshipToDb.java | 23 +-
.../dbsync/merge/AddRelationshipToModel.java | 7 +-
.../apache/cayenne/dbsync/merge/DbMerger.java | 21 +-
.../dbsync/merge/DropRelationshipToDb.java | 13 +-
.../cayenne/dbsync/merge/DummyReverseToken.java | 5 +
.../cayenne/dbsync/merge/MergerToken.java | 4 +
.../dbsync/merge/DropRelationshipToModelIT.java | 6 +-
.../apache/cayenne/dbsync/merge/MergeCase.java | 13 +-
.../cayenne/dbsync/merge/MergerFactoryIT.java | 8 +-
.../cayenne/dbsync/merge/TokensReversTest.java | 89 -------
.../cayenne/dbsync/merge/TokensReverseTest.java | 90 +++++++
.../tools/dbimport/DefaultDbImportAction.java | 2 +-
.../modeler/dialog/db/MergerOptions.java | 264 ++++++-------------
.../db/MergerTokenSelectorController.java | 4 +-
16 files changed, 236 insertions(+), 321 deletions(-)
----------------------------------------------------------------------