Skip to content

Commit

Permalink
minor
Browse files Browse the repository at this point in the history
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@925 1c488680-804c-0410-94cd-c6b725194a0e
  • Loading branch information
pmuir committed Jan 13, 2009
1 parent e983721 commit d483e47
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
Expand Up @@ -784,7 +784,7 @@ public EjbResolver getEjbResolver()
*
* @return the factory
*/
public InjectionPointProvider getInjectionPointFactory()
public InjectionPointProvider getInjectionPointProvider()
{
return injectionPointProvider;
}
Expand Down
Expand Up @@ -164,7 +164,7 @@ protected void checkReturnValue(T instance)
{
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())
Expand Down
Expand Up @@ -389,12 +389,12 @@ protected void injectBoundFields(T instance)
{
try
{
manager.getInjectionPointFactory().pushInjectionMember(field);
manager.getInjectionPointProvider().pushInjectionMember(field);
field.inject(instance, manager);
}
finally
{
manager.getInjectionPointFactory().popInjectionMember();
manager.getInjectionPointProvider().popInjectionMember();
}
}
}
Expand Down Expand Up @@ -466,7 +466,7 @@ public void postConstruct(T instance)
{
try
{
manager.getInjectionPointFactory().pushBean(this);
manager.getInjectionPointProvider().pushBean(this);
DependentContext.INSTANCE.setActive(true);
bindDecorators();
bindInterceptors();
Expand All @@ -476,7 +476,7 @@ public void postConstruct(T instance)
}
finally
{
manager.getInjectionPointFactory().popBean();
manager.getInjectionPointProvider().popBean();
DependentContext.INSTANCE.setActive(false);
}

Expand Down
Expand Up @@ -53,7 +53,7 @@ protected InjectionPointBean(AnnotatedItem<T, S> field, ManagerImpl manager)
@Override
public T create()
{
return (T) manager.getInjectionPointFactory().getPreviousInjectionPoint();
return (T) manager.getInjectionPointProvider().getPreviousInjectionPoint();
}

@Override
Expand Down
Expand Up @@ -116,7 +116,7 @@ public T create()
try
{
DependentContext.INSTANCE.setActive(true);
InjectionPointProvider injectionPointProvider = manager.getInjectionPointFactory();
InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider();
injectionPointProvider.pushBean(this);
T instance = null;
try
Expand Down Expand Up @@ -274,7 +274,7 @@ protected void injectEjbAndCommonFields(T beanInstance)
*/
protected void injectBoundFields(T instance)
{
InjectionPointProvider injectionPointProvider = manager.getInjectionPointFactory();
InjectionPointProvider injectionPointProvider = manager.getInjectionPointProvider();
for (AnnotatedField<?> injectableField : getInjectableFields())
{
injectionPointProvider.pushInjectionMember(injectableField);
Expand Down
Expand Up @@ -206,7 +206,7 @@ protected Object[] getParameterValues(List<AnnotatedParameter<Object>> parameter
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
{
Expand Down

0 comments on commit d483e47

Please sign in to comment.