[webbeans-commits] Webbeans SVN: r925 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: bean and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-01-13 18:20:23 -0500 (Tue, 13 Jan 2009)
New Revision: 925

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
Log:
minor

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2009-01-13 19:08:14 UTC (rev 924)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java	2009-01-13 23:20:23 UTC (rev 925)
@@ -784,7 +784,7 @@
     * 
     * @return the factory
     */
-   public InjectionPointProvider getInjectionPointFactory()
+   public InjectionPointProvider getInjectionPointProvider()
    {
       return injectionPointProvider;
    }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java	2009-01-13 19:08:14 UTC (rev 924)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java	2009-01-13 23:20:23 UTC (rev 925)
@@ -164,7 +164,7 @@
       {
          throw new IllegalProductException("Producers cannot declare passivating scope and return a non-serializable class");
       }
-      InjectionPointImpl injectionPoint = (InjectionPointImpl) manager.getInjectionPointFactory().getCurrentInjectionPoint();
+      InjectionPointImpl injectionPoint = (InjectionPointImpl) manager.getInjectionPointProvider().getCurrentInjectionPoint();
       if (dependent && Reflections.isPassivatingBean(injectionPoint.getBean()))
       {
          if (injectionPoint.isField())

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-13 19:08:14 UTC (rev 924)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-01-13 23:20:23 UTC (rev 925)
@@ -389,12 +389,12 @@
       {
          try
          {
-            manager.getInjectionPointFactory().pushInjectionMember(field);
+            manager.getInjectionPointProvider().pushInjectionMember(field);
             field.inject(instance, manager);
          }
          finally
          {
-            manager.getInjectionPointFactory().popInjectionMember();
+            manager.getInjectionPointProvider().popInjectionMember();
          }
       }
    }
@@ -466,7 +466,7 @@
    {
       try
       {
-         manager.getInjectionPointFactory().pushBean(this);
+         manager.getInjectionPointProvider().pushBean(this);
          DependentContext.INSTANCE.setActive(true);
          bindDecorators();
          bindInterceptors();
@@ -476,7 +476,7 @@
       }
       finally
       {
-         manager.getInjectionPointFactory().popBean();
+         manager.getInjectionPointProvider().popBean();
          DependentContext.INSTANCE.setActive(false);
       }
 

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java	2009-01-13 19:08:14 UTC (rev 924)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java	2009-01-13 23:20:23 UTC (rev 925)
@@ -53,7 +53,7 @@
    @Override
    public T create()
    {
-      return (T) manager.getInjectionPointFactory().getPreviousInjectionPoint();
+      return (T) manager.getInjectionPointProvider().getPreviousInjectionPoint();
    }
 
    @Override

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-13 19:08:14 UTC (rev 924)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java	2009-01-13 23:20:23 UTC (rev 925)
@@ -116,7 +116,7 @@
       try
       {
          DependentContext.INSTANCE.setActive(true);
-         InjectionPointProvider injectionPointProvider = manager.getInjectionPointFactory();
+         InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider();
          injectionPointProvider.pushBean(this);
          T instance = null;
          try
@@ -274,7 +274,7 @@
     */
    protected void injectBoundFields(T instance)
    {
-      InjectionPointProvider injectionPointProvider = manager.getInjectionPointFactory();
+      InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider();
       for (AnnotatedField<?> injectableField : getInjectableFields())
       {
          injectionPointProvider.pushInjectionMember(injectableField);

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java	2009-01-13 19:08:14 UTC (rev 924)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java	2009-01-13 23:20:23 UTC (rev 925)
@@ -206,7 +206,7 @@
    protected Object[] getParameterValues(List<AnnotatedParameter<Object>> parameters, Object specialVal, Class<? extends Annotation> specialParam, ManagerImpl manager)
    {
       Object[] parameterValues = new Object[parameters.size()];
-      InjectionPointProvider injectionPointProvider = manager.getInjectionPointFactory();
+      InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider();
       injectionPointProvider.pushInjectionMember(this);
       try
       {