Repository: polygene-java Updated Branches: refs/heads/develop 1014f044b -> 4fb01aa37
implementation of #findVisibleXxxTypes replaced with delegation to TypeLookup Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/4fb01aa3 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/4fb01aa3 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/4fb01aa3 Branch: refs/heads/develop Commit: 4fb01aa378b8ff857d432d9f988d694ee4cc4e0f Parents: 1014f04 Author: soelvsten <kent.soelvs...@gmail.com> Authored: Mon Jan 22 00:14:49 2018 +0100 Committer: soelvsten <kent.soelvs...@gmail.com> Committed: Mon Jan 22 00:14:49 2018 +0100 ---------------------------------------------------------------------- .../polygene/runtime/structure/ModuleModel.java | 32 ++------------------ 1 file changed, 3 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/4fb01aa3/core/runtime/src/main/java/org/apache/polygene/runtime/structure/ModuleModel.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/main/java/org/apache/polygene/runtime/structure/ModuleModel.java b/core/runtime/src/main/java/org/apache/polygene/runtime/structure/ModuleModel.java index f44f478..7f9bd12 100644 --- a/core/runtime/src/main/java/org/apache/polygene/runtime/structure/ModuleModel.java +++ b/core/runtime/src/main/java/org/apache/polygene/runtime/structure/ModuleModel.java @@ -273,45 +273,19 @@ public class ModuleModel @Override public Stream<? extends EntityDescriptor> findVisibleEntityTypes() { - return concat( visibleEntities( module ), - concat( - layer().visibleEntities( layer ), - concat( - layer().visibleEntities( application ), - layer().usedLayers().layers().flatMap( layer1 -> layer1.visibleEntities( application ) ) - ) - ) - ); + return typeLookup.allEntities(); } @Override public Stream<? extends TransientDescriptor> findVisibleTransientTypes() { - return concat( visibleTransients( module ), - concat( - layer().visibleTransients( layer ), - concat( - layer().visibleTransients( application ), - layer().usedLayers() - .layers() - .flatMap( layer1 -> layer1.visibleTransients( application ) ) - ) - ) - ); + return typeLookup.allTransients(); } @Override public Stream<? extends ObjectDescriptor> findVisibleObjectTypes() { - return concat( visibleObjects( module ), - concat( - layer().visibleObjects( layer ), - concat( - layer().visibleObjects( application ), - layer().usedLayers().layers().flatMap( layer -> layer.visibleObjects( application ) ) - ) - ) - ); + return typeLookup.allObjects(); } public Stream<? extends ObjectDescriptor> visibleObjects( Visibility visibility )
