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/12/19 11:46:26 UTC
[10/10] cayenne git commit: Merge branch '157'
Merge branch '157'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/27138761
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/27138761
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/27138761
Branch: refs/heads/master
Commit: 27138761c90564ce772b9370ce9bb4f5a222156a
Parents: 1a647b2 a1f10f4
Author: Savva Kolbachev <s....@gmail.com>
Authored: Mon Dec 19 14:45:45 2016 +0300
Committer: Savva Kolbachev <s....@gmail.com>
Committed: Mon Dec 19 14:45:45 2016 +0300
----------------------------------------------------------------------
docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 +
.../cayenne/modeler/action/DBWizardAction.java | 130 +++---
.../modeler/action/GenerateDBAction.java | 9 +-
.../cayenne/modeler/action/MigrateAction.java | 82 +---
.../action/ReverseEngineeringAction.java | 85 ++--
.../modeler/dialog/DbImportProjectSaver.java | 77 ----
.../modeler/dialog/db/ConnectionWizard.java | 87 ----
.../modeler/dialog/db/DBGeneratorOptions.java | 345 ----------------
.../dialog/db/DBGeneratorOptionsView.java | 178 --------
.../modeler/dialog/db/DataSourceController.java | 219 ----------
.../modeler/dialog/db/DataSourceView.java | 100 -----
.../modeler/dialog/db/DataSourceWizard.java | 80 ++--
.../dialog/db/DbActionOptionsDialog.java | 178 ++++++++
.../modeler/dialog/db/DbLoaderHelper.java | 401 -------------------
.../dialog/db/DbLoaderOptionsDialog.java | 247 ------------
.../dialog/db/DbMigrateOptionsDialog.java | 175 --------
.../modeler/dialog/db/MergerOptions.java | 394 ------------------
.../modeler/dialog/db/MergerOptionsView.java | 134 -------
.../db/MergerTokenSelectorController.java | 239 -----------
.../dialog/db/MergerTokenSelectorView.java | 106 -----
.../dialog/db/MergerTokenTableModel.java | 128 ------
.../dialog/db/ModelerDbImportAction.java | 67 ----
.../dialog/db/TableSelectorController.java | 251 ------------
.../modeler/dialog/db/TableSelectorView.java | 94 -----
.../dialog/db/gen/DBGeneratorOptions.java | 332 +++++++++++++++
.../dialog/db/gen/DBGeneratorOptionsView.java | 178 ++++++++
.../dialog/db/gen/TableSelectorController.java | 251 ++++++++++++
.../dialog/db/gen/TableSelectorView.java | 94 +++++
.../dialog/db/load/DbImportProjectSaver.java | 74 ++++
.../modeler/dialog/db/load/DbLoaderContext.java | 183 +++++++++
.../dialog/db/load/DbLoaderOptionsDialog.java | 117 ++++++
.../modeler/dialog/db/load/LoadDataMapTask.java | 97 +++++
.../modeler/dialog/db/load/LoaderDelegate.java | 71 ++++
.../dialog/db/load/ModelerDbImportAction.java | 53 +++
.../dialog/db/load/ModelerSyncModule.java | 44 ++
.../modeler/dialog/db/merge/MergerOptions.java | 394 ++++++++++++++++++
.../dialog/db/merge/MergerOptionsView.java | 134 +++++++
.../db/merge/MergerTokenSelectorController.java | 240 +++++++++++
.../db/merge/MergerTokenSelectorView.java | 106 +++++
.../dialog/db/merge/MergerTokenTableModel.java | 129 ++++++
.../cayenne/modeler/util/DbAdapterInfo.java | 2 +-
41 files changed, 2829 insertions(+), 3477 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/27138761/docs/doc/src/main/resources/RELEASE-NOTES.txt
----------------------------------------------------------------------
diff --cc docs/doc/src/main/resources/RELEASE-NOTES.txt
index 7281967,ca2395c..55b2757
--- a/docs/doc/src/main/resources/RELEASE-NOTES.txt
+++ b/docs/doc/src/main/resources/RELEASE-NOTES.txt
@@@ -19,7 -19,7 +19,8 @@@ CAY-2165 Explicit "contribution" API fo
CAY-2166 Auto-loading of Cayenne modules
CAY-2168 Split DbLoader to parts and clean it up
CAY-2169 Split DbMerger to parts and clean it up
+ CAY-2172 Cleanup Modeler import and migrate db actions
+CAY-2176 Java 7 diamond class generation templates
Bug Fixes: