polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From soelvs...@apache.org
Subject zest-java git commit: ZEST-118 more bugfixing
Date Tue, 01 Sep 2015 21:30:32 GMT
Repository: zest-java
Updated Branches:
  refs/heads/develop 2c479d8a3 -> 59c967042


ZEST-118 more bugfixing


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/59c96704
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/59c96704
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/59c96704

Branch: refs/heads/develop
Commit: 59c967042b671241c4eadd9221bd1e6393baf487
Parents: 2c479d8
Author: Kent Sølvsten <soelvsten@apache.org>
Authored: Tue Sep 1 23:30:25 2015 +0200
Committer: Kent Sølvsten <soelvsten@apache.org>
Committed: Tue Sep 1 23:30:25 2015 +0200

----------------------------------------------------------------------
 .../zest/runtime/bootstrap/CompositeAssemblyImpl.java     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/59c96704/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
index 2dd3b20..bc69bbf 100755
--- a/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
+++ b/core/runtime/src/main/java/org/apache/zest/runtime/bootstrap/CompositeAssemblyImpl.java
@@ -695,23 +695,23 @@ public abstract class CompositeAssemblyImpl
 
     protected Stream<Class<?>> mixinDeclarations( Class<?> type )
     {
-        Stream<? extends Type> types = typesOf( type );
-        return mixinDeclarations( types );
+        //Stream<? extends Type> types = typesOf( type );
+        return mixinDeclarations( Arrays.asList( type ).stream() );
     }
 
-    private Stream<Class<?>> mixinDeclarations( Stream<? extends Type>
types )
+    private Stream<Class<?>> mixinDeclarations( Stream<? extends Class>
types )
     {
         return types.flatMap( this::getTypes )
             .filter( mixinType -> Annotations.annotationOn( mixinType, Mixins.class )
!= null )
             .flatMap( mixinType -> Arrays.stream( Annotations.annotationOn( mixinType,
Mixins.class ).value() ) );
     }
 
-    private Stream<Type> getAllTypes()
+    private Stream<Class> getAllTypes()
     {
         return this.types.stream().flatMap( this::getTypes );
     }
 
-    private Stream<? extends Type> getTypes( Type type )
+    private Stream<Class> getTypes( Type type )
     {
         if( type instanceof Class )
         {


Mime
View raw message