[jboss-svn-commits] JBoss Common SVN: r3882 - shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2009-12-25 17:42:00 -0500 (Fri, 25 Dec 2009)
New Revision: 3882

Modified:
   shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
Log:
SHRINKWRAP-106 Changed to use addPackage with Filter to be able to include anonymous inner classes.

Modified: shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java
===================================================================
--- shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2009-12-24 15:07:02 UTC (rev 3881)
+++ shrinkwrap/trunk/impl-base/src/main/java/org/jboss/shrinkwrap/impl/base/container/ContainerBase.java	2009-12-25 22:42:00 UTC (rev 3882)
@@ -690,20 +690,25 @@
    {
       Validate.notNull(classes, "Classes must be specified");
       
-      for(Class<?> clazz : classes) 
+      for(final Class<?> clazz : classes) 
       {
          Asset resource = new ClassAsset(clazz);
          Path location = new BasicPath(getClassesPath(), AssetUtil.getFullPathForClassResource(clazz));
          add(resource, location);
          
          // Get all inner classes and add them
-         final Class<?>[] innerClasses = clazz.getDeclaredClasses();
-         for (final Class<?> innerClass : innerClasses)
-         {
-            this.addClass(innerClass);
-         }
+         addPackages(
+               false,
+               new Filter<Class<?>>()
+               {
+                  public boolean include(Class<?> object)
+                  {
+                     return object.getName().startsWith(clazz.getName() + "$");
+                  };
+               },
+               clazz.getPackage()
+         );
       }
-      
       return covarientReturn();
    };