Merge PR #355
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/45da5a0d Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/45da5a0d Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/45da5a0d Branch: refs/heads/master Commit: 45da5a0d1432c5c9a698734f3c917a9598789f2d Parents: 560086e 14d1aee Author: Nikita Timofeev <stari...@gmail.com> Authored: Tue Nov 27 12:21:22 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Tue Nov 27 12:21:22 2018 +0300 ---------------------------------------------------------------------- .../modeler/CayenneModelerController.java | 10 +-- .../apache/cayenne/modeler/ProjectTreeView.java | 2 +- .../action/ReverseEngineeringAction.java | 4 +- .../dialog/db/load/ModelerDbImportAction.java | 19 +++-- .../modeler/editor/DbImportController.java | 83 ++++++++++++++++++++ .../editor/GlobalDbImportController.java | 77 ------------------ .../editor/cgen/CodeGeneratorController.java | 6 +- .../dbimport/domain/DbImportTabController.java | 2 +- .../cayenne/modeler/util/ModelerLogFactory.java | 13 ++- .../cayenne/modeler/util/ModelerLogger.java | 6 +- .../cayenne/modeler/util/NoopModelerLogger.java | 43 ++++++++++ 11 files changed, 159 insertions(+), 106 deletions(-) ----------------------------------------------------------------------
