Merge branch '126'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/94dfec08 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/94dfec08 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/94dfec08 Branch: refs/heads/master Commit: 94dfec08d5b9d678804c4ede39ac48a18694f52f Parents: db6aab4 a3ca56f Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Fri Nov 11 21:51:43 2016 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Fri Nov 11 21:51:43 2016 +0300 ---------------------------------------------------------------------- docs/doc/pom.xml | 6 +- modeler/cayenne-modeler-generic-ext/pom.xml | 4 +- .../generic/GenericPlatformInitializer.java | 2 +- modeler/cayenne-modeler-win-ext/pom.xml | 93 ++++++++++++++++++++ .../modeler/win/WinCayenneModelerModule.java | 30 +++++++ .../org/apache/cayenne/modeler/win/WinMain.java | 50 +++++++++++ .../modeler/win/WinPlatformInitializer.java | 43 +++++++++ modeler/cayenne-modeler-win/pom.xml | 7 +- modeler/cayenne-modeler/pom.xml | 2 +- .../dialog/db/DbLoaderOptionsDialog.java | 25 ++++-- .../objentity/ObjAttributeInfoDialogView.java | 4 +- .../cayenne/modeler/editor/EditorView.java | 2 +- .../modeler/editor/dbentity/DbEntityTab.java | 2 +- .../util/PathChooserComboBoxCellEditor.java | 3 + modeler/pom.xml | 3 +- pom.xml | 12 +-- 16 files changed, 260 insertions(+), 28 deletions(-) ----------------------------------------------------------------------