You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2018/09/19 06:49:50 UTC
[2/2] cayenne git commit: Merge PR #315
Merge PR #315
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/ad4d2006
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/ad4d2006
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/ad4d2006
Branch: refs/heads/master
Commit: ad4d2006aa1a4b454cf1835ee311340734cc5a32
Parents: 6221d5e d9f208f
Author: Nikita Timofeev <st...@gmail.com>
Authored: Wed Sep 19 09:49:23 2018 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Wed Sep 19 09:49:23 2018 +0300
----------------------------------------------------------------------
RELEASE-NOTES.txt | 1 +
.../modeler/dialog/ErrorDebugDialog.java | 39 ++++++++++----------
.../cayenne/modeler/dialog/FindDialogView.java | 1 +
.../dialog/ResolveDbRelationshipDialog.java | 2 +
.../dialog/ValidationResultBrowserView.java | 2 +
.../InferRelationshipsDialog.java | 15 ++++----
.../dialog/datamap/DefaultsPreferencesView.java | 14 +++----
.../dialog/datamap/LockingUpdateView.java | 17 +++++----
.../modeler/dialog/db/DataSourceWizardView.java | 2 +
.../dialog/db/DbActionOptionsDialog.java | 21 ++++++-----
.../dialog/db/load/DbLoadResultDialog.java | 2 +
.../dialog/db/merge/MergerOptionsView.java | 25 ++++++-------
.../dialog/objentity/ClassNameUpdaterView.java | 12 +++---
.../objentity/DbRelationshipTargetView.java | 22 +++++------
.../dialog/objentity/EntitySyncDialog.java | 15 ++++----
.../objentity/ObjAttributeInfoDialog.java | 6 +--
.../objentity/ObjAttributeInfoDialogView.java | 3 +-
.../objentity/ObjRelationshipInfoView.java | 27 +++++++-------
.../dialog/pref/DataSourceCreatorView.java | 11 +++---
.../dialog/pref/DataSourceDuplicatorView.java | 11 +++---
.../dialog/pref/PreferenceDialogView.java | 20 +++++-----
.../dialog/pref/TemplateCreatorView.java | 16 ++++----
.../modeler/dialog/query/QueryTypeView.java | 18 ++++-----
.../validator/DuplicatedAttributesDialog.java | 38 +++++++++----------
.../dialog/validator/ValidatorDialog.java | 4 +-
.../modeler/util/MultiColumnBrowser.java | 19 +++++-----
.../cayenne/modeler/util/ProgressDialog.java | 14 +++----
27 files changed, 198 insertions(+), 179 deletions(-)
----------------------------------------------------------------------