Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/b14e9d82 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/b14e9d82 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/b14e9d82 Branch: refs/heads/master Commit: b14e9d82a854d37f8fee03a662735e2e4c9365f3 Parents: 1a722e5 fca0df5 Author: alexkolonitsky <alex.kolonit...@gmail.com> Authored: Mon Oct 27 15:51:11 2014 +0300 Committer: alexkolonitsky <alex.kolonit...@gmail.com> Committed: Mon Oct 27 15:51:11 2014 +0300 ---------------------------------------------------------------------- README.md | 4 +- docs/doc/src/main/resources/RELEASE-NOTES.txt | 1 + .../cayenne/modeler/ProjectController.java | 18 ++ .../modeler/action/DefaultActionManager.java | 4 +- .../modeler/action/GenerateCodeAction.java | 34 +++- .../modeler/action/GenerateDBAction.java | 30 +-- .../modeler/dialog/ValidationResultBrowser.java | 28 ++- .../dialog/codegen/ClientModeController.java | 62 +++++- .../dialog/codegen/CodeGeneratorController.java | 29 +-- .../codegen/CodeGeneratorControllerBase.java | 38 ++-- .../dialog/codegen/CodeGeneratorDialog.java | 24 ++- .../dialog/codegen/CustomModeController.java | 196 ++++++++++++------- .../modeler/dialog/codegen/CustomModePanel.java | 71 +++---- .../codegen/CustomPreferencesUpdater.java | 178 +++++++++++++++++ .../dialog/codegen/GeneratorController.java | 107 ++++++---- .../codegen/GeneratorControllerPanel.java | 10 +- .../dialog/codegen/GeneratorTabController.java | 11 +- .../dialog/codegen/GeneratorTabPanel.java | 15 +- .../dialog/codegen/StandardModeController.java | 73 ++++--- .../dialog/codegen/StandardModePanel.java | 35 ++-- .../dialog/codegen/StandardPanelComponent.java | 62 ++++++ .../modeler/dialog/db/DBGeneratorOptions.java | 124 ++++++------ .../dialog/db/TableSelectorController.java | 22 ++- .../modeler/pref/DBGeneratorDefaults.java | 19 +- .../cayenne/modeler/util/CayenneTable.java | 11 +- .../modeler/util/TableHeaderListener.java | 133 +++++++++++++ .../util/TableHeaderSortingListener.java | 88 --------- 27 files changed, 981 insertions(+), 446 deletions(-) ----------------------------------------------------------------------
