[jboss-cvs] JBossAS SVN: r92731 - projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection.

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

Author: alesj
Date: 2009-08-24 05:13:49 -0400 (Mon, 24 Aug 2009)
New Revision: 92731

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/WebBeansInjector.java
Log:
Simple refactoring.

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java	2009-08-24 09:07:25 UTC (rev 92730)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/NonContextualObjectInjectionHelper.java	2009-08-24 09:13:49 UTC (rev 92731)
@@ -5,15 +5,17 @@
 import javax.enterprise.context.spi.CreationalContext;
 
 /**
- * Adds support for injecting into 
- * @author: Marius Bogoevici
+ * Adds support for injecting into.
+ *
+ * @author Marius Bogoevici
  */
 public class NonContextualObjectInjectionHelper
 {
-   public static void injectNonContextualInstance(Object o, BeanManager webBeansManager)
+   @SuppressWarnings("unchecked")
+   public static void injectNonContextualInstance(Object instance, BeanManager webBeansManager)
    {
       CreationalContext<Object> creationalContext =  webBeansManager.createCreationalContext(null);
-      InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) webBeansManager.createInjectionTarget(webBeansManager.createAnnotatedType(o.getClass()));
-      injectionTarget.inject(o, creationalContext);
+      InjectionTarget<Object> injectionTarget = (InjectionTarget<Object>) webBeansManager.createInjectionTarget(webBeansManager.createAnnotatedType(instance.getClass()));
+      injectionTarget.inject(instance, creationalContext);
    }
 }

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/WebBeansInjector.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/WebBeansInjector.java	2009-08-24 09:07:25 UTC (rev 92730)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/injection/WebBeansInjector.java	2009-08-24 09:13:49 UTC (rev 92731)
@@ -7,10 +7,9 @@
 import org.jboss.webbeans.servlet.api.ServletServices;
 
 /**
- *
  * Injector for injecting Web Beans into Servlets and other Web Artifacts
  *
- * @author: Marius Bogoevici
+ * @author Marius Bogoevici
  */
 public class WebBeansInjector implements Injector
 {
@@ -18,6 +17,9 @@
 
    public WebBeansInjector(BootstrapBean bootstrapBean)
    {
+      if (bootstrapBean == null)
+         throw new IllegalArgumentException("Null bootstrap bean");
+
       this.bootstrapBean = bootstrapBean;
    }
 
@@ -39,5 +41,4 @@
       BeanDeploymentArchive beanDeploymentArchive = services.getBeanDeploymentArchive(null);
       NonContextualObjectInjectionHelper.injectNonContextualInstance(instance, bootstrapBean.getBootstrap().getManager(beanDeploymentArchive));
    }
-
 }