[jboss-cvs] JBossAS SVN: r61435 - in projects/microcontainer/trunk: container/src/main/org/jboss/classadapter/spi and 1 other directory.

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

Author: alesj
Date: 2007-03-19 09:20:59 -0400 (Mon, 19 Mar 2007)
New Revision: 61435

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java
   projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilderListItem.java
Log:
Generify addDependency method.

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java	2007-03-19 13:12:14 UTC (rev 61434)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/AspectDependencyBuilderListItem.java	2007-03-19 13:20:59 UTC (rev 61435)
@@ -33,7 +33,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-class AspectDependencyBuilderListItem implements DependencyBuilderListItem
+class AspectDependencyBuilderListItem implements DependencyBuilderListItem<KernelControllerContext>
 {
    String dependencyName;
    AspectDependencyBuilderListItem(String name)
@@ -41,9 +41,8 @@
       this.dependencyName = name; 
    }
    
-   public void addDependency(Object ctx)
+   public void addDependency(KernelControllerContext context)
    {
-      KernelControllerContext context = (KernelControllerContext)ctx;
       BeanMetaData metaData = context.getBeanMetaData();
       AbstractDependencyItem dependency = new AbstractDependencyItem(metaData.getName(), dependencyName, ControllerState.INSTANTIATED, ControllerState.INSTALLED);
       DependencyInfo depends = context.getDependencyInfo();

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java	2007-03-19 13:12:14 UTC (rev 61434)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java	2007-03-19 13:20:59 UTC (rev 61435)
@@ -37,7 +37,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-class LifecycleAspectDependencyBuilderListItem extends AspectDependencyBuilderListItem implements DependencyBuilderListItem
+class LifecycleAspectDependencyBuilderListItem extends AspectDependencyBuilderListItem implements DependencyBuilderListItem<KernelControllerContext>
 {
    ControllerState state;
    String installMethod;
@@ -68,9 +68,8 @@
       return dependencyName.hashCode();
    }
 
-   public void addDependency(Object ctx)
+   public void addDependency(KernelControllerContext context)
    {
-      KernelControllerContext context = (KernelControllerContext)ctx;
       BeanMetaData metaData = context.getBeanMetaData();
       List<LifecycleCallbackMetaData> callbacks = metaData.getLifecycleCallbacks();
       if (callbacks == null)
@@ -82,6 +81,6 @@
       callbacks.add(callback);
       
       //We need to manually add the dependency since this is happening after the metadata visitors run
-      super.addDependency(ctx);
+      super.addDependency(context);
    }
 }

Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilderListItem.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilderListItem.java	2007-03-19 13:12:14 UTC (rev 61434)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/spi/DependencyBuilderListItem.java	2007-03-19 13:20:59 UTC (rev 61435)
@@ -26,8 +26,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-public interface DependencyBuilderListItem
+public interface DependencyBuilderListItem<T>
 {
-   //TODO This sucks, should be the KernelControllerContext passed in
-   void addDependency(Object ctx);
+   void addDependency(T ctx);
 }