Author: struberg
Date: Wed Feb 23 12:57:13 2011
New Revision: 1073725
URL: http://svn.apache.org/viewvc?rev=1073725&view=rev
Log:
OWB-461 rename fields which hide class members
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/EJBInstanceProxy.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
Wed Feb 23 12:57:13 2011
@@ -237,34 +237,34 @@ public class EjbBeanProxyHandler impleme
protected CreationalContext<Object> getContextualCreationalContext()
{
- CreationalContext<Object> creationalContext = null;
-
+
if(this.creationalContext != null)
{
- return (CreationalContext<Object>)this.creationalContext;
+ return (CreationalContext<Object>) this.creationalContext;
}
OwbBean<Object> contextual = (OwbBean<Object>)this.ejbBean;
//Context of the bean
Context webbeansContext =
webBeansContext.getBeanManagerImpl().getContext(this.ejbBean.getScope());
+ CreationalContext<Object> cc = null;
if (webbeansContext instanceof AbstractContext)
{
AbstractContext owbContext = (AbstractContext)webbeansContext;
- creationalContext = owbContext.getCreationalContext(contextual);
+ cc = owbContext.getCreationalContext(contextual);
//No creational context means that no BeanInstanceBag
//Actually this can be occurs like scenarions
//@SessionScoped bean injected into @ApplicationScopedBean
//And session is destroyed and restarted but proxy still
//contained in @ApplicationScopedBean
- if(creationalContext == null)
+ if(cc == null)
{
- creationalContext =
webBeansContext.getCreationalContextFactory().getCreationalContext(contextual);
- owbContext.initContextualBag((OwbBean<Object>)this.ejbBean,
creationalContext);
+ cc =
webBeansContext.getCreationalContextFactory().getCreationalContext(contextual);
+ owbContext.initContextualBag((OwbBean<Object>)this.ejbBean,
cc);
}
}
- return creationalContext;
+ return cc;
}
private void initiateBeanBag(OwbBean<Object> bean,
CreationalContext<Object> creationalContext)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
Wed Feb 23 12:57:13 2011
@@ -114,10 +114,10 @@ public class CreationalContextImpl<T> im
return null;
}
- List<EjbInterceptorContext> ejbInterceptors =
this.ejbInterceptors.get(ownerInstance);
- if(ejbInterceptors != null)
+ List<EjbInterceptorContext> ejbInts =
this.ejbInterceptors.get(ownerInstance);
+ if(ejbInts != null)
{
- for(EjbInterceptorContext ejbInterceptor : ejbInterceptors)
+ for(EjbInterceptorContext ejbInterceptor : ejbInts)
{
if(ejbInterceptor.getInterceptorClass() == clazz)
{
@@ -321,7 +321,6 @@ public class CreationalContextImpl<T> im
@SuppressWarnings("unchecked")
public void removeAllDependents()
{
- WebBeansContext webBeansContext = this.webBeansContext;
Collection<List<DependentCreationalContext<?>>> values =
this.dependentObjects.values();
if(values != null)
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
Wed Feb 23 12:57:13 2011
@@ -132,7 +132,6 @@ public class ConversationImpl implements
this.updateTimeOut();
//Conversation manager
- WebBeansContext webBeansContext = this.webBeansContext;
ConversationManager manager =
webBeansContext.getConversationManager();
try
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
Wed Feb 23 12:57:13 2011
@@ -127,11 +127,11 @@ public final class NotificationManager
Set<Annotation> qualifiers = ArrayUtil.asSet(eventQualifiers);
Class<T> eventType = (Class<T>) event.getClass();
- Set<ObserverMethod<? super T>> observers =
filterByType(event,eventType);
+ Set<ObserverMethod<? super T>> observersMethods =
filterByType(event,eventType);
- observers = filterByQualifiers(observers, qualifiers);
+ observersMethods = filterByQualifiers(observersMethods, qualifiers);
- return observers;
+ return observersMethods;
}
private <T> Set<ObserverMethod<? super T>> filterByType(T event, Class<T>
eventType)
@@ -436,9 +436,9 @@ public final class NotificationManager
public void fireEvent(Object event, Annotation... qualifiers)
{
- Set<ObserverMethod<? super Object>> observers =
resolveObservers(event, qualifiers);
+ Set<ObserverMethod<? super Object>> observerMethods =
resolveObservers(event, qualifiers);
- for (ObserverMethod<? super Object> observer : observers)
+ for (ObserverMethod<? super Object> observer : observerMethods)
{
try
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/impl/InjectionPointImpl.java
Wed Feb 23 12:57:13 2011
@@ -230,8 +230,8 @@ class InjectionPointImpl implements Inje
this.injectionMember = field;
- AnnotatedType<?> annotated =
annotatedElementFactory.newAnnotatedType(beanClass);
- this.annotated = annotatedElementFactory.newAnnotatedField(field,
annotated);
+ AnnotatedType<?> annotatedType =
annotatedElementFactory.newAnnotatedType(beanClass);
+ this.annotated = annotatedElementFactory.newAnnotatedField(field,
annotatedType);
this.injectionType = field.getGenericType();
}
@@ -243,9 +243,9 @@ class InjectionPointImpl implements Inje
Method method = ClassUtil.getDeclaredMethod(beanClass, methodName,
parameters);
this.injectionMember = method;
- AnnotatedType<?> annotated =
annotatedElementFactory.newAnnotatedType(beanClass);
+ AnnotatedType<?> annotatedType =
annotatedElementFactory.newAnnotatedType(beanClass);
AnnotatedMethod<Object> am =
(AnnotatedMethod<Object>)annotatedElementFactory.
-
newAnnotatedMethod((Method)this.injectionMember ,annotated);
+
newAnnotatedMethod((Method)this.injectionMember ,annotatedType);
List<AnnotatedParameter<Object>> annParameters =
am.getParameters();
this.annotated = annParameters.get(in.readByte());
@@ -257,9 +257,9 @@ class InjectionPointImpl implements Inje
Class<?>[] parameters = (Class<?>[])in.readObject();
this.injectionMember = ClassUtil.getConstructor(beanClass,
parameters);
- AnnotatedType<Object> annotated =
(AnnotatedType<Object>)annotatedElementFactory.newAnnotatedType(beanClass);
+ AnnotatedType<Object> annotatedType =
(AnnotatedType<Object>)annotatedElementFactory.newAnnotatedType(beanClass);
AnnotatedConstructor<Object> am =
(AnnotatedConstructor<Object>)annotatedElementFactory
-
.newAnnotatedConstructor((Constructor<Object>)this.injectionMember,annotated);
+
.newAnnotatedConstructor((Constructor<Object>)this.injectionMember,annotatedType);
List<AnnotatedParameter<Object>> annParameters =
am.getParameters();
this.annotated = annParameters.get(in.readByte());
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
Wed Feb 23 12:57:13 2011
@@ -96,11 +96,10 @@ class InstanceImpl<T> implements Instanc
Set<Bean<?>> beans = resolveBeans();
- WebBeansContext webBeansContext = this.webBeansContext;
webBeansContext.getResolutionUtil().checkResolvedBeans(beans,
ClassUtil.getClazz(this.injectionClazz), anns);
Bean<?> bean = beans.iterator().next();
- instance = (T)
webBeansContext.getBeanManagerImpl().getInstance(bean,null);
+ instance = (T) webBeansContext.getBeanManagerImpl().getInstance(bean,
null);
return instance;
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
Wed Feb 23 12:57:13 2011
@@ -216,12 +216,12 @@ public class InvocationContextImpl imple
{
InterceptorData intc = datas.get(currentMethod - 1);
- Method method = intc.getAroundInvoke();
- boolean accessible = method.isAccessible();
+ Method aroundInvokeMethod = intc.getAroundInvoke();
+ boolean accessible = aroundInvokeMethod.isAccessible();
- if (!method.isAccessible())
+ if (!aroundInvokeMethod.isAccessible())
{
- SecurityUtil.doPrivilegedSetAccessible(method, true);
+ SecurityUtil.doPrivilegedSetAccessible(aroundInvokeMethod,
true);
}
Object t = intc.createNewInstance(this.ccKey != null ? this.ccKey
: this.target,
@@ -234,11 +234,11 @@ public class InvocationContextImpl imple
currentMethod++;
- result = method.invoke(t, new Object[] { this });
+ result = aroundInvokeMethod.invoke(t, new Object[] { this });
if(!accessible)
{
- SecurityUtil.doPrivilegedSetAccessible(method, false);
+ SecurityUtil.doPrivilegedSetAccessible(aroundInvokeMethod,
false);
}
}
@@ -285,12 +285,12 @@ public class InvocationContextImpl imple
{
InterceptorData intc = datas.get(currentMethod - 1);
- Method method = intc.getAroundTimeout();
- boolean accessible = method.isAccessible();
+ Method aroundTimeoutMethod = intc.getAroundTimeout();
+ boolean accessible = aroundTimeoutMethod.isAccessible();
if (!accessible)
{
- SecurityUtil.doPrivilegedSetAccessible(method, true);
+ SecurityUtil.doPrivilegedSetAccessible(aroundTimeoutMethod,
true);
}
Object t = intc.createNewInstance(this.ccKey != null ? this.ccKey
: this.target,
@@ -303,11 +303,11 @@ public class InvocationContextImpl imple
currentMethod++;
- result = method.invoke(t, new Object[] { this });
+ result = aroundTimeoutMethod.invoke(t, new Object[] { this });
if(!accessible)
{
- SecurityUtil.doPrivilegedSetAccessible(method, false);
+ SecurityUtil.doPrivilegedSetAccessible(aroundTimeoutMethod,
false);
}
}
@@ -315,7 +315,7 @@ public class InvocationContextImpl imple
{
if(!(this.owbBean instanceof EnterpriseBeanMarker))
{
- boolean accessible = this.method.isAccessible();
+ boolean accessible = method.isAccessible();
if(!accessible)
{
SecurityUtil.doPrivilegedSetAccessible(method, true);
@@ -355,37 +355,37 @@ public class InvocationContextImpl imple
if (currentMethod <= datas.size())
{
InterceptorData intc = datas.get(currentMethod - 1);
- Method method = null;
+ Method commonAnnMethod = null;
if (type.equals(InterceptorType.POST_CONSTRUCT))
{
- method = intc.getPostConstruct();
+ commonAnnMethod = intc.getPostConstruct();
}
else if (type.equals(InterceptorType.POST_ACTIVATE))
{
- method = intc.getPostActivate();
+ commonAnnMethod = intc.getPostActivate();
}
else if (type.equals(InterceptorType.PRE_PASSIVATE))
{
- method = intc.getPrePassivate();
+ commonAnnMethod = intc.getPrePassivate();
}
else if (type.equals(InterceptorType.PRE_DESTROY))
{
- method = intc.getPreDestroy();
+ commonAnnMethod = intc.getPreDestroy();
}
else
{
throw new IllegalArgumentException("Unsupportet
InterceptorType: " + type);
}
- if (method == null)
+ if (commonAnnMethod == null)
{
throw new IllegalArgumentException("Could not find intercepted
Method!");
}
- if (!method.isAccessible())
+ if (!commonAnnMethod.isAccessible())
{
- SecurityUtil.doPrivilegedSetAccessible(method, true);
+ SecurityUtil.doPrivilegedSetAccessible(commonAnnMethod, true);
}
currentMethod++;
@@ -399,7 +399,7 @@ public class InvocationContextImpl imple
if(!(this.owbBean instanceof EnterpriseBeanMarker))
{
t = target;
- result = method.invoke(t, new Object[] {});
+ result = commonAnnMethod.invoke(t, new Object[] {});
//Continue to call others
proceedCommonAnnots(datas, type);
@@ -408,7 +408,7 @@ public class InvocationContextImpl imple
//In interceptor class
else
{
- result = method.invoke(t, new Object[] { this });
+ result = commonAnnMethod.invoke(t, new Object[] { this });
}
}
Modified:
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/EJBInstanceProxy.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/EJBInstanceProxy.java?rev=1073725&r1=1073724&r2=1073725&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/EJBInstanceProxy.java
(original)
+++
openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/EJBInstanceProxy.java
Wed Feb 23 12:57:13 2011
@@ -70,8 +70,8 @@ public class EJBInstanceProxy<T>
else if (deploymentId != null)
{
ContainerSystem containerSystem =
SystemInstance.get().getComponent(ContainerSystem.class);
- DeploymentInfo deploymentInfo =
containerSystem.getDeploymentInfo(deploymentId);
- return deploymentInfo;
+ DeploymentInfo deploymentInfoFromContainer =
containerSystem.getDeploymentInfo(deploymentId);
+ return deploymentInfoFromContainer;
}
return null;
}
