Merge remote-tracking branch 'remotes/parent/pr/279' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/4aee557c Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/4aee557c Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/4aee557c Branch: refs/heads/master Commit: 4aee557cc7218a4e2ddf473a5b931bb6183cecbb Parents: 4cd1bea 587997f Author: Nikita Timofeev <stari...@gmail.com> Authored: Thu Mar 29 15:45:53 2018 +0300 Committer: Nikita Timofeev <stari...@gmail.com> Committed: Thu Mar 29 15:45:53 2018 +0300 ---------------------------------------------------------------------- .../cayenne/lifecycle/id/EntityIdCoder.java | 5 +- .../java/org/apache/cayenne/map/DataMap.java | 77 +++++++++----------- .../java/org/apache/cayenne/map/DbEntity.java | 8 +- .../java/org/apache/cayenne/map/Embeddable.java | 15 ++-- .../apache/cayenne/map/EmbeddedAttribute.java | 7 +- .../java/org/apache/cayenne/map/Entity.java | 17 +++-- .../org/apache/cayenne/map/EntityResolver.java | 1 + .../java/org/apache/cayenne/map/ObjEntity.java | 21 +++--- .../cayenne/map/ProxiedMappingNamespace.java | 2 + .../cayenne/map/SQLTemplateDescriptor.java | 4 +- .../cayenne/map/SelectQueryDescriptor.java | 4 +- .../cayenne/unit/di/server/SchemaBuilder.java | 14 ++-- .../cayenne/modeler/ProjectController.java | 38 +++++++++- .../cayenne/modeler/ProjectTreeFactory.java | 40 +++++----- .../modeler/action/ImportEOModelAction.java | 9 ++- .../codegen/CodeGeneratorControllerBase.java | 6 +- .../dialog/datamap/PackageUpdateController.java | 8 +- .../datamap/SuperclassUpdateController.java | 24 +++--- .../objentity/ObjAttributeInfoDialog.java | 1 + .../OverrideEmbeddableAttributeTableModel.java | 3 +- .../cayenne/modeler/editor/EmbeddableTab.java | 8 +- .../editor/ObjEntityRelationshipPanel.java | 25 +++---- .../cayenne/modeler/util/ModelerUtil.java | 2 +- 23 files changed, 180 insertions(+), 159 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/4aee557c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/4aee557c/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java ----------------------------------------------------------------------
