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

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

Author: alesj
Date: 2006-08-15 09:01:55 -0400 (Tue, 15 Aug 2006)
New Revision: 55948

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
Log:
Preparing for revisit MD.

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2006-08-15 12:58:30 UTC (rev 55947)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2006-08-15 13:01:55 UTC (rev 55948)
@@ -36,8 +36,8 @@
 import org.jboss.kernel.plugins.dependency.UpdateableDependencyItem;
 import org.jboss.kernel.spi.dependency.KernelController;
 import org.jboss.kernel.spi.dependency.KernelControllerContext;
-import org.jboss.reflect.spi.TypeInfo;
 import org.jboss.util.JBossStringBuilder;
+import org.jboss.reflect.spi.TypeInfo;
 
 /**
  * Injection value.
@@ -102,28 +102,7 @@
    {
       if (value == null)
       {
-         // this is by class injection
-         ControllerState state = dependentState;
-         if (state == null)
-         {
-            state = ControllerState.INSTALLED;
-         }
-         // what else to use here - if not info.getType?
-         Set contexts = controller.getInstantiatedContexts(info.getType());
-         int numberOfMatchingBeans = 0;
-         if (contexts != null)
-         {
-            numberOfMatchingBeans = contexts.size();
-         }
-         if (numberOfMatchingBeans != 1)
-         {
-            throw new Error(
-                  "Should not be here, illegas size of matching contexts ("
-                        + numberOfMatchingBeans + ") - dependency failed! " + this);
-         }
-         ControllerContext context = (ControllerContext) contexts.iterator().next();
-         // todo - should we do this?
-         controller.change(context, state);
+         ControllerContext context = controller.getInstalledContext(info.getType());
          return context.getTarget();
       }
       return super.getValue(info, cl);

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java	2006-08-15 12:58:30 UTC (rev 55947)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/dependency/AbstractKernelControllerContext.java	2006-08-15 13:01:55 UTC (rev 55948)
@@ -289,7 +289,7 @@
       public Object run()
       {
          visitorNodeStack.push(bmd);
-         bmd.revisit(this);
+//         bmd.revisit(this);
          visitorNodeStack.pop();
          visitorNodeStack = null;
          return null;
@@ -317,7 +317,7 @@
                visitorNodeStack.push(child);
                try
                {
-//                  child.visit(this);
+//                  child.revisit(this);
                }
                finally
                {