[webbeans-commits] Webbeans SVN: r1701 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean.

[webbeans-commits at lists.jboss.org]

Author: nickarls
Date: 2009-02-25 06:16:30 -0500 (Wed, 25 Feb 2009)
New Revision: 1701

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/RIBean.java
Log:
Move DependentInstancesStore from RIBean to AbstractBean

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-02-25 07:47:43 UTC (rev 1700)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java	2009-02-25 11:16:30 UTC (rev 1701)
@@ -36,6 +36,7 @@
 import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.context.DependentInstancesStore;
 import org.jboss.webbeans.injection.AnnotatedInjectionPoint;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.AnnotatedItem;
@@ -64,7 +65,9 @@
    private static Set<Class<?>> STANDARD_WEB_BEAN_CLASSES = new HashSet<Class<?>>(Arrays.asList(Event.class, ManagerImpl.class));
 
    private boolean proxyable;
-
+   
+   protected final DependentInstancesStore dependentInstancesStore;   
+   
    /**
     * Helper class for getting deployment type
     * 
@@ -123,6 +126,7 @@
       super(manager);
       this.manager = manager;
       injectionPoints = new HashSet<AnnotatedInjectionPoint<?, ?>>();
+      dependentInstancesStore = new DependentInstancesStore();      
    }
 
    /**

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/RIBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/RIBean.java	2009-02-25 07:47:43 UTC (rev 1700)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/RIBean.java	2009-02-25 11:16:30 UTC (rev 1701)
@@ -22,7 +22,6 @@
 import javax.inject.manager.Bean;
 
 import org.jboss.webbeans.ManagerImpl;
-import org.jboss.webbeans.context.DependentInstancesStore;
 import org.jboss.webbeans.injection.AnnotatedInjectionPoint;
 
 /**
@@ -33,13 +32,11 @@
 public abstract class RIBean<T> extends Bean<T>
 {
    private final ManagerImpl manager;
-   protected final DependentInstancesStore dependentInstancesStore;
 
    protected RIBean(ManagerImpl manager)
    {
       super(manager);
       this.manager = manager;
-      this.dependentInstancesStore = new DependentInstancesStore();
    }
 
    @Override