You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2011/10/13 13:11:06 UTC
svn commit: r1182780 [1/4] - in /openwebbeans/trunk:
webbeans-impl/src/main/java/org/apache/webbeans/annotation/
webbeans-impl/src/main/java/org/apache/webbeans/boot/
webbeans-impl/src/main/java/org/apache/webbeans/component/
webbeans-impl/src/main/jav...
Author: struberg
Date: Thu Oct 13 11:11:03 2011
New Revision: 1182780
URL: http://svn.apache.org/viewvc?rev=1182780&view=rev
Log:
OWB-615 remove unnecessary 'this' and remove @Override for interfaces (java5 compat)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.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/context/creational/WrappedCreationalContext.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedExpressionFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansException.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ViolationMessageBuilder.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.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/DependentScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/ErrorStack.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ResourceProxyHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/service/ManualImplementationLoaderService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OpenWebBeansClassLoaderProvider.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OwbCustomObjectInputStream.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/CdiTestOpenWebBeansContainer.java
openwebbeans/trunk/webbeans-test/cditest-owb/src/main/java/org/apache/webbeans/cditest/owb/MockHttpSession.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/AnnotationManager.java Thu Oct 13 11:11:03 2011
@@ -70,7 +70,7 @@ public final class AnnotationManager
public AnnotationManager(WebBeansContext context)
{
- this.webBeansContext = context;
+ webBeansContext = context;
beanManagerImpl = context.getBeanManagerImpl();
}
@@ -577,7 +577,7 @@ public final class AnnotationManager
Annotation old = null;
for (Annotation interceptorBinding : interceptorBindings)
{
- if (!this.isInterceptorBindingAnnotation(interceptorBinding.annotationType()))
+ if (!isInterceptorBindingAnnotation(interceptorBinding.annotationType()))
{
throw new IllegalArgumentException("Manager.resolveInterceptors() method parameter interceptor" +
" bindings array can not contain other annotation that is not @InterceptorBinding");
@@ -612,7 +612,7 @@ public final class AnnotationManager
Annotation old = null;
for (Annotation qualifier : qualifiers)
{
- if (!this.isQualifierAnnotation(qualifier.annotationType()))
+ if (!isQualifierAnnotation(qualifier.annotationType()))
{
throw new IllegalArgumentException("Manager.resolveDecorators() method parameter qualifiers array " +
"can not contain other annotation that is not @Qualifier");
@@ -650,7 +650,7 @@ public final class AnnotationManager
Asserts.nullCheckForClass(clazz);
Asserts.assertNotNull(annotations, "Annotations argument can not be null");
- Annotation[] as = this.getQualifierAnnotations(annotations);
+ Annotation[] as = getQualifierAnnotations(annotations);
for (Annotation a : annotations)
{
if (a.annotationType().equals(New.class))
@@ -699,7 +699,7 @@ public final class AnnotationManager
}
else
{
- Annotation[] anns = this.getStereotypeMetaAnnotations(superMethod.getAnnotations());
+ Annotation[] anns = getStereotypeMetaAnnotations(superMethod.getAnnotations());
for(Annotation ann : anns)
{
if(ann.annotationType().isAnnotationPresent(Stereotype.class))
@@ -756,7 +756,7 @@ public final class AnnotationManager
if(found)
{
Type type = AnnotationUtil.getAnnotatedMethodFirstParameterWithAnnotation(annotatedMethod, Disposes.class);
- Annotation[] annots = this.getAnnotatedMethodFirstParameterQualifierWithGivenAnnotation(annotatedMethod, Disposes.class);
+ Annotation[] annots = getAnnotatedMethodFirstParameterQualifierWithGivenAnnotation(annotatedMethod, Disposes.class);
if(type.equals(beanType))
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NamedLiteral.java Thu Oct 13 11:11:03 2011
@@ -41,7 +41,6 @@ public class NamedLiteral extends Annota
this.value = value;
}
- @Override
public String value()
{
return value;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/NewLiteral.java Thu Oct 13 11:11:03 2011
@@ -33,7 +33,7 @@ public class NewLiteral extends Annotati
public NewLiteral()
{
- this.clazz = New.class;
+ clazz = New.class;
}
public NewLiteral(Class<?> clazz)
@@ -42,7 +42,6 @@ public class NewLiteral extends Annotati
}
/** {@inheritDoc} */
- @Override
public Class<?> value()
{
return clazz;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java Thu Oct 13 11:11:03 2011
@@ -57,7 +57,7 @@ public class WebBeansAnnotation implemen
public WebBeansAnnotation(Class<? extends Annotation> annotationType)
{
this.annotationType = annotationType;
- this.members = SecurityUtil.doPrivilegedGetDeclaredMethods(annotationType);
+ members = SecurityUtil.doPrivilegedGetDeclaredMethods(annotationType);
/* Set default method values */
setDefaultValues();
@@ -98,7 +98,7 @@ public class WebBeansAnnotation implemen
*/
public Map<String, Object> getAnnotationMembersValueMap()
{
- return Collections.unmodifiableMap(this.annotationMembersValueMap);
+ return Collections.unmodifiableMap(annotationMembersValueMap);
}
public Class<? extends Annotation> annotationType()
@@ -111,7 +111,7 @@ public class WebBeansAnnotation implemen
Asserts.assertNotNull(memberName, "memberName parameter can not be null");
Asserts.assertNotNull(memberValue, "memberValue parameter can not be null");
- this.annotationMembersValueMap.put(memberName, memberValue);
+ annotationMembersValueMap.put(memberName, memberValue);
}
@Override
@@ -122,7 +122,7 @@ public class WebBeansAnnotation implemen
for (int i = 0; i < members.length; i++)
{
sb.append(members[i].getName()).append("=");
- sb.append(this.invoke(members[i]));
+ sb.append(invoke(members[i]));
if (i < members.length - 1)
{
sb.append(",");
@@ -140,11 +140,11 @@ public class WebBeansAnnotation implemen
if (other instanceof Annotation)
{
Annotation that = (Annotation) other;
- if (this.annotationType().equals(that.annotationType()))
+ if (annotationType().equals(that.annotationType()))
{
for (Method member : members)
{
- Object thisValue = this.invoke(member);
+ Object thisValue = invoke(member);
Object thatValue = callMethod(member, that);
if (!thisValue.equals(thatValue))
@@ -158,11 +158,11 @@ public class WebBeansAnnotation implemen
else if (other instanceof WebBeansAnnotation)
{
WebBeansAnnotation that = (WebBeansAnnotation) other;
- if (this.annotationType().equals(that.annotationType()))
+ if (annotationType().equals(that.annotationType()))
{
for (Method member : members)
{
- Object thisValue = this.invoke(member);
+ Object thisValue = invoke(member);
Object thatValue = that.invoke(member);
if (!thisValue.equals(thatValue))
{
@@ -193,7 +193,7 @@ public class WebBeansAnnotation implemen
{
String memberName = method.getName();
- return this.annotationMembersValueMap.get(memberName);
+ return annotationMembersValueMap.get(memberName);
}
private static Object callMethod(Method method, Object instance)
@@ -229,9 +229,9 @@ public class WebBeansAnnotation implemen
Object defValue = m.getDefaultValue();
if (defValue != null)
{
- this.annotationMembersValueMap.put(m.getName(), defValue);
+ annotationMembersValueMap.put(m.getName(), defValue);
}
}
}
-}
\ No newline at end of file
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/boot/Bootstrap.java Thu Oct 13 11:11:03 2011
@@ -41,7 +41,7 @@ public class Bootstrap
{
log.info(OWBLogConst.INFO_0006);
//this relies on DefaultSingletonService to instantiate the WebBeansContext
- this.containerLifecycle = WebBeansContext.getInstance().getService(ContainerLifecycle.class);
+ containerLifecycle = WebBeansContext.getInstance().getService(ContainerLifecycle.class);
}
public void start() throws InterruptedException
@@ -49,22 +49,22 @@ public class Bootstrap
log.info(OWBLogConst.INFO_0005);
long begin = System.currentTimeMillis();
- containerLifecycle.startApplication(this.properties);
+ containerLifecycle.startApplication(properties);
Runtime.getRuntime().addShutdownHook(new Thread(){
public void run()
{
- Bootstrap.this.latch.countDown();
+ latch.countDown();
}
});
log.info(OWBLogConst.INFO_0001, Long.toString(System.currentTimeMillis() - begin));
- this.latch.await();
+ latch.await();
log.info(OWBLogConst.INFO_0008);
- containerLifecycle.stopApplication(this.properties);
+ containerLifecycle.stopApplication(properties);
log.info(OWBLogConst.INFO_0009);
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractInjectionTargetBean.java Thu Oct 13 11:11:03 2011
@@ -446,7 +446,7 @@ public abstract class AbstractInjectionT
*/
public void addObservableMethod(Method observerMethod)
{
- this.observableMethods.add(observerMethod);
+ observableMethods.add(observerMethod);
}
/**
@@ -454,7 +454,7 @@ public abstract class AbstractInjectionT
*/
public Set<Method> getObservableMethods()
{
- return this.observableMethods;
+ return observableMethods;
}
/**
@@ -464,7 +464,7 @@ public abstract class AbstractInjectionT
*/
public Set<Field> getInjectedFields()
{
- return this.injectedFields;
+ return injectedFields;
}
/**
@@ -474,7 +474,7 @@ public abstract class AbstractInjectionT
*/
public void addInjectedField(Field field)
{
- this.injectedFields.add(field);
+ injectedFields.add(field);
}
/**
@@ -484,7 +484,7 @@ public abstract class AbstractInjectionT
*/
public Set<Field> getInjectedFromSuperFields()
{
- return this.injectedFromSuperFields;
+ return injectedFromSuperFields;
}
/**
@@ -494,7 +494,7 @@ public abstract class AbstractInjectionT
*/
public void addInjectedFieldToSuper(Field field)
{
- this.injectedFromSuperFields.add(field);
+ injectedFromSuperFields.add(field);
}
@@ -505,7 +505,7 @@ public abstract class AbstractInjectionT
*/
public Set<Method> getInjectedMethods()
{
- return this.injectedMethods;
+ return injectedMethods;
}
/**
@@ -515,7 +515,7 @@ public abstract class AbstractInjectionT
*/
public void addInjectedMethod(Method method)
{
- this.injectedMethods.add(method);
+ injectedMethods.add(method);
}
/**
@@ -525,7 +525,7 @@ public abstract class AbstractInjectionT
*/
public Set<Method> getInjectedFromSuperMethods()
{
- return this.injectedFromSuperMethods;
+ return injectedFromSuperMethods;
}
/**
@@ -535,7 +535,7 @@ public abstract class AbstractInjectionT
*/
public void addInjectedMethodToSuper(Method method)
{
- this.injectedFromSuperMethods.add(method);
+ injectedFromSuperMethods.add(method);
}
/**
@@ -543,12 +543,12 @@ public abstract class AbstractInjectionT
*/
public List<InterceptorData> getInterceptorStack()
{
- return this.interceptorStack;
+ return interceptorStack;
}
public List<Decorator<?>> getDecoratorStack()
{
- return this.decorators;
+ return decorators;
}
/**
@@ -556,7 +556,7 @@ public abstract class AbstractInjectionT
*/
public IBeanInheritedMetaData getInheritedMetaData()
{
- return this.inheritedMetaData;
+ return inheritedMetaData;
}
/**
@@ -564,7 +564,7 @@ public abstract class AbstractInjectionT
*/
protected void setInheritedMetaData()
{
- this.inheritedMetaData = new BeanInheritedMetaData<T>(this);
+ inheritedMetaData = new BeanInheritedMetaData<T>(this);
}
/**
@@ -579,16 +579,14 @@ public abstract class AbstractInjectionT
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedType<T> getAnnotatedType()
{
- return this.annotatedType;
+ return annotatedType;
}
/**
* {@inheritDoc}
*/
- @Override
public void setAnnotatedType(AnnotatedType<T> annotatedType)
{
this.annotatedType = annotatedType;
@@ -603,7 +601,7 @@ public abstract class AbstractInjectionT
super.validatePassivationDependencies();
//Check for interceptors and decorators
- for(Decorator<?> dec : this.decorators)
+ for(Decorator<?> dec : decorators)
{
WebBeansDecorator<?> decorator = (WebBeansDecorator<?>)dec;
if(!decorator.isPassivationCapable())
@@ -617,7 +615,7 @@ public abstract class AbstractInjectionT
}
}
- for(InterceptorData interceptorData : this.interceptorStack)
+ for(InterceptorData interceptorData : interceptorStack)
{
if(interceptorData.isDefinedWithWebBeansInterceptor())
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java Thu Oct 13 11:11:03 2011
@@ -355,8 +355,8 @@ public abstract class AbstractOwbBean<T>
*/
public void setImplScopeType(Annotation scopeType)
{
- this.implScopeType = scopeType;
- this.scopeClass = this.implScopeType.annotationType();
+ implScopeType = scopeType;
+ scopeClass = implScopeType.annotationType();
cachedHashCode = 0;
}
@@ -387,9 +387,9 @@ public abstract class AbstractOwbBean<T>
*/
public void addStereoType(Annotation stereoType)
{
- this.stereoTypeClasses = null; // will get rebuilt on the next request
+ stereoTypeClasses = null; // will get rebuilt on the next request
- this.stereoTypes.add(stereoType);
+ stereoTypes.add(stereoType);
cachedHashCode = 0;
}
@@ -400,7 +400,7 @@ public abstract class AbstractOwbBean<T>
*/
public void addApiType(Class<?> apiType)
{
- this.apiTypes.add(apiType);
+ apiTypes.add(apiType);
cachedHashCode = 0;
}
@@ -421,7 +421,7 @@ public abstract class AbstractOwbBean<T>
*/
public Set<Annotation> getOwbStereotypes()
{
- return this.stereoTypes;
+ return stereoTypes;
}
/**
@@ -431,7 +431,7 @@ public abstract class AbstractOwbBean<T>
*/
public void addQualifier(Annotation qualifier)
{
- this.implQualifiers.add(qualifier);
+ implQualifiers.add(qualifier);
cachedHashCode = 0;
}
@@ -459,7 +459,7 @@ public abstract class AbstractOwbBean<T>
*/
public Set<Annotation> getQualifiers()
{
- return this.implQualifiers;
+ return implQualifiers;
}
/*
@@ -468,13 +468,13 @@ public abstract class AbstractOwbBean<T>
*/
public Class<? extends Annotation> getScope()
{
- return this.scopeClass;
+ return scopeClass;
}
public Set<Type> getTypes()
{
- return this.apiTypes;
+ return apiTypes;
}
/**
@@ -510,7 +510,7 @@ public abstract class AbstractOwbBean<T>
*/
public boolean isNullable()
{
- return this.nullable;
+ return nullable;
}
/**
@@ -518,7 +518,7 @@ public abstract class AbstractOwbBean<T>
*/
public boolean isSerializable()
{
- return this.serializable;
+ return serializable;
}
/**
@@ -526,7 +526,7 @@ public abstract class AbstractOwbBean<T>
*/
public void addInjectionPoint(InjectionPoint injectionPoint)
{
- this.injectionPoints.add(injectionPoint);
+ injectionPoints.add(injectionPoint);
}
/**
@@ -534,7 +534,7 @@ public abstract class AbstractOwbBean<T>
*/
public Set<InjectionPoint> getInjectionPoints()
{
- return this.injectionPoints;
+ return injectionPoints;
}
/**
@@ -542,7 +542,7 @@ public abstract class AbstractOwbBean<T>
*/
public void setSpecializedBean(boolean specialized)
{
- this.specializedBean = specialized;
+ specializedBean = specialized;
cachedHashCode = 0;
}
@@ -560,7 +560,7 @@ public abstract class AbstractOwbBean<T>
*/
public boolean isSpecializedBean()
{
- return this.specializedBean;
+ return specializedBean;
}
/**
@@ -590,7 +590,7 @@ public abstract class AbstractOwbBean<T>
{
Set<Class<? extends Annotation>> set = new HashSet<Class<? extends Annotation>>();
- for(Annotation ann : this.stereoTypes)
+ for(Annotation ann : stereoTypes)
{
set.add(ann.annotationType());
}
@@ -613,7 +613,7 @@ public abstract class AbstractOwbBean<T>
*/
public boolean isEnabled()
{
- return this.enabled;
+ return enabled;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java Thu Oct 13 11:11:03 2011
@@ -57,7 +57,7 @@ public abstract class AbstractProducerBe
*/
public InjectionTargetBean<?> getParent()
{
- return this.ownerComponent;
+ return ownerComponent;
}
/**
@@ -107,7 +107,7 @@ public abstract class AbstractProducerBe
Object parentInstance;
Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(),
- (AbstractOwbBean<T>) this.ownerComponent);
+ (AbstractOwbBean<T>) ownerComponent);
if (specialize != null)
{
@@ -115,7 +115,7 @@ public abstract class AbstractProducerBe
}
else
{
- parentInstance = getManager().getReference(this.ownerComponent, null, creationalContext);
+ parentInstance = getManager().getReference(ownerComponent, null, creationalContext);
}
return parentInstance;
@@ -128,7 +128,7 @@ public abstract class AbstractProducerBe
Object parentInstance;
Bean<?> specialize = WebBeansUtil.getMostSpecializedBean(getManager(),
- (AbstractOwbBean<T>) this.ownerComponent);
+ (AbstractOwbBean<T>) ownerComponent);
if (specialize != null)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BeanManagerBean.java Thu Oct 13 11:11:03 2011
@@ -38,7 +38,7 @@ public class BeanManagerBean extends Abs
@Override
protected BeanManager createInstance(CreationalContext<BeanManager> creationalContext)
{
- if (this.manager == null)
+ if (manager == null)
{
manager = new InjectableBeanManager(getWebBeansContext().getBeanManagerImpl());
}
@@ -49,7 +49,7 @@ public class BeanManagerBean extends Abs
@Override
protected void destroyInstance(BeanManager instance,CreationalContext<BeanManager> creationalContext)
{
- this.manager = null;
+ manager = null;
}
/**
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java Thu Oct 13 11:11:03 2011
@@ -151,7 +151,7 @@ public abstract class BuildInOwbBean<T>
{
super(webBeansType, returnType, WebBeansContext.getInstance());
initBuildInBeanConfig(getWebBeansContext());
- this.handlerClassName = proxyHandlerMap.get(this.getWebBeansType());
+ handlerClassName = proxyHandlerMap.get(getWebBeansType());
if (handlerClassName.equalsIgnoreCase(PROXY_HANDLER_VALUE_NONE) ||
handlerClassName.equalsIgnoreCase(PROXY_HANDLER_VALUE_DEFAULT))
{
@@ -190,7 +190,7 @@ public abstract class BuildInOwbBean<T>
protected PrivilegedAction<T> setBuildInBean(BuildInOwbBean<T> b)
{
- this.buildinBean = b;
+ buildinBean = b;
return this;
}
@@ -267,7 +267,6 @@ public abstract class BuildInOwbBean<T>
this.actualObject = actualObject;
}
- @Override
public Object invoke(Object self, Method thisMethod, Method proceed, Object[] args) throws Throwable
{
if(proceed != null)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java Thu Oct 13 11:11:03 2011
@@ -75,7 +75,7 @@ public class InjectionTargetWrapper<T> i
@Override
public void inject(T instance, CreationalContext<T> ctx)
{
- if(this.wrapped != null)
+ if(wrapped != null)
{
wrapped.inject(instance, ctx);
}
@@ -87,7 +87,7 @@ public class InjectionTargetWrapper<T> i
@Override
public void postConstruct(T instance)
{
- if(this.wrapped != null)
+ if(wrapped != null)
{
wrapped.postConstruct(instance);
}
@@ -99,7 +99,7 @@ public class InjectionTargetWrapper<T> i
@Override
public void preDestroy(T instance)
{
- if(this.wrapped != null)
+ if(wrapped != null)
{
wrapped.preDestroy(instance);
}
@@ -111,7 +111,7 @@ public class InjectionTargetWrapper<T> i
@Override
public void dispose(T instance)
{
- if(this.wrappedProducer != null)
+ if(wrappedProducer != null)
{
wrappedProducer.dispose(instance);
}
@@ -123,9 +123,9 @@ public class InjectionTargetWrapper<T> i
@Override
public Set<InjectionPoint> getInjectionPoints()
{
- if(this.wrappedProducer != null)
+ if(wrappedProducer != null)
{
- return this.wrappedProducer.getInjectionPoints();
+ return wrappedProducer.getInjectionPoints();
}
return wrapped.getInjectionPoints();
@@ -137,9 +137,9 @@ public class InjectionTargetWrapper<T> i
@Override
public T produce(CreationalContext<T> creationalContext)
{
- if(this.wrappedProducer != null)
+ if(wrappedProducer != null)
{
- return this.wrappedProducer.produce(creationalContext);
+ return wrappedProducer.produce(creationalContext);
}
return wrapped.produce(creationalContext);
@@ -147,17 +147,17 @@ public class InjectionTargetWrapper<T> i
public boolean isOwbProvided()
{
- if(this.wrapped != null)
+ if(wrapped != null)
{
- if(InjectionTargetProducer.class.isAssignableFrom(this.wrapped.getClass()))
+ if(InjectionTargetProducer.class.isAssignableFrom(wrapped.getClass()))
{
return true;
}
}
- else if(this.wrappedProducer != null)
+ else if(wrappedProducer != null)
{
- if(ProducerBeansProducer.class.isAssignableFrom(this.wrappedProducer.getClass()))
+ if(ProducerBeansProducer.class.isAssignableFrom(wrappedProducer.getClass()))
{
return true;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java Thu Oct 13 11:11:03 2011
@@ -163,9 +163,9 @@ public class ManagedBean<T> extends Abst
{
return isPassivationCapable.booleanValue();
}
- if(Serializable.class.isAssignableFrom(this.returnType))
+ if(Serializable.class.isAssignableFrom(returnType))
{
- for(Decorator<?> dec : this.decorators)
+ for(Decorator<?> dec : decorators)
{
if(dec.getBeanClass() != null && !Serializable.class.isAssignableFrom(dec.getBeanClass()))
{
@@ -174,7 +174,7 @@ public class ManagedBean<T> extends Abst
}
}
- for(InterceptorData interceptorData : this.interceptorStack)
+ for(InterceptorData interceptorData : interceptorStack)
{
if(interceptorData.isDefinedInInterceptorClass())
{
@@ -202,4 +202,4 @@ public class ManagedBean<T> extends Abst
{
isAbstractDecorator = flag;
}
-}
\ No newline at end of file
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerFieldBean.java Thu Oct 13 11:11:03 2011
@@ -79,7 +79,7 @@ public class ProducerFieldBean<T> extend
CreationalContext<?> parentCreational = null;
try
{
- parentCreational = getManager().createCreationalContext(this.ownerComponent);
+ parentCreational = getManager().createCreationalContext(ownerComponent);
if (!producerField.isAccessible())
{
@@ -103,9 +103,9 @@ public class ProducerFieldBean<T> extend
}
finally
{
- if (this.ownerComponent.getScope().equals(Dependent.class))
+ if (ownerComponent.getScope().equals(Dependent.class))
{
- destroyBean(this.ownerComponent, parentInstance, parentCreational);
+ destroyBean(ownerComponent, parentInstance, parentCreational);
}
}
@@ -120,7 +120,7 @@ public class ProducerFieldBean<T> extend
*/
public Field getCreatorField()
{
- return this.producerField;
+ return producerField;
}
/**
@@ -151,7 +151,7 @@ public class ProducerFieldBean<T> extend
*/
public void setProducerField(Field field)
{
- this.producerField = field;
+ producerField = field;
}
/**
@@ -163,9 +163,9 @@ public class ProducerFieldBean<T> extend
{
String errorMessage = "WebBeans producer field : " + producerField.getName() +
" return type in the component implementation class : " +
- this.ownerComponent.getReturnType().getName() +
+ ownerComponent.getReturnType().getName() +
" scope must be @Dependent to create null instance";
- WebBeansUtil.checkNullInstance(instance, this.getScope(), errorMessage);
+ WebBeansUtil.checkNullInstance(instance, getScope(), errorMessage);
}
/**
@@ -175,16 +175,16 @@ public class ProducerFieldBean<T> extend
{
String errorMessage = "WebBeans producer method : " + producerField.getName() +
" return type in the component implementation class : " +
- this.ownerComponent.getReturnType().getName() + " with passivating scope @" +
- this.getScope().getName() + " must be Serializable";
- getWebBeansContext().getWebBeansUtil().checkSerializableScopeType(this.getScope(),
- this.isSerializable(), errorMessage);
+ ownerComponent.getReturnType().getName() + " with passivating scope @" +
+ getScope().getName() + " must be Serializable";
+ getWebBeansContext().getWebBeansUtil().checkSerializableScopeType(getScope(),
+ isSerializable(), errorMessage);
}
@Override
public boolean isPassivationCapable()
{
- return isPassivationCapable(this.producerField.getType(),this.producerField.getModifiers());
+ return isPassivationCapable(producerField.getType(), producerField.getModifiers());
}
@Override
@@ -206,4 +206,4 @@ public class ProducerFieldBean<T> extend
{
return super.toString();
}
-}
\ No newline at end of file
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerMethodBean.java Thu Oct 13 11:11:03 2011
@@ -181,7 +181,7 @@ public class ProducerMethodBean<T> exten
{
//X TODO dependentInstanceOfProducerMethods MUST NOT be public!
AbstractInjectable.dependentInstanceOfProducerMethods.set(new ArrayList<DependentCreationalContext<Object>>());
- parentCreational = getManager().createCreationalContext(this.ownerComponent);
+ parentCreational = getManager().createCreationalContext(ownerComponent);
if (!Modifier.isStatic(creatorMethod.getModifiers()))
{
@@ -321,14 +321,14 @@ public class ProducerMethodBean<T> exten
InjectableMethods<T> m = null;
try
{
- parentCreational = getManager().createCreationalContext(this.ownerComponent);
+ parentCreational = getManager().createCreationalContext(ownerComponent);
if (!Modifier.isStatic(disposalMethod.getModifiers()))
{
parentInstance = getParentInstance(parentCreational);
}
- m = new InjectableMethods<T>(disposalMethod, parentInstance, this.ownerComponent, creationalContext);
+ m = new InjectableMethods<T>(disposalMethod, parentInstance, ownerComponent, creationalContext);
m.setDisposable(true);
m.setProducerMethodInstance(instance);
@@ -370,9 +370,9 @@ public class ProducerMethodBean<T> exten
{
String errorMessage = "WebBeans producer method : " + creatorMethod.getName() +
" return type in the component implementation class : " +
- this.ownerComponent.getReturnType().getName() +
+ ownerComponent.getReturnType().getName() +
" scope type must be @Dependent to create null instance";
- WebBeansUtil.checkNullInstance(instance, this.getScope(), errorMessage);
+ WebBeansUtil.checkNullInstance(instance, getScope(), errorMessage);
}
/**
@@ -382,10 +382,10 @@ public class ProducerMethodBean<T> exten
{
String errorMessage = "WebBeans producer method : " + creatorMethod.getName() +
" return type in the component implementation class : " +
- this.ownerComponent.getReturnType().getName() + " with passivating scope @" +
- this.getScope().getName() + " must be Serializable";
- getWebBeansContext().getWebBeansUtil().checkSerializableScopeType(this.getScope(),
- this.isSerializable(), errorMessage);
+ ownerComponent.getReturnType().getName() + " with passivating scope @" +
+ getScope().getName() + " must be Serializable";
+ getWebBeansContext().getWebBeansUtil().checkSerializableScopeType(getScope(),
+ isSerializable(), errorMessage);
}
@@ -394,11 +394,11 @@ public class ProducerMethodBean<T> exten
@Override
public boolean isPassivationCapable()
{
- return isPassivationCapable(this.creatorMethod.getReturnType(),this.creatorMethod.getModifiers());
+ return isPassivationCapable(creatorMethod.getReturnType(), creatorMethod.getModifiers());
}
public String toString()
{
return super.toString();
}
-}
\ No newline at end of file
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ResourceBean.java Thu Oct 13 11:11:03 2011
@@ -48,7 +48,7 @@ public class ResourceBean<X, T extends A
try
{
ResourceInjectionService resourceService = getWebBeansContext().getService(ResourceInjectionService.class);
- X instance = resourceService.getResourceReference(this.resourceReference);
+ X instance = resourceService.getResourceReference(resourceReference);
if (instance == null || Modifier.isFinal(instance.getClass().getModifiers()))
{
@@ -75,7 +75,7 @@ public class ResourceBean<X, T extends A
public X getActualInstance()
{
ResourceInjectionService resourceService = getWebBeansContext().getService(ResourceInjectionService.class);
- X instance = resourceService.getResourceReference(this.resourceReference);
+ X instance = resourceService.getResourceReference(resourceReference);
return instance;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java Thu Oct 13 11:11:03 2011
@@ -66,7 +66,7 @@ public class AbstractBeanCreator<T> impl
{
this.bean = bean;
this.beanAnnotations = beanAnnotations;
- this.definitionUtil = bean.getWebBeansContext().getDefinitionUtil();
+ definitionUtil = bean.getWebBeansContext().getDefinitionUtil();
}
/**
@@ -86,12 +86,12 @@ public class AbstractBeanCreator<T> impl
{
if(isDefaultMetaDataProvider())
{
- DefinitionUtil.defineApiTypes(this.bean, this.bean.getReturnType());
+ DefinitionUtil.defineApiTypes(bean, bean.getReturnType());
}
else
{
- Set<Type> types = this.annotatedType.getTypeClosure();
- this.bean.getTypes().addAll(types);
+ Set<Type> types = annotatedType.getTypeClosure();
+ bean.getTypes().addAll(types);
}
Set<String> ignored = bean.getWebBeansContext().getOpenWebBeansConfiguration().getIgnoredInterfaces();
for (Iterator<Type> i = bean.getTypes().iterator(); i.hasNext();)
@@ -112,11 +112,11 @@ public class AbstractBeanCreator<T> impl
{
if(isDefaultMetaDataProvider())
{
- definitionUtil.defineQualifiers(this.bean, this.beanAnnotations);
+ definitionUtil.defineQualifiers(bean, beanAnnotations);
}
else
{
- definitionUtil.defineQualifiers(this.bean, AnnotationUtil.getAnnotationsFromSet(this.annotatedType.getAnnotations()));
+ definitionUtil.defineQualifiers(bean, AnnotationUtil.getAnnotationsFromSet(annotatedType.getAnnotations()));
}
}
@@ -129,11 +129,11 @@ public class AbstractBeanCreator<T> impl
{
if(isDefaultMetaDataProvider())
{
- definitionUtil.defineName(this.bean, this.beanAnnotations, defaultName);
+ definitionUtil.defineName(bean, beanAnnotations, defaultName);
}
else
{
- definitionUtil.defineName(this.bean, AnnotationUtil.getAnnotationsFromSet(this.annotatedType.getAnnotations()),
+ definitionUtil.defineName(bean, AnnotationUtil.getAnnotationsFromSet(annotatedType.getAnnotations()),
WebBeansUtil.getManagedBeanDefaultName(annotatedType.getJavaClass().getSimpleName()));
}
@@ -147,11 +147,11 @@ public class AbstractBeanCreator<T> impl
{
if(isDefaultMetaDataProvider())
{
- definitionUtil.defineScopeType(this.bean, this.beanAnnotations, errorMessage, allowLazyInit);
+ definitionUtil.defineScopeType(bean, beanAnnotations, errorMessage, allowLazyInit);
}
else
{
- definitionUtil.defineScopeType(this.bean, AnnotationUtil.getAnnotationsFromSet(this.annotatedType.getAnnotations()), errorMessage, false);
+ definitionUtil.defineScopeType(bean, AnnotationUtil.getAnnotationsFromSet(annotatedType.getAnnotations()), errorMessage, false);
}
}
@@ -161,7 +161,7 @@ public class AbstractBeanCreator<T> impl
@Override
public void defineSerializable()
{
- definitionUtil.defineSerializable(this.bean);
+ definitionUtil.defineSerializable(bean);
}
/**
@@ -172,11 +172,11 @@ public class AbstractBeanCreator<T> impl
{
if(isDefaultMetaDataProvider())
{
- definitionUtil.defineStereoTypes(this.bean, this.beanAnnotations);
+ definitionUtil.defineStereoTypes(bean, beanAnnotations);
}
else
{
- definitionUtil.defineStereoTypes(this.bean, AnnotationUtil.getAnnotationsFromSet(this.annotatedType.getAnnotations()));
+ definitionUtil.defineStereoTypes(bean, AnnotationUtil.getAnnotationsFromSet(annotatedType.getAnnotations()));
}
}
@@ -186,7 +186,7 @@ public class AbstractBeanCreator<T> impl
*/
public MetaDataProvider getMetaDataProvider()
{
- return this.metadataProvider;
+ return metadataProvider;
}
/**
@@ -205,7 +205,7 @@ public class AbstractBeanCreator<T> impl
*/
protected boolean isDefaultMetaDataProvider()
{
- return this.metadataProvider.equals(MetaDataProvider.DEFAULT);
+ return metadataProvider.equals(MetaDataProvider.DEFAULT);
}
/**
@@ -213,16 +213,16 @@ public class AbstractBeanCreator<T> impl
*/
public AbstractOwbBean<T> getBean()
{
- return this.bean;
+ return bean;
}
protected AnnotatedType<T> getAnnotatedType()
{
- return this.annotatedType;
+ return annotatedType;
}
public void setAnnotatedType(AnnotatedType<T> annotatedType)
{
this.annotatedType = annotatedType;
}
-}
\ No newline at end of file
+}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java Thu Oct 13 11:11:03 2011
@@ -106,9 +106,9 @@ public class ThirdpartyBeanImpl<T> exten
@Override
public String getId()
{
- if(this.bean instanceof PassivationCapable)
+ if(bean instanceof PassivationCapable)
{
- PassivationCapable pc = (PassivationCapable)this.bean;
+ PassivationCapable pc = (PassivationCapable) bean;
return pc.getId();
}
@@ -120,7 +120,7 @@ public class ThirdpartyBeanImpl<T> exten
@Override
public boolean isPassivationCapable()
{
- return this.bean instanceof PassivationCapable ? true : false;
+ return bean instanceof PassivationCapable ? true : false;
}
@Override
@@ -141,19 +141,19 @@ public class ThirdpartyBeanImpl<T> exten
@Override
public Class<?> getBeanClass()
{
- return this.bean.getBeanClass();
+ return bean.getBeanClass();
}
@Override
public Set<Class<? extends Annotation>> getStereotypes()
{
- return this.bean.getStereotypes();
+ return bean.getStereotypes();
}
@Override
public boolean isAlternative()
{
- boolean alternative = this.bean.isAlternative();
+ boolean alternative = bean.isAlternative();
if(alternative)
{
AlternativesManager manager = getWebBeansContext().getAlternativesManager();
@@ -163,7 +163,7 @@ public class ThirdpartyBeanImpl<T> exten
return true;
}
- Set<Class<? extends Annotation>> stereoTypes = this.bean.getStereotypes();
+ Set<Class<? extends Annotation>> stereoTypes = bean.getStereotypes();
if(stereoTypes != null)
{
for(Class<? extends Annotation> stereo : stereoTypes)
@@ -188,7 +188,7 @@ public class ThirdpartyBeanImpl<T> exten
@Override
public int hashCode()
{
- return 29 * this.bean.hashCode();
+ return 29 * bean.hashCode();
}
@Override
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeanTypeSetResolver.java Thu Oct 13 11:11:03 2011
@@ -44,20 +44,20 @@ public class BeanTypeSetResolver
*/
public void startConfiguration()
{
- if(this.beanType == Object.class || (beanType instanceof Class && ((Class)beanType).isSynthetic()))
+ if(beanType == Object.class || (beanType instanceof Class && ((Class)beanType).isSynthetic()))
{
return;
}
else if(ClassUtil.isParametrizedType(beanType))
{
- parametrizedClassConfiguration((ParameterizedType)this.beanType);
+ parametrizedClassConfiguration((ParameterizedType) beanType);
}
else
{
if(beanType instanceof Class)
{
- normalClassConfiguration((Class<?>)this.beanType);
+ normalClassConfiguration((Class<?>) beanType);
}
}
@@ -78,14 +78,14 @@ public class BeanTypeSetResolver
{
pt.addTypeArgument(tv);
}
-
- this.hierarchy.add(pt);
+
+ hierarchy.add(pt);
}
//Normal Bean class
else
{
//Add this normal class
- this.hierarchy.add(beanClass);
+ hierarchy.add(beanClass);
}
@@ -98,7 +98,7 @@ public class BeanTypeSetResolver
{
BeanTypeSetResolver superResolver = new BeanTypeSetResolver(superClass);
superResolver.startConfiguration();
- this.hierarchy.addAll(superResolver.getHierarchy());
+ hierarchy.addAll(superResolver.getHierarchy());
}
}
@@ -108,7 +108,7 @@ public class BeanTypeSetResolver
{
BeanTypeSetResolver superResolver = new BeanTypeSetResolver(interfaceType);
superResolver.startConfiguration();
- this.hierarchy.addAll(superResolver.getHierarchy());
+ hierarchy.addAll(superResolver.getHierarchy());
}
}
@@ -119,7 +119,7 @@ public class BeanTypeSetResolver
private void parametrizedClassConfiguration(ParameterizedType parametrizedClass)
{
//Add this parametrized type
- this.hierarchy.add(parametrizedClass);
+ hierarchy.add(parametrizedClass);
//Get raw type
Class<?> rawType = (Class<?>)parametrizedClass.getRawType();
@@ -135,22 +135,22 @@ public class BeanTypeSetResolver
if(ClassUtil.isParametrizedType(superClassGeneric))
{
//Resolve Type Arguments
- this.hierarchy.add(resolveTypeArguments(parametrizedClass , (ParameterizedType)superClassGeneric));
+ hierarchy.add(resolveTypeArguments(parametrizedClass, (ParameterizedType) superClassGeneric));
configured = true;
}
//Super class is a normal
else
{
- this.hierarchy.add(superClassGeneric);
+ hierarchy.add(superClassGeneric);
}
//Get super class hiearchy
BeanTypeSetResolver superResolver = new BeanTypeSetResolver(superClassGeneric);
superResolver.startConfiguration();
- this.hierarchy.addAll(superResolver.getHierarchy());
+ hierarchy.addAll(superResolver.getHierarchy());
if(configured)
{
- this.hierarchy.remove(superClassGeneric);
+ hierarchy.remove(superClassGeneric);
}
}
@@ -165,21 +165,21 @@ public class BeanTypeSetResolver
if(ClassUtil.isParametrizedType(superInterfaceGeneric))
{
//Resolve Type Arguments
- this.hierarchy.add(resolveTypeArguments(parametrizedClass , (ParameterizedType)superInterfaceGeneric));
+ hierarchy.add(resolveTypeArguments(parametrizedClass, (ParameterizedType) superInterfaceGeneric));
configured = true;
}
else
{
- this.hierarchy.add(superInterfaceGeneric);
+ hierarchy.add(superInterfaceGeneric);
}
//Interface hierachy
BeanTypeSetResolver superResolver = new BeanTypeSetResolver(superInterfaceGeneric);
superResolver.startConfiguration();
- this.hierarchy.addAll(superResolver.getHierarchy());
+ hierarchy.addAll(superResolver.getHierarchy());
if(configured)
{
- this.hierarchy.remove(superInterfaceGeneric);
+ hierarchy.remove(superInterfaceGeneric);
}
}
}
@@ -241,6 +241,6 @@ public class BeanTypeSetResolver
*/
public Set<Type> getHierarchy()
{
- return this.hierarchy;
+ return hierarchy;
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java Thu Oct 13 11:11:03 2011
@@ -111,7 +111,7 @@ public class BeansDeployer
this.xmlConfigurator = xmlConfigurator;
this.webBeansContext = webBeansContext;
String usage = this.webBeansContext.getOpenWebBeansConfiguration().getProperty(OpenWebBeansConfiguration.USE_EJB_DISCOVERY);
- this.discoverEjb = Boolean.parseBoolean(usage);
+ discoverEjb = Boolean.parseBoolean(usage);
}
/**
@@ -545,7 +545,7 @@ public class BeansDeployer
boolean isDefined = defineManagedBean((Class<Object>) implClass, (ProcessAnnotatedTypeImpl<Object>) processAnnotatedEvent);
// Try class is EJB bean
- if (!isDefined && this.discoverEjb)
+ if (!isDefined && discoverEjb)
{
if (EJBWebBeansConfigurator.isSessionBean(implClass, webBeansContext))
{
@@ -583,7 +583,7 @@ public class BeansDeployer
{
fis = url.openStream();
- this.xmlConfigurator.configure(fis, url.toExternalForm(), scanner);
+ xmlConfigurator.configure(fis, url.toExternalForm(), scanner);
}
catch (IOException e)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefaultAnnotation.java Thu Oct 13 11:11:03 2011
@@ -83,7 +83,7 @@ public class DefaultAnnotation implement
@Override
public String toString()
{
- Method[] methods = this.annotationClass.getDeclaredMethods();
+ Method[] methods = annotationClass.getDeclaredMethods();
StringBuilder sb = new StringBuilder("@" + annotationType().getName() + "(");
int lenght = methods.length;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OwbParametrizedTypeImpl.java Thu Oct 13 11:11:03 2011
@@ -48,10 +48,9 @@ public class OwbParametrizedTypeImpl imp
public OwbParametrizedTypeImpl(Type owner, Type raw)
{
this.owner = owner;
- this.rawType = raw;
+ rawType = raw;
}
- @Override
public Type[] getActualTypeArguments()
{
return types.toArray(new Type[types.size()]);
@@ -59,19 +58,17 @@ public class OwbParametrizedTypeImpl imp
public void addTypeArgument(Type type)
{
- this.types.add(type);
+ types.add(type);
}
- @Override
public Type getOwnerType()
{
- return this.owner;
+ return owner;
}
- @Override
public Type getRawType()
{
- return this.rawType;
+ return rawType;
}
@@ -141,8 +138,8 @@ public class OwbParametrizedTypeImpl imp
public String toString()
{
- StringBuffer buffer = new StringBuffer();
- buffer.append(((Class<?>)this.rawType).getSimpleName());
+ StringBuilder buffer = new StringBuilder();
+ buffer.append(((Class<?>) rawType).getSimpleName());
Type[] actualTypes = getActualTypeArguments();
if(actualTypes.length > 0)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java Thu Oct 13 11:11:03 2011
@@ -133,12 +133,12 @@ public class WebBeansContext
serviceMap.put(entry.getKey(), entry.getValue());
}
}
- this.loaderService = getService(LoaderService.class);
- this.securityService = getService(SecurityService.class);
+ loaderService = getService(LoaderService.class);
+ securityService = getService(SecurityService.class);
WebBeansUtil.initProxyFactoryClassLoaderProvider();
// Allow the WebBeansContext itself to be looked up
- managerMap.put(this.getClass(), this);
+ managerMap.put(getClass(), this);
// Add them all into the map for backwards compatibility
managerMap.put(AlternativesManager.class, alternativesManager);
@@ -439,6 +439,6 @@ public class WebBeansContext
public LoaderService getLoaderService()
{
- return this.loaderService;
+ return loaderService;
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/AbstractBeanInheritedMetaData.java Thu Oct 13 11:11:03 2011
@@ -67,32 +67,32 @@ abstract class AbstractBeanInheritedMeta
public Set<Annotation> getInheritedQualifiers()
{
- return this.inheritedQualifiers;
+ return inheritedQualifiers;
}
public Set<Annotation> getInheritedStereoTypes()
{
- return this.inheritedStereoTypes;
+ return inheritedStereoTypes;
}
public Set<Annotation> getInheritedInterceptorBindings()
{
- return this.inheritedInterceptorBindings;
+ return inheritedInterceptorBindings;
}
public Annotation getInheritedScopeType()
{
- return this.inheritedScopeType;
+ return inheritedScopeType;
}
protected AbstractOwbBean<T> getComponent()
{
- return this.component;
+ return component;
}
protected Class<?> getInheritedClazz()
{
- return this.inheritedClazz;
+ return inheritedClazz;
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/inheritance/BeanInheritedMetaData.java Thu Oct 13 11:11:03 2011
@@ -41,17 +41,17 @@ public class BeanInheritedMetaData<T> ex
protected void setInheritedQualifiers()
{
- if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
+ if(inheritedClazz != null && inheritedClazz != Object.class)
{
- setInheritedTypes(getInheritedQualifiers(), this.inheritedClazz, Qualifier.class);
+ setInheritedTypes(getInheritedQualifiers(), inheritedClazz, Qualifier.class);
}
}
protected void setInheritedInterceptorBindings()
{
- if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
+ if(inheritedClazz != null && inheritedClazz != Object.class)
{
- setInheritedTypes(getInheritedInterceptorBindings(), this.inheritedClazz, InterceptorBinding.class);
+ setInheritedTypes(getInheritedInterceptorBindings(), inheritedClazz, InterceptorBinding.class);
}
}
@@ -59,10 +59,10 @@ public class BeanInheritedMetaData<T> ex
protected void setInheritedScopeType()
{
- if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
+ if(inheritedClazz != null && inheritedClazz != Object.class)
{
- setInheritedType(this.inheritedClazz, NormalScope.class);
- setInheritedType(this.inheritedClazz, Scope.class);
+ setInheritedType(inheritedClazz, NormalScope.class);
+ setInheritedType(inheritedClazz, Scope.class);
}
}
@@ -70,9 +70,9 @@ public class BeanInheritedMetaData<T> ex
protected void setInheritedStereoTypes()
{
- if(this.inheritedClazz != null && this.inheritedClazz != Object.class)
+ if(inheritedClazz != null && inheritedClazz != Object.class)
{
- setInheritedTypes(getInheritedStereoTypes(), this.inheritedClazz, Stereotype.class);
+ setInheritedTypes(getInheritedStereoTypes(), inheritedClazz, Stereotype.class);
}
}
@@ -94,7 +94,7 @@ public class BeanInheritedMetaData<T> ex
if(annotationType.equals(NormalScope.class) || annotationType.equals(Scope.class))
{
- this.inheritedScopeType = annotation;
+ inheritedScopeType = annotation;
}
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Thu Oct 13 11:11:03 2011
@@ -221,33 +221,33 @@ public class BeanManagerImpl implements
{
Asserts.assertNotNull(contextual);
Asserts.assertNotNull(wrapper);
-
- this.injectionTargetWrappers.put(contextual, wrapper);
+
+ injectionTargetWrappers.put(contextual, wrapper);
}
public <T> InjectionTargetWrapper<T> getInjectionTargetWrapper(Contextual<T> contextual)
{
Asserts.assertNotNull(contextual);
- return (InjectionTargetWrapper<T>)this.injectionTargetWrappers.get(contextual);
+ return (InjectionTargetWrapper<T>) injectionTargetWrappers.get(contextual);
}
public <T> void putInjectionTargetWrapperForJavaEeComponents(Class<T> javaEeComponentClass, InjectionTargetWrapper<T> wrapper)
{
Asserts.assertNotNull(javaEeComponentClass);
Asserts.assertNotNull(wrapper);
-
- this.injectionTargetForJavaEeComponents.put(javaEeComponentClass, wrapper);
+
+ injectionTargetForJavaEeComponents.put(javaEeComponentClass, wrapper);
}
public <T> InjectionTargetWrapper<T> getInjectionTargetWrapper(Class<T> javaEeComponentClass)
{
Asserts.assertNotNull(javaEeComponentClass);
- return (InjectionTargetWrapper<T>)this.injectionTargetForJavaEeComponents.get(javaEeComponentClass);
+ return (InjectionTargetWrapper<T>) injectionTargetForJavaEeComponents.get(javaEeComponentClass);
}
public ErrorStack getErrorStack()
{
- return this.errorStack;
+ return errorStack;
}
/**
@@ -257,7 +257,7 @@ public class BeanManagerImpl implements
*/
public NotificationManager getNotificationManager()
{
- return this.notificationManager;
+ return notificationManager;
}
/**
@@ -267,7 +267,7 @@ public class BeanManagerImpl implements
*/
public InjectionResolver getInjectionResolver()
{
- return this.injectionResolver;
+ return injectionResolver;
}
/**
@@ -368,13 +368,13 @@ public class BeanManagerImpl implements
if(newBean instanceof AbstractOwbBean)
{
addPassivationInfo((OwbBean)newBean);
- this.deploymentBeans.add(newBean);
+ deploymentBeans.add(newBean);
}
else
{
ThirdpartyBeanImpl<?> bean = new ThirdpartyBeanImpl(newBean, webBeansContext);
addPassivationInfo(bean);
- this.deploymentBeans.add(bean);
+ deploymentBeans.add(bean);
}
return this;
@@ -413,25 +413,25 @@ public class BeanManagerImpl implements
public void addCustomInterceptorClass(Class<?> clazz)
{
Asserts.nullCheckForClass(clazz);
- this.additionalInterceptorClasses.add(clazz);
+ additionalInterceptorClasses.add(clazz);
}
public void addCustomDecoratorClass(Class<?> clazz)
{
Asserts.nullCheckForClass(clazz);
- this.additionalDecoratorClasses.add(clazz);
+ additionalDecoratorClasses.add(clazz);
}
public boolean containsCustomInterceptorClass(Class<?> clazz)
{
Asserts.nullCheckForClass(clazz);
- return this.additionalInterceptorClasses.contains(clazz);
+ return additionalInterceptorClasses.contains(clazz);
}
public boolean containsCustomDecoratorClass(Class<?> clazz)
{
Asserts.nullCheckForClass(clazz);
- return this.additionalDecoratorClasses.contains(clazz);
+ return additionalDecoratorClasses.contains(clazz);
}
public void addInterceptorBindingType(Class<? extends Annotation> bindingType, Annotation... inheritsArray)
@@ -470,7 +470,7 @@ public class BeanManagerImpl implements
throw new IllegalArgumentException("Event class : " + event.getClass().getName() + " can not be defined as generic type");
}
- this.notificationManager.fireEvent(event, bindings);
+ notificationManager.fireEvent(event, bindings);
}
@Deprecated
@@ -479,7 +479,7 @@ public class BeanManagerImpl implements
AbstractOwbBean<?> component = null;
Object object = null;
- Set<Bean<?>> set = this.injectionResolver.implResolveByName(name);
+ Set<Bean<?>> set = injectionResolver.implResolveByName(name);
if (set.isEmpty())
{
return null;
@@ -540,7 +540,7 @@ public class BeanManagerImpl implements
@Deprecated
public Set<Bean<?>> resolveByName(String name)
{
- return this.injectionResolver.implResolveByName(name);
+ return injectionResolver.implResolveByName(name);
}
@Deprecated
@@ -548,7 +548,7 @@ public class BeanManagerImpl implements
{
webBeansContext.getResolutionUtil().getInstanceByTypeConditions(bindingTypes);
- return this.injectionResolver.implResolveByType(apiType, bindingTypes);
+ return injectionResolver.implResolveByType(apiType, bindingTypes);
}
@Deprecated
@@ -559,7 +559,7 @@ public class BeanManagerImpl implements
webBeansContext.getResolutionUtil().getInstanceByTypeConditions(bindingTypes);
- return this.injectionResolver.implResolveByType(apiType.getType(), bindingTypes);
+ return injectionResolver.implResolveByType(apiType.getType(), bindingTypes);
}
@@ -578,7 +578,7 @@ public class BeanManagerImpl implements
if(owbBean.isPassivationCapable())
{
- this.addPassivationInfo((OwbBean)decorator);
+ addPassivationInfo((OwbBean)decorator);
}
}
return this;
@@ -593,7 +593,7 @@ public class BeanManagerImpl implements
OwbBean<?> owbBean = (OwbBean<?>)interceptor;
if(owbBean.isPassivationCapable())
{
- this.addPassivationInfo((OwbBean)interceptor);
+ addPassivationInfo((OwbBean)interceptor);
}
}
@@ -666,20 +666,20 @@ public class BeanManagerImpl implements
public Set<Bean<?>> getBeans()
{
- return this.deploymentBeans;
+ return deploymentBeans;
}
-
+
public List<Interceptor<?>> getInterceptors()
{
- return this.webBeansInterceptors;
+ return webBeansInterceptors;
}
public Set<Decorator<?>> getDecorators()
{
- return this.webBeansDecorators;
+ return webBeansDecorators;
}
-
+
private void addContext(Class<? extends Annotation> scopeType, javax.enterprise.context.spi.Context context)
{
Asserts.assertNotNull(scopeType, "scopeType parameter can not be null");
@@ -727,8 +727,8 @@ public class BeanManagerImpl implements
public BeanManager parse(InputStream xmlStream)
{
- this.xmlConfigurator.configure(xmlStream);
-
+ xmlConfigurator.configure(xmlStream);
+
return this;
}
@@ -770,8 +770,8 @@ public class BeanManagerImpl implements
webBeansContext.getAnnotationManager().checkQualifierConditions(bindings);
- return this.injectionResolver.implResolveByType(beanType, bindings);
-
+ return injectionResolver.implResolveByType(beanType, bindings);
+
}
@Override
@@ -779,7 +779,7 @@ public class BeanManagerImpl implements
{
Asserts.assertNotNull(name, "name parameter can not be null");
- return this.injectionResolver.implResolveByName(name);
+ return injectionResolver.implResolveByName(name);
}
@Override
@@ -974,9 +974,9 @@ public class BeanManagerImpl implements
if(webBeansContext.getWebBeansUtil().isScopeTypeNormal(bean.getScope()))
{
//Maybe it is cached
- if(this.cacheProxies.containsKey(bean))
+ if(cacheProxies.containsKey(bean))
{
- return this.cacheProxies.get(bean);
+ return cacheProxies.get(bean);
}
}
@@ -1043,7 +1043,7 @@ public class BeanManagerImpl implements
return true;
}
- for(ExternalScope ext : this.additionalScopes)
+ for(ExternalScope ext : additionalScopes)
{
if(ext.getScope().equals(annotationType))
{
@@ -1104,11 +1104,11 @@ public class BeanManagerImpl implements
set.add(obj);
}
- set = this.injectionResolver.findByAlternatives(set);
-
+ set = injectionResolver.findByAlternatives(set);
+
if(set.size() > 1)
{
- set = this.injectionResolver.findBySpecialization(set);
+ set = injectionResolver.findBySpecialization(set);
}
if(set.size() > 1)
@@ -1128,8 +1128,8 @@ public class BeanManagerImpl implements
Bean<?> bean = injectionPoint.getBean();
//Check for correct injection type
- this.injectionResolver.checkInjectionPointType(injectionPoint);
-
+ injectionResolver.checkInjectionPointType(injectionPoint);
+
Class<?> rawType = ClassUtil.getRawTypeForInjectionPoint(injectionPoint);
// check for InjectionPoint injection
@@ -1145,7 +1145,7 @@ public class BeanManagerImpl implements
}
else
{
- this.injectionResolver.checkInjectionPoints(injectionPoint);
+ injectionResolver.checkInjectionPoints(injectionPoint);
}
}
@@ -1173,7 +1173,7 @@ public class BeanManagerImpl implements
throw new IllegalArgumentException("Event type can not contain type variables. Event class is : " + event.getClass());
}
- return this.notificationManager.resolveObservers(event, qualifiers);
+ return notificationManager.resolveObservers(event, qualifiers);
}
@Override
@@ -1194,7 +1194,7 @@ public class BeanManagerImpl implements
public void addAdditionalAnnotatedType(AnnotatedType<?> annotatedType)
{
webBeansContext.getAnnotatedElementFactory().setAnnotatedType(annotatedType);
- this.additionalAnnotatedTypes.add(annotatedType);
+ additionalAnnotatedTypes.add(annotatedType);
}
public List<Class<? extends Annotation>> getAdditionalQualifiers()
@@ -1225,22 +1225,22 @@ public class BeanManagerImpl implements
public void clear()
{
- this.additionalAnnotatedTypes.clear();
- this.additionalDecoratorClasses.clear();
- this.additionalInterceptorClasses.clear();
- this.additionalInterceptorBindingTypes.clear();
- this.additionalQualifiers.clear();
- this.additionalScopes.clear();
- this.cacheProxies.clear();
- this.singleContextMap.clear();
- this.contextMap.clear();
- this.deploymentBeans.clear();
- this.errorStack.clear();
- this.injectionTargetForJavaEeComponents.clear();
- this.injectionTargetWrappers.clear();
- this.passivationBeans.clear();
- this.webBeansDecorators.clear();
- this.webBeansInterceptors.clear();
+ additionalAnnotatedTypes.clear();
+ additionalDecoratorClasses.clear();
+ additionalInterceptorClasses.clear();
+ additionalInterceptorBindingTypes.clear();
+ additionalQualifiers.clear();
+ additionalScopes.clear();
+ cacheProxies.clear();
+ singleContextMap.clear();
+ contextMap.clear();
+ deploymentBeans.clear();
+ errorStack.clear();
+ injectionTargetForJavaEeComponents.clear();
+ injectionTargetWrappers.clear();
+ passivationBeans.clear();
+ webBeansDecorators.clear();
+ webBeansInterceptors.clear();
}
public boolean isInUse()
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ExternalScope.java Thu Oct 13 11:11:03 2011
@@ -41,7 +41,7 @@ public class ExternalScope
this.scope = scope;
this.normal = normal;
this.passivating = passivating;
- this.scopeAnnotation = DefaultAnnotation.of(scope);
+ scopeAnnotation = DefaultAnnotation.of(scope);
}
public Class<? extends Annotation> getScope()