Merge branch '115'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/469bacb4 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/469bacb4 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/469bacb4 Branch: refs/heads/master Commit: 469bacb44b3c47f4912d40977c6f3cd83ff85f24 Parents: 4d7433b ba54dc8 Author: Savva Kolbachev <[email protected]> Authored: Thu Nov 3 22:56:41 2016 +0300 Committer: Savva Kolbachev <[email protected]> Committed: Thu Nov 3 22:56:41 2016 +0300 ---------------------------------------------------------------------- docs/doc/src/main/resources/RELEASE-NOTES.txt | 3 +- .../cayenne/modeler/ProjectController.java | 64 +++++++-------- .../modeler/dialog/db/ConnectionWizard.java | 6 +- .../modeler/dialog/db/DataSourceWizard.java | 84 +++++++++++++++----- .../modeler/dialog/db/DataSourceWizardView.java | 6 +- .../dialog/pref/DataSourcePreferences.java | 11 +++ .../modeler/dialog/pref/GeneralPreferences.java | 6 ++ .../event/DataSourceModificationEvent.java | 42 ++++++++++ .../event/DataSourceModificationListener.java | 37 +++++++++ 9 files changed, 195 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
