[Jboss-cvs] JBossAS SVN: r56505 - projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins

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

Author: alesj
Date: 2006-09-01 08:52:04 -0400 (Fri, 01 Sep 2006)
New Revision: 56505

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
Log:
Fixed / prepared for bean GUID naming.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2006-09-01 12:25:40 UTC (rev 56504)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractBeanMetaData.java	2006-09-01 12:52:04 UTC (rev 56505)
@@ -122,6 +122,20 @@
 
    public List<BeanMetaData> getBeans()
    {
+      List<BeanMetaData> nestedBeans = findNestedBeans();
+      if (nestedBeans.isEmpty())
+      {
+         return Collections.singletonList((BeanMetaData)this);
+      }
+      else
+      {
+         nestedBeans.add(this);
+         return nestedBeans;
+      }
+   }
+
+   protected List<BeanMetaData> findNestedBeans()
+   {
       List<BeanMetaData> allBeans = new ArrayList<BeanMetaData>();
       addBeans(this, allBeans);
       return allBeans;
@@ -139,12 +153,12 @@
          else
          {
             addBeans(next, list);
+            if (next instanceof BeanMetaData)
+            {
+               list.add((BeanMetaData) current);
+            }
          }
       }
-      if (current instanceof BeanMetaData)
-      {
-         list.add((BeanMetaData) current);
-      }
    }
 
    /**

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java	2006-09-01 12:25:40 UTC (rev 56504)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractClassLoaderMetaData.java	2006-09-01 12:52:04 UTC (rev 56505)
@@ -77,8 +77,12 @@
 
    public List<BeanMetaData> getBeans()
    {
-      if (classloader instanceof BeanMetaData)
+      if (classloader instanceof BeanMetaDataFactory)
       {
+         return ((BeanMetaDataFactory)classloader).getBeans();
+      }
+      else if (classloader instanceof BeanMetaData)
+      {
          return Collections.singletonList((BeanMetaData)classloader);
       }
       return new ArrayList<BeanMetaData>();