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

[webbeans-commits at lists.jboss.org]

Author: dallen6
Date: 2009-01-07 12:10:28 -0500 (Wed, 07 Jan 2009)
New Revision: 810

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
Log:
Small refactoring to make use of ManagerImpl consistent.

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-01-07 14:41:44 UTC (rev 809)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-01-07 17:10:28 UTC (rev 810)
@@ -337,9 +337,8 @@
     * Injects bound fields
     * 
     * @param instance The bean instance
-    * @param manager The Web Beans manager
     */
-   protected void injectBoundFields(T instance, ManagerImpl manager)
+   protected void injectBoundFields(T instance)
    {
       for (AnnotatedField<?> field : getInjectableFields())
       {
@@ -422,7 +421,7 @@
          bindDecorators();
          bindInterceptors();
          injectEjbAndCommonFields();
-         injectBoundFields(instance, manager);
+         injectBoundFields(instance);
          callInitializers(instance);
       }
       finally

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java	2009-01-07 14:41:44 UTC (rev 809)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/NewSimpleBean.java	2009-01-07 17:10:28 UTC (rev 810)
@@ -52,7 +52,7 @@
          bindDecorators();
          bindInterceptors();
          injectEjbAndCommonFields(instance);
-         injectBoundFields(instance, manager);
+         injectBoundFields(instance);
          callInitializers(instance);
          callPostConstruct(instance);
          return instance;

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2009-01-07 14:41:44 UTC (rev 809)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2009-01-07 17:10:28 UTC (rev 810)
@@ -26,8 +26,6 @@
 import javax.webbeans.DefinitionException;
 import javax.webbeans.Initializer;
 import javax.webbeans.InjectionPoint;
-import javax.webbeans.manager.Manager;
-
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.MetaDataCache;
 import org.jboss.webbeans.context.DependentContext;
@@ -121,7 +119,7 @@
          bindDecorators();
          bindInterceptors();
          injectEjbAndCommonFields(instance);
-         injectBoundFields(instance, manager);
+         injectBoundFields(instance);
          callInitializers(instance);
          callPostConstruct(instance);
          return instance;
@@ -238,9 +236,8 @@
     * Injects bound fields
     * 
     * @param instance The instance to inject into
-    * @param manager The Web Beans manager
     */
-   protected void injectBoundFields(T instance, Manager manager)
+   protected void injectBoundFields(T instance)
    {
       for (AnnotatedField<?> injectableField : getInjectableFields())
       {