openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1182780 [3/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...
Date Thu, 13 Oct 2011 11:11:06 GMT
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=1182780&r1=1182779&r2=1182780&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 Thu Oct 13 11:11:03 2011
@@ -67,8 +67,8 @@ class InjectionPointImpl implements Inje
     InjectionPointImpl(Bean<?> ownerBean, Type type, Member member, Annotated annotated)
     {
         this.ownerBean = ownerBean;
-        this.injectionMember = member;
-        this.injectionType = type;
+        injectionMember = member;
+        injectionType = type;
         this.annotated = annotated;
     }
     
@@ -80,43 +80,40 @@ class InjectionPointImpl implements Inje
     public Bean<?> getBean()
     {
         
-        return this.ownerBean;
+        return ownerBean;
     }
 
     public Set<Annotation> getQualifiers()
     {
         
-        return this.qualifierAnnotations;
+        return qualifierAnnotations;
     }
 
     public Member getMember()
     {
-        return this.injectionMember;
+        return injectionMember;
     }
 
     public Type getType()
     {
         
-        return this.injectionType;
+        return injectionType;
     }
 
     
-    @Override
     public Annotated getAnnotated()
     {
         return annotated;
     }
 
-    @Override
     public boolean isDelegate()
     {
-        return this.delegate;
+        return delegate;
     }
 
-    @Override
     public boolean isTransient()
     {
-        return this.transientt;
+        return transientt;
     }
     
     void setDelegate(boolean delegate)
@@ -134,9 +131,9 @@ class InjectionPointImpl implements Inje
         ObjectOutputStream out = new ObjectOutputStream(op);
 
         //Write the owning bean class
-        out.writeObject(this.ownerBean.getBeanClass());
+        out.writeObject(ownerBean.getBeanClass());
 
-        Set<Annotation> qualifiers = this.ownerBean.getQualifiers();
+        Set<Annotation> qualifiers = ownerBean.getQualifiers();
         for(Annotation qualifier : qualifiers)
         {
             out.writeObject(Character.valueOf('-')); // throw-away delimiter so alternating annotations don't get swallowed in the read.
@@ -146,39 +143,39 @@ class InjectionPointImpl implements Inje
         
         out.writeObject(Character.valueOf('~'));
         
-        if(this.injectionMember instanceof Field)
+        if(injectionMember instanceof Field)
         {
             out.writeByte(0);
-            out.writeUTF(this.injectionMember.getName()); 
+            out.writeUTF(injectionMember.getName());
         }
         
-        if(this.injectionMember instanceof Method)
+        if(injectionMember instanceof Method)
         {
             out.writeByte(1);
-            out.writeUTF(this.injectionMember.getName());
-            Method method = (Method)this.injectionMember;
+            out.writeUTF(injectionMember.getName());
+            Method method = (Method) injectionMember;
             Class<?>[] parameters = method.getParameterTypes();
             out.writeObject(parameters);
             
-            AnnotatedParameter<?> ap = (AnnotatedParameter<?>)this.annotated;
+            AnnotatedParameter<?> ap = (AnnotatedParameter<?>) annotated;
             out.writeByte(ap.getPosition());
             
         }
         
-        if(this.injectionMember instanceof Constructor)
+        if(injectionMember instanceof Constructor)
         {
             out.writeByte(2);
-            Constructor<?> constr = (Constructor<?>)this.injectionMember;
+            Constructor<?> constr = (Constructor<?>) injectionMember;
             Class<?>[] parameters = constr.getParameterTypes();
             out.writeObject(parameters);
             
-            AnnotatedParameter<?> ap = (AnnotatedParameter<?>)this.annotated;
+            AnnotatedParameter<?> ap = (AnnotatedParameter<?>) annotated;
             out.writeByte(ap.getPosition());
             
         }
         
-        out.writeBoolean(this.delegate);
-        out.writeBoolean(this.transientt);
+        out.writeBoolean(delegate);
+        out.writeBoolean(transientt);
         out.flush();
         
     }
@@ -195,7 +192,7 @@ class InjectionPointImpl implements Inje
         
         protected Class<?> resolveClass(ObjectStreamClass desc) throws ClassNotFoundException
         {
-            return Class.forName(desc.getName(), false, this.classLoader);
+            return Class.forName(desc.getName(), false, classLoader);
         }
     }
 
@@ -210,15 +207,15 @@ class InjectionPointImpl implements Inje
         WebBeansContext webBeansContext = WebBeansContext.currentInstance();
         AnnotatedElementFactory annotatedElementFactory = webBeansContext.getAnnotatedElementFactory();
 
-        while(!in.readObject().equals(Character.valueOf('~')))   // read throw-away '-' or '~' terminal delimiter.
+        while(!in.readObject().equals('~'))   // read throw-away '-' or '~' terminal delimiter.
         {
             Annotation ann = (Annotation) in.readObject();  // now read the annotation.
             anns.add(ann);
         }
         
         //process annotations
-        this.ownerBean = webBeansContext.getBeanManagerImpl().getBeans(beanClass, anns.toArray(new Annotation[anns.size()])).iterator().next();
-        this.qualifierAnnotations = anns;
+        ownerBean = webBeansContext.getBeanManagerImpl().getBeans(beanClass, anns.toArray(new Annotation[anns.size()])).iterator().next();
+        qualifierAnnotations = anns;
         
         // determine type of injection point member (0=field, 1=method, 2=constructor) and read...
         int c = in.readByte();
@@ -226,12 +223,12 @@ class InjectionPointImpl implements Inje
         {
             String fieldName = in.readUTF();
             Field field = webBeansContext.getSecurityService().doPrivilegedGetDeclaredField(beanClass, fieldName);
-            
-            this.injectionMember = field;
+
+            injectionMember = field;
             
             AnnotatedType<?> annotatedType = annotatedElementFactory.newAnnotatedType(beanClass);
-            this.annotated = annotatedElementFactory.newAnnotatedField(field, annotatedType);
-            this.injectionType = field.getGenericType();
+            annotated = annotatedElementFactory.newAnnotatedField(field, annotatedType);
+            injectionType = field.getGenericType();
             
         }
         else if(c == 1)
@@ -240,15 +237,15 @@ class InjectionPointImpl implements Inje
             Class<?>[] parameters = (Class<?>[])in.readObject();
             
             Method method = webBeansContext.getSecurityService().doPrivilegedGetDeclaredMethod(beanClass, methodName, parameters);
-            this.injectionMember = method;
+            injectionMember = method;
             
             AnnotatedType<?> annotatedType = annotatedElementFactory.newAnnotatedType(beanClass);
             AnnotatedMethod<Object> am =  (AnnotatedMethod<Object>)annotatedElementFactory.
-                                    newAnnotatedMethod((Method)this.injectionMember ,annotatedType);
+                                    newAnnotatedMethod((Method) injectionMember,annotatedType);
             List<AnnotatedParameter<Object>> annParameters = am.getParameters();
-            
-            this.annotated = annParameters.get(in.readByte());            
-            this.injectionType = this.annotated.getBaseType();
+
+            annotated = annParameters.get(in.readByte());
+            injectionType = annotated.getBaseType();
             
         }
         else if(c == 2)
@@ -256,49 +253,49 @@ class InjectionPointImpl implements Inje
             Class<?>[] parameters = (Class<?>[])in.readObject();            
             try
             {
-                this.injectionMember = beanClass.getConstructor(parameters);
+                injectionMember = beanClass.getConstructor(parameters);
 
             }
             catch(NoSuchMethodException e)
             {
-                this.injectionMember = null;
+                injectionMember = null;
             }
 
             AnnotatedType<Object> annotatedType = (AnnotatedType<Object>)annotatedElementFactory.newAnnotatedType(beanClass);
             AnnotatedConstructor<Object> am =  annotatedElementFactory
-                                            .newAnnotatedConstructor((Constructor<Object>)this.injectionMember,annotatedType);
+                                            .newAnnotatedConstructor((Constructor<Object>) injectionMember,annotatedType);
             List<AnnotatedParameter<Object>> annParameters = am.getParameters();
-            
-            this.annotated = annParameters.get(in.readByte());            
-            this.injectionType = this.annotated.getBaseType();
+
+            annotated = annParameters.get(in.readByte());
+            injectionType = annotated.getBaseType();
         }
-        
-        this.delegate = in.readBoolean();
-        this.transientt = in.readBoolean();
+
+        delegate = in.readBoolean();
+        transientt = in.readBoolean();
          
     }
 
 
     public String toString()
     {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         if(injectionMember instanceof Constructor)
         {
-            Constructor<?> constructor = (Constructor<?>) this.injectionMember;
+            Constructor<?> constructor = (Constructor<?>) injectionMember;
             buffer.append("Constructor Injection Point, constructor name :  " + constructor.getName() + ", Bean Owner : ["+ ownerBean.toString() + "]");
         }
         else if(injectionMember instanceof Method)
         {
-            Method method = (Method)this.injectionMember;
+            Method method = (Method) injectionMember;
             buffer.append("Method Injection Point, method name :  " + method.getName() + ", Bean Owner : ["+ ownerBean.toString() + "]");
             
         }
         else if(injectionMember instanceof Field)
         {
-            Field field = (Field) this.injectionMember;
+            Field field = (Field) injectionMember;
             buffer.append("Field Injection Point, field name :  " + field.getName() + ", Bean Owner : ["+ ownerBean.toString() + "]");            
         }
         
         return buffer.toString();
     }
-}
\ No newline at end of file
+}

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=1182780&r1=1182779&r2=1182780&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 Thu Oct 13 11:11:03 2011
@@ -91,12 +91,12 @@ class InstanceImpl<T> implements Instanc
     {
         T instance = null;
 
-        Annotation[] anns = new Annotation[this.qualifierAnnotations.size()];
-        anns = this.qualifierAnnotations.toArray(anns);
+        Annotation[] anns = new Annotation[qualifierAnnotations.size()];
+        anns = qualifierAnnotations.toArray(anns);
         
         Set<Bean<?>> beans = resolveBeans();
 
-        webBeansContext.getResolutionUtil().checkResolvedBeans(beans, ClassUtil.getClazz(this.injectionClazz), anns);
+        webBeansContext.getResolutionUtil().checkResolvedBeans(beans, ClassUtil.getClazz(injectionClazz), anns);
 
         Bean<?> bean = beans.iterator().next();
         instance = (T) webBeansContext.getBeanManagerImpl().getInstance(bean, null);
@@ -111,14 +111,14 @@ class InstanceImpl<T> implements Instanc
      */
     private Set<Bean<?>> resolveBeans()
     {
-        Annotation[] anns = new Annotation[this.qualifierAnnotations.size()];
-        anns = this.qualifierAnnotations.toArray(anns);
+        Annotation[] anns = new Annotation[qualifierAnnotations.size()];
+        anns = qualifierAnnotations.toArray(anns);
 
         InjectionResolver injectionResolver = webBeansContext.getBeanManagerImpl().getInjectionResolver();
 
         InjectionResolver resolver = injectionResolver;
         Set<Bean<?>> beans = resolver.implResolveByType(
-                this.injectionClazz,this.injectionPointClazz, anns);
+                injectionClazz, injectionPointClazz, anns);
         return beans;
     }
     
@@ -151,7 +151,7 @@ class InstanceImpl<T> implements Instanc
     public Instance<T> select(Annotation... qualifiers)
     {
         Annotation[] newQualifiersArray = getAdditionalQualifiers(qualifiers);
-        InstanceImpl<T> newInstance = new InstanceImpl<T>(this.injectionClazz, this.injectionPointClazz,
+        InstanceImpl<T> newInstance = new InstanceImpl<T>(injectionClazz, injectionPointClazz,
                                                           webBeansContext, newQualifiersArray);
 
         return newInstance;
@@ -166,7 +166,7 @@ class InstanceImpl<T> implements Instanc
     private Annotation[] getAdditionalQualifiers(Annotation[] qualifiers)
     {
         webBeansContext.getAnnotationManager().checkQualifierConditions(qualifiers);
-        Set<Annotation> newQualifiers = new HashSet<Annotation>(this.qualifierAnnotations);
+        Set<Annotation> newQualifiers = new HashSet<Annotation>(qualifierAnnotations);
 
         if (qualifiers != null && qualifiers.length > 0)
         {
@@ -174,7 +174,7 @@ class InstanceImpl<T> implements Instanc
             {
                 if (newQualifiers.contains(annot))
                 {
-                    throw new IllegalArgumentException("Duplicate Qualifier Exception, " + this.toString());
+                    throw new IllegalArgumentException("Duplicate Qualifier Exception, " + toString());
                 }
 
                 newQualifiers.add(annot);
@@ -199,12 +199,12 @@ class InstanceImpl<T> implements Instanc
         
         if(sub == null)
         {
-            sub = this.injectionClazz;
+            sub = injectionClazz;
         }
         
         Annotation[] newQualifiers = getAdditionalQualifiers(qualifiers);
         
-        InstanceImpl<U> newInstance = new InstanceImpl<U>(sub, this.injectionPointClazz, webBeansContext, newQualifiers);
+        InstanceImpl<U> newInstance = new InstanceImpl<U>(sub, injectionPointClazz, webBeansContext, newQualifiers);
                     
         return newInstance;
     }
@@ -239,20 +239,20 @@ class InstanceImpl<T> implements Instanc
     private void writeObject(java.io.ObjectOutputStream op) throws IOException
     {
         ObjectOutputStream oos = new ObjectOutputStream(op);
-        oos.writeObject(this.injectionClazz);
-        oos.writeObject(this.qualifierAnnotations);
-        oos.writeObject(this.injectionPointClazz);
+        oos.writeObject(injectionClazz);
+        oos.writeObject(qualifierAnnotations);
+        oos.writeObject(injectionPointClazz);
         
         oos.flush();
     }
     
     private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException
     {
-        this.webBeansContext = WebBeansContext.currentInstance();
+        webBeansContext = WebBeansContext.currentInstance();
         final ObjectInputStream inputStream = new OwbCustomObjectInputStream(in, WebBeansUtil.getCurrentClassLoader());
-        this.injectionClazz = (Type)inputStream.readObject();
-        this.qualifierAnnotations = (Set<Annotation>)inputStream.readObject();
-        this.injectionPointClazz = (Class<?>) inputStream.readObject();        
+        injectionClazz = (Type)inputStream.readObject();
+        qualifierAnnotations = (Set<Annotation>)inputStream.readObject();
+        injectionPointClazz = (Class<?>) inputStream.readObject();
     }
     
 
@@ -260,12 +260,12 @@ class InstanceImpl<T> implements Instanc
     {
         StringBuilder builder = new StringBuilder();
         builder.append("Instance<");
-        builder.append(ClassUtil.getClazz(this.injectionClazz).getName());
+        builder.append(ClassUtil.getClazz(injectionClazz).getName());
         builder.append("> injectionPointClazz=").append(injectionPointClazz);
         
         builder.append(",with qualifier annotations {");
         int i = 0;
-        for (Annotation qualifier : this.qualifierAnnotations)
+        for (Annotation qualifier : qualifierAnnotations)
         {
             if (i != 0)
             {
@@ -280,4 +280,4 @@ class InstanceImpl<T> implements Instanc
         return builder.toString();
     }
     
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java Thu Oct 13 11:11:03 2011
@@ -50,8 +50,8 @@ public class DependentScopedBeanIntercep
      */
     public DependentScopedBeanInterceptorHandler(OwbBean<?> bean, Object instance, CreationalContext<?> creationalContext)
     {
-        super(bean);        
-        this.actualInstance = instance;
+        super(bean);
+        actualInstance = instance;
         this.creationalContext = creationalContext;
         
         if(creationalContext instanceof CreationalContextImpl)
@@ -72,7 +72,7 @@ public class DependentScopedBeanIntercep
     @Override
     public Object invoke(Object instance, Method method, Method proceed, Object[] arguments) throws Exception
     {
-        return super.invoke(this.actualInstance, method, proceed, arguments, (CreationalContextImpl<?>)creationalContext);
+        return super.invoke(actualInstance, method, proceed, arguments, (CreationalContextImpl<?>)creationalContext);
     }
     
     /**
@@ -80,7 +80,7 @@ public class DependentScopedBeanIntercep
      */
     protected Object callAroundInvokes(Method proceed, Object[] arguments, List<InterceptorData> stack) throws Exception
     {
-        InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, this.bean, this.actualInstance ,proceed, arguments, stack, InterceptorType.AROUND_INVOKE);
+        InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, bean, actualInstance,proceed, arguments, stack, InterceptorType.AROUND_INVOKE);
         impl.setCreationalContext(creationalContext);
         
         return impl.proceed();

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java Thu Oct 13 11:11:03 2011
@@ -104,12 +104,12 @@ public class InterceptorDataImpl impleme
 
     public Class<?> getInterceptorClass()
     {
-        return this.interceptorClass;
+        return interceptorClass;
     }
 
     public void setInterceptorClass(Class<?> clazz)
     {
-        this.interceptorClass = clazz;
+        interceptorClass = clazz;
     }
 
     /*
@@ -165,7 +165,7 @@ public class InterceptorDataImpl impleme
      */
     public void setAroundInvoke(Method m)
     {
-        this.aroundInvoke = m;
+        aroundInvoke = m;
     }
 
     /*
@@ -176,7 +176,7 @@ public class InterceptorDataImpl impleme
      */
     public void setAroundTimeout(Method m)
     {
-        this.aroundTimeout = m;
+        aroundTimeout = m;
     }
     
     /*
@@ -187,7 +187,7 @@ public class InterceptorDataImpl impleme
      */
     protected void setPostConstruct(Method m)
     {
-        this.postConstruct = m;
+        postConstruct = m;
     }
 
     /*
@@ -198,7 +198,7 @@ public class InterceptorDataImpl impleme
      */
     protected void setPostActivate(Method m)
     {
-        this.postActivate = m;
+        postActivate = m;
     }
     
     /*
@@ -209,7 +209,7 @@ public class InterceptorDataImpl impleme
      */
     protected void setPreDestroy(Method m)
     {
-        this.preDestroy = m;
+        preDestroy = m;
     }
 
     /*
@@ -220,7 +220,7 @@ public class InterceptorDataImpl impleme
      */
     protected void setPrePassivate(Method m)
     {
-        this.prePassivate = m;
+        prePassivate = m;
     }
     
     /*
@@ -229,7 +229,7 @@ public class InterceptorDataImpl impleme
      */
     public Method getPostConstruct()
     {
-        return this.postConstruct;
+        return postConstruct;
     }
 
     /*
@@ -238,7 +238,7 @@ public class InterceptorDataImpl impleme
      */
     public Method getPostActivate()
     {
-        return this.postActivate;
+        return postActivate;
     }
     
     /*
@@ -247,7 +247,7 @@ public class InterceptorDataImpl impleme
      */
     public Method getPreDestroy()
     {
-        return this.preDestroy;
+        return preDestroy;
     }
 
     /*
@@ -256,7 +256,7 @@ public class InterceptorDataImpl impleme
      */
     public Method getPrePassivate()
     {
-        return this.prePassivate;
+        return prePassivate;
     }
     
     /*
@@ -265,7 +265,7 @@ public class InterceptorDataImpl impleme
      */
     public Method getAroundInvoke()
     {
-        return this.aroundInvoke;
+        return aroundInvoke;
     }
 
     /*
@@ -274,7 +274,7 @@ public class InterceptorDataImpl impleme
      */
     public Method getAroundTimeout()
     {
-        return this.aroundTimeout;
+        return aroundTimeout;
     }
     
     /*
@@ -397,7 +397,7 @@ public class InterceptorDataImpl impleme
     @Override
     public boolean isLifecycleInterceptor()
     {
-        if (this.preDestroy != null || this.postConstruct != null || this.prePassivate != null || this.postActivate != null)
+        if (preDestroy != null || postConstruct != null || prePassivate != null || postActivate != null)
         {
             return true;
         }
@@ -410,29 +410,29 @@ public class InterceptorDataImpl impleme
     public Object createNewInstance(Object ownerInstance, CreationalContextImpl<?> ownerCreationalContext)
     {
         // check for this InterceptorData is defined by interceptor class
-        if (this.isDefinedWithWebBeansInterceptor && this.definedInInterceptorClass)
+        if (isDefinedWithWebBeansInterceptor && definedInInterceptorClass)
         {
             Object interceptor;
 
             // Means that it is the last interceptor added by InterceptorHandler
-            if (this.webBeansInterceptor == null)
+            if (webBeansInterceptor == null)
             {
-                return this.decoratorInterceptor;
+                return decoratorInterceptor;
             }
 
-            interceptor = ownerCreationalContext.getDependentInterceptor(ownerInstance, this.webBeansInterceptor);
+            interceptor = ownerCreationalContext.getDependentInterceptor(ownerInstance, webBeansInterceptor);
             // There is no define interceptor, define and add it into dependent
             if (interceptor == null)
             {
                 BeanManagerImpl manager = webBeansContext.getBeanManagerImpl();
 
-                WebBeansInterceptor<Object> actualInterceptor = (WebBeansInterceptor<Object>) this.webBeansInterceptor;
+                WebBeansInterceptor<Object> actualInterceptor = (WebBeansInterceptor<Object>) webBeansInterceptor;
                 CreationalContext<Object> creationalContext = manager.createCreationalContext(actualInterceptor);
                 interceptor = manager.getReference(actualInterceptor, actualInterceptor.getBeanClass(), creationalContext);
 
                 actualInterceptor.setInjections(interceptor, creationalContext);
 
-                ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptor<Object>) this.webBeansInterceptor, interceptor);
+                ownerCreationalContext.addDependent(ownerInstance, (WebBeansInterceptor<Object>) webBeansInterceptor, interceptor);
             }
             return interceptor;
         }
@@ -440,12 +440,12 @@ public class InterceptorDataImpl impleme
         EjbInterceptorContext ctx ;
         Object interceptor = null;
         // control for this InterceptorData is defined by interceptor class
-        if (this.definedInInterceptorClass)
+        if (definedInInterceptorClass)
         {
-            ctx = ownerCreationalContext.getEjbInterceptor(ownerInstance, this.interceptorClass);
+            ctx = ownerCreationalContext.getEjbInterceptor(ownerInstance, interceptorClass);
             if (ctx == null)
             {
-                interceptor = webBeansContext.getWebBeansUtil().newInstanceForced(this.interceptorClass);
+                interceptor = webBeansContext.getWebBeansUtil().newInstanceForced(interceptorClass);
                 try
                 {
                     OWBInjector injector = new OWBInjector(webBeansContext);

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Thu Oct 13 11:11:03 2011
@@ -161,7 +161,7 @@ public abstract class InterceptorHandler
     protected InterceptorHandler(OwbBean<?> bean)
     {
         this.bean = bean;
-        this.webBeansContext = bean.getWebBeansContext();
+        webBeansContext = bean.getWebBeansContext();
     }
 
     /**
@@ -222,7 +222,7 @@ public abstract class InterceptorHandler
             if (!isNotInterceptedOrDecoratedMethod &&
                 !ClassUtil.isObjectMethod(methodName) && bean instanceof InjectionTargetBean<?>)
             {
-                InjectionTargetBean<?> injectionTarget = (InjectionTargetBean<?>) this.bean;
+                InjectionTargetBean<?> injectionTarget = (InjectionTargetBean<?>) bean;
                 DelegateHandler delegateHandler = null;
                 InterceptorDataImpl decoratorInterceptorDataImpl = null;
                 
@@ -240,7 +240,7 @@ public abstract class InterceptorHandler
                             webBeansContext.getJavassistProxyFactory().getInterceptorProxyClasses().put(bean, proxyClass);
                         }
                         Object delegate = proxyClass.newInstance();
-                        delegateHandler = new DelegateHandler(this.bean);
+                        delegateHandler = new DelegateHandler(bean);
                         ((ProxyObject)delegate).setHandler(delegateHandler);
 
                         // Gets component decorator stack
@@ -253,10 +253,10 @@ public abstract class InterceptorHandler
                     List<InterceptorData> interceptorStack = injectionTarget.getInterceptorStack();
                     if (!interceptorStack.isEmpty())
                     {
-                        if (this.interceptedMethodMap == null)
+                        if (interceptedMethodMap == null)
                         {
                             // lazy initialisation, because creating a WeakHashMap is expensive!
-                            this.interceptedMethodMap = new ConcurrentHashMap<Method, List<InterceptorData>>();
+                            interceptedMethodMap = new ConcurrentHashMap<Method, List<InterceptorData>>();
                         }
                         
                         if (decorators != null)
@@ -271,7 +271,7 @@ public abstract class InterceptorHandler
                                             new Class[] {InvocationContext.class}));
                         }
 
-                        List<InterceptorData> interceptorMethods = this.interceptedMethodMap.get(method);
+                        List<InterceptorData> interceptorMethods = interceptedMethodMap.get(method);
                         if (interceptorMethods == null)
                         {
                             //Holds filtered interceptor stack
@@ -288,7 +288,7 @@ public abstract class InterceptorHandler
                             InterceptorUtil interceptorUtil = webBeansContext.getInterceptorUtil();
                             interceptorUtil.filterCommonInterceptorStackList(filteredInterceptorStack, method);
                             interceptorUtil.filterOverridenAroundInvokeInterceptor(bean.getBeanClass(), filteredInterceptorStack);
-                            this.interceptedMethodMap.put(method, filteredInterceptorStack);
+                            interceptedMethodMap.put(method, filteredInterceptorStack);
                             interceptorMethods = filteredInterceptorStack;
                         }
                         
@@ -376,7 +376,7 @@ public abstract class InterceptorHandler
         s.writeLong(serialVersionUID);
         // we have to write the ids for all beans, not only PassivationCapable
         // since this gets serialized along with the Bean proxy.
-        String passivationId = this.bean.getId();
+        String passivationId = bean.getId();
         if (passivationId!= null)
         {
             s.writeObject(passivationId);
@@ -384,7 +384,7 @@ public abstract class InterceptorHandler
         else
         {
             s.writeObject(null);
-            logger.warn(OWBLogConst.WARN_0010, this.bean);
+            logger.warn(OWBLogConst.WARN_0010, bean);
         }
     }
     
@@ -398,16 +398,16 @@ public abstract class InterceptorHandler
     {
         if(s.readLong() == serialVersionUID)
         {
-            this.webBeansContext = WebBeansContext.currentInstance();
+            webBeansContext = WebBeansContext.currentInstance();
             String passivationId = (String) s.readObject();
             if (passivationId != null)
             {
-                this.bean = (OwbBean<?>) webBeansContext.getBeanManagerImpl().getPassivationCapableBean(passivationId);
+                bean = (OwbBean<?>) webBeansContext.getBeanManagerImpl().getPassivationCapableBean(passivationId);
             }
         }
         else
         {
-            logger.warn(OWBLogConst.WARN_0011, this.bean);
+            logger.warn(OWBLogConst.WARN_0011, bean);
         }
     }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java Thu Oct 13 11:11:03 2011
@@ -73,7 +73,7 @@ public final class InterceptorUtil
     public InterceptorUtil(WebBeansContext webBeansContext)
     {
         this.webBeansContext = webBeansContext;
-        this.ejbPlugin = webBeansContext.getPluginLoader().getEjbLCAPlugin();
+        ejbPlugin = webBeansContext.getPluginLoader().getEjbLCAPlugin();
         if (ejbPlugin != null)
         {
             prePassivateClass = ejbPlugin.getPrePassivateClass();

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java Thu Oct 13 11:11:03 2011
@@ -39,7 +39,7 @@ public class InterceptorsManager
     public InterceptorsManager(WebBeansContext webBeansContext)
     {
         this.webBeansContext = webBeansContext;
-        this.manager = webBeansContext.getBeanManagerImpl();
+        manager = webBeansContext.getBeanManagerImpl();
     }
 
     @Deprecated

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=1182780&r1=1182779&r2=1182780&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 Thu Oct 13 11:11:03 2011
@@ -86,10 +86,10 @@ public class InvocationContextImpl imple
                                  Object[] parameters, List<InterceptorData> datas, InterceptorType type)
     {
         this.webBeansContext = webBeansContext;
-        this.owbBean = bean;
+        owbBean = bean;
         this.method = method;
         this.parameters = parameters;
-        this.interceptorDatas = datas;
+        interceptorDatas = datas;
         this.type = type;
         
         if(instance == null)
@@ -98,7 +98,7 @@ public class InvocationContextImpl imple
         }
         else
         {
-            this.target = instance;
+            target = instance;
         }
     }
     
@@ -108,7 +108,7 @@ public class InvocationContextImpl imple
      */
     public void setCreationalContext(CreationalContext<?> ownerCreationalContext)
     {
-        this.creationalContext = ownerCreationalContext;
+        creationalContext = ownerCreationalContext;
     }
 
     /**
@@ -117,7 +117,7 @@ public class InvocationContextImpl imple
      */
     public void setEJBInvocationContext(InvocationContext c)
     {
-        this.ejbInvocationContext = c;
+        ejbInvocationContext = c;
     }
 
     
@@ -129,8 +129,8 @@ public class InvocationContextImpl imple
     private void configureTarget(OwbBean<?> bean)
     {
         Context webbeansContext = bean.getWebBeansContext().getBeanManagerImpl().getContext(bean.getScope());
-        
-        this.target = webbeansContext.get((Contextual<Object>)bean, (CreationalContext<Object>)this.creationalContext);        
+
+        target = webbeansContext.get((Contextual<Object>)bean, (CreationalContext<Object>) creationalContext);
         
     }
     
@@ -139,54 +139,54 @@ public class InvocationContextImpl imple
      */
     public Map<String, Object> getContextData()
     {
-        return this.contextData;
+        return contextData;
     }
-    
+
     /**
-     * {@inheritDoc}
-     */
+    * {@inheritDoc}
+    */
     public Method getMethod()
     {
-        return this.method;
+        return method;
     }
-    
+
     /**
-     * {@inheritDoc}
-     */
+    * {@inheritDoc}
+    */
     public Object[] getParameters()
     {
-        return this.parameters;
+        return parameters;
     }
-    
+
     /**
-     * {@inheritDoc}
-     */
+    * {@inheritDoc}
+    */
     public Object getTarget()
     {
-        return this.target;
+        return target;
     }
-    
+
     /**
-     * {@inheritDoc}
-     */
+    * {@inheritDoc}
+    */
     public Object proceed() throws Exception
     {
         try
         {
             if (type.equals(InterceptorType.AROUND_INVOKE))
             {
-                return proceedAroundInvokes(this.interceptorDatas);
+                return proceedAroundInvokes(interceptorDatas);
             }
             else if (type.equals(InterceptorType.AROUND_TIMEOUT))
             {
-                return proceedAroundTimeouts(this.interceptorDatas);
+                return proceedAroundTimeouts(interceptorDatas);
             }
-            return proceedCommonAnnots(this.interceptorDatas, this.type);
+            return proceedCommonAnnots(interceptorDatas, type);
 
         }
         catch (InvocationTargetException ite)
         {
-            this.target = null; // destroy target instance
+            target = null; // destroy target instance
             
             // Try to provide the original exception to the interceptor stack, 
             // not the InvocationTargetException from Method.invoke
@@ -199,7 +199,7 @@ public class InvocationContextImpl imple
         }
         catch (Exception e)
         {
-            this.target = null; // destroy target instance
+            target = null; // destroy target instance
 
             throw e;
         }
@@ -226,9 +226,9 @@ public class InvocationContextImpl imple
                 owbBean.getWebBeansContext().getSecurityService().doPrivilegedSetAccessible(aroundInvokeMethod, true);
             }
             
-            Object t = intc.createNewInstance(this.ccKey != null ? this.ccKey : this.target,
-                    (CreationalContextImpl<?>)this.creationalContext);     
-            
+            Object t = intc.createNewInstance(ccKey != null ? ccKey : target,
+                    (CreationalContextImpl<?>) creationalContext);
+
             if (t == null)
             {
                 t = target;
@@ -241,18 +241,18 @@ public class InvocationContextImpl imple
         }
         else
         {
-            if(!(this.owbBean instanceof EnterpriseBeanMarker))
+            if(!(owbBean instanceof EnterpriseBeanMarker))
             {
-                if(!this.method.isAccessible())
+                if(!method.isAccessible())
                 {                
                     owbBean.getWebBeansContext().getSecurityService().doPrivilegedSetAccessible(method, true);
                 }
                 
-                result = this.method.invoke(target, parameters);
+                result = method.invoke(target, parameters);
             }
             else 
             { 
-                if (this.ejbInvocationContext != null)
+                if (ejbInvocationContext != null)
                 {
                     result = ejbInvocationContext.proceed();
                 }
@@ -283,9 +283,9 @@ public class InvocationContextImpl imple
                 owbBean.getWebBeansContext().getSecurityService().doPrivilegedSetAccessible(aroundTimeoutMethod, true);
             }
             
-            Object t = intc.createNewInstance(this.ccKey != null ? this.ccKey : this.target,
-                    (CreationalContextImpl<?>)this.creationalContext);      
-            
+            Object t = intc.createNewInstance(ccKey != null ? ccKey : target,
+                    (CreationalContextImpl<?>) creationalContext);
+
             if (t == null)
             {
                 t = target;
@@ -297,18 +297,18 @@ public class InvocationContextImpl imple
         }
         else
         {
-            if(!(this.owbBean instanceof EnterpriseBeanMarker))
+            if(!(owbBean instanceof EnterpriseBeanMarker))
             {
                 if(!method.isAccessible())
                 {                
                     owbBean.getWebBeansContext().getSecurityService().doPrivilegedSetAccessible(method, true);
                 }
                 
-                result = this.method.invoke(target, parameters);
-            }
-            else 
+                result = method.invoke(target, parameters);
+            } 
+            else
             { 
-                if (this.ejbInvocationContext != null)
+                if (ejbInvocationContext != null)
                 {
                     result = ejbInvocationContext.proceed();
                 }
@@ -368,13 +368,13 @@ public class InvocationContextImpl imple
 
             currentMethod++;
 
-            Object t = intc.createNewInstance(this.ccKey != null ? this.ccKey : this.target,
-                    (CreationalContextImpl<?>)this.creationalContext);      
-            
+            Object t = intc.createNewInstance(ccKey != null ? ccKey : target,
+                    (CreationalContextImpl<?>) creationalContext);
+
             //In bean class
             if (t == null)
             {
-                if(!(this.owbBean instanceof EnterpriseBeanMarker))
+                if(!(owbBean instanceof EnterpriseBeanMarker))
                 {
                     t = target;                
                     result = commonAnnMethod.invoke(t, new Object[] {});
@@ -395,7 +395,7 @@ public class InvocationContextImpl imple
             /* For EJB's, we do not call the "in bean class" interceptors --the container does, and only if
              * our last 299 interceptor called proceed (which takes us here).
              */
-            if ((this.owbBean instanceof EnterpriseBeanMarker) && (this.ejbInvocationContext != null))
+            if ((owbBean instanceof EnterpriseBeanMarker) && (ejbInvocationContext != null))
             {
                 result = ejbInvocationContext.proceed();
             }
@@ -412,20 +412,20 @@ public class InvocationContextImpl imple
         {
             if (params == null)
             {
-                if (this.parameters.length >= 0)
+                if (parameters.length >= 0)
                 {
                     throw new IllegalArgumentException("Gvien parameters is null but expected not null parameters");
                 }
             }
             else
             {
-                if (params.length != this.parameters.length)
+                if (params.length != parameters.length)
                 {
-                    throw new IllegalArgumentException("Expected " + this.parameters.length + " " +
+                    throw new IllegalArgumentException("Expected " + parameters.length + " " +
                             "parameters, but only got " + params.length + " parameters");
                 }
 
-                Class<?>[] methodParameters = this.method.getParameterTypes();
+                Class<?>[] methodParameters = method.getParameterTypes();
                 int i = 0;
                 for (Object obj : params)
                 {
@@ -456,7 +456,7 @@ public class InvocationContextImpl imple
                     }
                 }
 
-                System.arraycopy(params, 0, this.parameters, 0, params.length);
+                System.arraycopy(params, 0, parameters, 0, params.length);
 
             }
 
@@ -483,4 +483,4 @@ public class InvocationContextImpl imple
     {
         this.ccKey = ccKey;
     }
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/NormalScopedBeanInterceptorHandler.java Thu Oct 13 11:11:03 2011
@@ -127,7 +127,7 @@ public class NormalScopedBeanInterceptor
      */
     protected Object callAroundInvokes(Method proceed, Object[] arguments, List<InterceptorData> stack) throws Exception
     {
-        InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, this.bean, getContextualInstance(),
+        InvocationContextImpl impl = new InvocationContextImpl(webBeansContext, bean, getContextualInstance(),
                                                                proceed, arguments, stack, InterceptorType.AROUND_INVOKE);
         impl.setCreationalContext(getContextualCreationalContext());
 
@@ -145,10 +145,10 @@ public class NormalScopedBeanInterceptor
         Object webbeansInstance;
 
         //Context of the bean
-        Context webbeansContext = getBeanManager().getContext(this.bean.getScope());
+        Context webbeansContext = getBeanManager().getContext(bean.getScope());
         
         //Already saved in context?
-        webbeansInstance = webbeansContext.get(this.bean);
+        webbeansInstance = webbeansContext.get(bean);
         if (webbeansInstance != null)
         {
             // voila, we are finished if we found an existing contextual instance
@@ -156,7 +156,7 @@ public class NormalScopedBeanInterceptor
         }
 
         // finally, we create a new contextual instance
-        webbeansInstance = webbeansContext.get((Contextual<Object>)this.bean, getContextualCreationalContext());
+        webbeansInstance = webbeansContext.get((Contextual<Object>) bean, getContextualCreationalContext());
 
         if (webbeansInstance == null)
         {
@@ -169,7 +169,7 @@ public class NormalScopedBeanInterceptor
     {
         CreationalContext<Object> creationalContext = null;
         
-        OwbBean<Object> contextual = (OwbBean<Object>)this.bean;
+        OwbBean<Object> contextual = (OwbBean<Object>) bean;
         //Context of the bean
         Context webbeansContext = getBeanManager().getContext(bean.getScope());
         CreationalContextFactory contextFactory = bean.getWebBeansContext().getCreationalContextFactory();
@@ -186,7 +186,7 @@ public class NormalScopedBeanInterceptor
             if(creationalContext == null)
             {
                 creationalContext = contextFactory.getCreationalContext(contextual);
-                owbContext.initContextualBag((OwbBean<Object>)this.bean, creationalContext);
+                owbContext.initContextualBag((OwbBean<Object>) bean, creationalContext);
             }
         }
 

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java Thu Oct 13 11:11:03 2011
@@ -83,19 +83,19 @@ public class WebBeansInterceptor<T> exte
         super(WebBeansType.INTERCEPTOR,delegateBean.getReturnType(), delegateBean.getWebBeansContext());
         
         this.delegateBean = delegateBean;
-        this.clazz = getDelegate().getReturnType();
+        clazz = getDelegate().getReturnType();
 
         webBeansContext = delegateBean.getWebBeansContext();
     }
 
     public AbstractOwbBean<T> getDelegate()
     {
-        return this.delegateBean;
+        return delegateBean;
     }
     
     public AnnotatedType<T> getAnnotatedType()
     {
-        return this.delegateBean.getAnnotatedType();
+        return delegateBean.getAnnotatedType();
     }
     
 
@@ -247,12 +247,12 @@ public class WebBeansInterceptor<T> exte
     public Set<Annotation> getInterceptorBindings()
     {
         Set<Annotation> set = new HashSet<Annotation>();
-        Set<Class<? extends Annotation>> keySet = this.interceptorBindingSet.keySet();
+        Set<Class<? extends Annotation>> keySet = interceptorBindingSet.keySet();
         Iterator<Class<? extends Annotation>> itSet = keySet.iterator();
 
         while (itSet.hasNext())
         {
-            set.add(this.interceptorBindingSet.get(itSet.next()));
+            set.add(interceptorBindingSet.get(itSet.next()));
         }
 
         return set;
@@ -289,8 +289,8 @@ public class WebBeansInterceptor<T> exte
     protected T createInstance(CreationalContext<T> creationalContext)
     {
         Context context = webBeansContext.getBeanManagerImpl().getContext(getScope());
-        Object actualInstance = context.get((Bean<Object>)this.delegateBean, (CreationalContext<Object>)creationalContext);
-        T proxy = (T) webBeansContext.getJavassistProxyFactory().createDependentScopedBeanProxy(this.delegateBean, actualInstance, creationalContext);
+        Object actualInstance = context.get((Bean<Object>) delegateBean, (CreationalContext<Object>)creationalContext);
+        T proxy = (T) webBeansContext.getJavassistProxyFactory().createDependentScopedBeanProxy(delegateBean, actualInstance, creationalContext);
         
         return proxy;
     }
@@ -298,7 +298,7 @@ public class WebBeansInterceptor<T> exte
     public void setInjections(Object proxy, CreationalContext<?> creationalContext)
     {
         // Set injected fields
-        ManagedBean<T> delegate = (ManagedBean<T>) this.delegateBean;
+        ManagedBean<T> delegate = (ManagedBean<T>) delegateBean;
 
         Set<Field> injectedFields = delegate.getInjectedFromSuperFields();
         for (Field injectedField : injectedFields)
@@ -328,14 +328,14 @@ public class WebBeansInterceptor<T> exte
     
     private void injectField(Field field, Object instance, CreationalContext<?> creationalContext)
     {
-        InjectableField f = new InjectableField(field, instance, this.delegateBean, creationalContext);
+        InjectableField f = new InjectableField(field, instance, delegateBean, creationalContext);
         f.doInjection();        
     }
 
     @SuppressWarnings("unchecked")
     private void injectMethod(Method method, Object instance, CreationalContext<?> creationalContext)
     {
-        InjectableMethods m = new InjectableMethods(method, instance, this.delegateBean, creationalContext);
+        InjectableMethods m = new InjectableMethods(method, instance, delegateBean, creationalContext);
         m.doInjection();        
     }
     
@@ -374,7 +374,7 @@ public class WebBeansInterceptor<T> exte
     @Override
     public String toString()
     {
-        return "WebBeans Interceptor with class : " + "[" + this.clazz.getName() + "]";
+        return "WebBeans Interceptor with class : " + "[" + clazz.getName() + "]";
     }
 
     @Override
@@ -392,13 +392,13 @@ public class WebBeansInterceptor<T> exte
     @Override
     public Class<?> getBeanClass()
     {
-        return this.delegateBean.getBeanClass();
+        return delegateBean.getBeanClass();
     }
 
     @Override
     public Set<Class<? extends Annotation>> getStereotypes()
     {
-        return this.delegateBean.getStereotypes();
+        return delegateBean.getStereotypes();
     }
 
     @Override
@@ -429,19 +429,19 @@ public class WebBeansInterceptor<T> exte
     @Override
     public boolean isAlternative()
     {
-        return this.delegateBean.isAlternative();
+        return delegateBean.isAlternative();
     }
     
     @Override
     public boolean isPassivationCapable()
     {
-        return this.delegateBean.isPassivationCapable();
+        return delegateBean.isPassivationCapable();
     }
 
     @Override
     public void validatePassivationDependencies()
     {
-        this.delegateBean.validatePassivationDependencies();
+        delegateBean.validatePassivationDependencies();
     }    
     
     

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSManager.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSManager.java Thu Oct 13 11:11:03 2011
@@ -39,7 +39,7 @@ public class JMSManager
     
     public void clear()
     {
-        this.jmsModels.clear();
+        jmsModels.clear();
     }
 
     @Deprecated
@@ -51,13 +51,13 @@ public class JMSManager
     public void addJmsModel(JMSModel model)
     {
         Asserts.assertNotNull(model,"model parameter can not be null");
-        
-        this.jmsModels.add(model);
+
+        jmsModels.add(model);
     }
     
     public JMSModel getModel(JMSType type, Annotation...bindingTypes)
     {
-        Iterator<JMSModel> models = this.jmsModels.iterator();
+        Iterator<JMSModel> models = jmsModels.iterator();
         
         while(models.hasNext())
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jms/JMSModel.java Thu Oct 13 11:11:03 2011
@@ -44,7 +44,7 @@ public class JMSModel
         if(jndiName != null)
         {
             this.jndiName = jndiName;
-            this.isJndiNameDefined = true;
+            isJndiNameDefined = true;
         }
         
         this.mappedName = mappedName;
@@ -52,7 +52,7 @@ public class JMSModel
 
     public void addBinding(Annotation annotation)
     {
-        this.bindings.add(annotation);
+        bindings.add(annotation);
     }
     
     public Annotation[] getBindings()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/AbstractLifeCycle.java Thu Oct 13 11:11:03 2011
@@ -78,13 +78,13 @@ public abstract class AbstractLifeCycle 
         beforeInitApplication(properties);
 
         this.webBeansContext = webBeansContext;
-        this.beanManager = this.webBeansContext.getBeanManagerImpl();
-        this.xmlDeployer = new WebBeansXMLConfigurator();
-        this.deployer = new BeansDeployer(xmlDeployer, this.webBeansContext);
-        this.jndiService = this.webBeansContext.getService(JNDIService.class);
-        this.beanManager.setXMLConfigurator(this.xmlDeployer);
-        this.scannerService = this.webBeansContext.getScannerService();
-        this.contextsService = this.webBeansContext.getService(ContextsService.class);
+        beanManager = this.webBeansContext.getBeanManagerImpl();
+        xmlDeployer = new WebBeansXMLConfigurator();
+        deployer = new BeansDeployer(xmlDeployer, this.webBeansContext);
+        jndiService = this.webBeansContext.getService(JNDIService.class);
+        beanManager.setXMLConfigurator(xmlDeployer);
+        scannerService = this.webBeansContext.getScannerService();
+        contextsService = this.webBeansContext.getService(ContextsService.class);
         initApplication(properties);
     }
 
@@ -95,7 +95,7 @@ public abstract class AbstractLifeCycle 
 
     public BeanManager getBeanManager()
     {        
-        return this.beanManager;
+        return beanManager;
     }
     
     public void startApplication(Object startupObject)
@@ -112,19 +112,19 @@ public abstract class AbstractLifeCycle 
         webBeansContext.getPluginLoader().startUp();
         
         //Initialize contexts
-        this.contextsService.init(startupObject);
+        contextsService.init(startupObject);
         
         //Scanning process
         logger.debug("Scanning classpaths for beans artifacts.");
 
         //Scan
-        this.scannerService.scan();
+        scannerService.scan();
         
         //Deploy beans
         logger.debug("Deploying scanned beans.");
 
         //Deploy
-        deployer.deploy(this.scannerService);
+        deployer.deploy(scannerService);
 
         //Start actual starting on sub-classes
         afterStartApplication(startupObject);
@@ -142,13 +142,13 @@ public abstract class AbstractLifeCycle 
             beforeStopApplication(endObject);
 
             //Set up the thread local for Application scoped as listeners will be App scoped.
-            this.contextsService.startContext(ApplicationScoped.class, endObject);
+            contextsService.startContext(ApplicationScoped.class, endObject);
             
             //Fire shut down
-            this.beanManager.fireEvent(new BeforeShutdownImpl() );
+            beanManager.fireEvent(new BeforeShutdownImpl());
             
             //Destroys context
-            this.contextsService.destroy(endObject);
+            contextsService.destroy(endObject);
             
             //Unbind BeanManager
             jndiService.unbind(WebBeansConstants.WEB_BEANS_MANAGER_JNDI_NAME);
@@ -177,7 +177,7 @@ public abstract class AbstractLifeCycle 
             afterStopApplication(endObject);
 
             // Clear BeanManager
-            this.beanManager.clear();
+            beanManager.clear();
 
             // Clear singleton list
             WebBeansFinder.clearInstances(WebBeansUtil.getCurrentClassLoader());

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/test/OpenWebBeansTestMetaDataDiscoveryService.java Thu Oct 13 11:11:03 2011
@@ -97,7 +97,7 @@ public class OpenWebBeansTestMetaDataDis
         
         try
         {
-            this.getAnnotationDB().scanClass(url.openStream());
+            getAnnotationDB().scanClass(url.openStream());
         }
         catch (IOException e)
         {

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java Thu Oct 13 11:11:03 2011
@@ -107,7 +107,7 @@ public final class WebBeansLogger implem
     {
         if (logger.isLoggable(level))
         {
-            logger.logp(level, this.caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), messageKey);
+            logger.logp(level, caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), messageKey);
         }
     }
 
@@ -115,7 +115,7 @@ public final class WebBeansLogger implem
     {
         if (logger.isLoggable(level))
         {
-            logger.logp(level, this.caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), messageKey, args);
+            logger.logp(level, caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), messageKey, args);
         }
     }
 
@@ -123,7 +123,7 @@ public final class WebBeansLogger implem
     {
         if (logger.isLoggable(level))
         {
-            logger.logp(level, this.caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), messageKey, e);
+            logger.logp(level, caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), messageKey, e);
         }
     }
 
@@ -131,114 +131,114 @@ public final class WebBeansLogger implem
     {
         if (logger.isLoggable(level))
         {
-            logger.logp(level, this.caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), constructMessage(messageKey, args), e);
+            logger.logp(level, caller.getName(), Thread.currentThread().getStackTrace()[3].getMethodName(), constructMessage(messageKey, args), e);
         }
     }
     
     public void fatal(String messageKey)
     {
-        this.wblLog(WebBeansLogger.WBL_FATAL, messageKey);
+        wblLog(WebBeansLogger.WBL_FATAL, messageKey);
     }
 
     public void fatal(String messageKey, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_FATAL, messageKey, args);
+        wblLog(WebBeansLogger.WBL_FATAL, messageKey, args);
     }
 
     public void fatal(Throwable e, String messageKey)
     {
-        this.wblLog(WebBeansLogger.WBL_FATAL, e, messageKey);
+        wblLog(WebBeansLogger.WBL_FATAL, e, messageKey);
     }
 
     public void fatal(Throwable e, String messageKey, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_FATAL, e, messageKey, args);
+        wblLog(WebBeansLogger.WBL_FATAL, e, messageKey, args);
     }
 
 
     public void error(Throwable e)
     {
-        this.wblLog(WebBeansLogger.WBL_ERROR, e, "");
+        wblLog(WebBeansLogger.WBL_ERROR, e, "");
     }
 
     public void error(String messageKey)
     {
-        this.wblLog(WebBeansLogger.WBL_ERROR, messageKey);
+        wblLog(WebBeansLogger.WBL_ERROR, messageKey);
     }
 
     public void error(String messageKey, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_ERROR, messageKey, args);
+        wblLog(WebBeansLogger.WBL_ERROR, messageKey, args);
     }
     
     public void error(String messageKey, Throwable e)
     {
-        this.wblLog(WebBeansLogger.WBL_ERROR, e, messageKey);
+        wblLog(WebBeansLogger.WBL_ERROR, e, messageKey);
     }
 
     public void error(String messageKey, Throwable e, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_ERROR, e, messageKey, args);
+        wblLog(WebBeansLogger.WBL_ERROR, e, messageKey, args);
     }
 
     public void warn(String messageKey)
     {
-        this.wblLog(WebBeansLogger.WBL_WARN, messageKey);
+        wblLog(WebBeansLogger.WBL_WARN, messageKey);
     }
 
     public void warn(String messageKey, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_WARN, messageKey, args);
+        wblLog(WebBeansLogger.WBL_WARN, messageKey, args);
     }
 
     public void warn(String messageKey, Throwable e)
     {
-        this.wblLog(WebBeansLogger.WBL_WARN, e, messageKey);
+        wblLog(WebBeansLogger.WBL_WARN, e, messageKey);
     }
 
     public void info(String messageKey)
     {
-        this.wblLog(WebBeansLogger.WBL_INFO, messageKey);
+        wblLog(WebBeansLogger.WBL_INFO, messageKey);
     }
 
     public void info(String messageKey, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_INFO, messageKey, args);
+        wblLog(WebBeansLogger.WBL_INFO, messageKey, args);
     }
     
     public void info(String messageKey, Throwable e)
     {
-        this.wblLog(WebBeansLogger.WBL_INFO, e, messageKey);
+        wblLog(WebBeansLogger.WBL_INFO, e, messageKey);
     }
 
     public void debug(String messageKey)
     {
-        this.wblLog(WebBeansLogger.WBL_DEBUG, messageKey);
+        wblLog(WebBeansLogger.WBL_DEBUG, messageKey);
     }
 
     public void debug(String messageKey, Throwable e)
     {
-        this.wblLog(WebBeansLogger.WBL_DEBUG, e, messageKey);
+        wblLog(WebBeansLogger.WBL_DEBUG, e, messageKey);
     }
 
     public void debug(String messageKey, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_DEBUG, messageKey, args);
+        wblLog(WebBeansLogger.WBL_DEBUG, messageKey, args);
     }
 
     public void trace(String messageKey)
     {
-        this.wblLog(WebBeansLogger.WBL_TRACE, messageKey);
+        wblLog(WebBeansLogger.WBL_TRACE, messageKey);
     }
 
     public void trace(String messageKey, Object... args)
     {
-        this.wblLog(WebBeansLogger.WBL_TRACE, messageKey, args);
+        wblLog(WebBeansLogger.WBL_TRACE, messageKey, args);
     }
 
     public void trace(String messageKey, Throwable e)
     {
-        this.wblLog(WebBeansLogger.WBL_TRACE, e, messageKey);
+        wblLog(WebBeansLogger.WBL_TRACE, e, messageKey);
     }
 
     private String constructMessage(String messageKey, Object... args)
@@ -256,7 +256,7 @@ public final class WebBeansLogger implem
     {
         String strVal = null;
 
-        if (this.wbBundle == null)
+        if (wbBundle == null)
         {
             throw new NullPointerException("ResourceBundle can not be null");
         }
@@ -338,6 +338,6 @@ public final class WebBeansLogger implem
         {
             inLogger = Logger.getLogger(caller.getName(), ResourceBundle.getBundle("openwebbeans/Messages", locale).toString());
         }
-        this.setLogger(inLogger);
+        setLogger(inLogger);
     }
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java Thu Oct 13 11:11:03 2011
@@ -74,7 +74,7 @@ public class PluginLoader
      */
     public void startUp() throws WebBeansConfigurationException
     {
-        if(this.started.compareAndSet(false, true))
+        if(started.compareAndSet(false, true))
         {
             logger.debug("PluginLoader startUp called.");
             ArrayList<OpenWebBeansPlugin> ps = new ArrayList<OpenWebBeansPlugin>();
@@ -125,7 +125,7 @@ public class PluginLoader
      */
     public void shutDown() throws WebBeansConfigurationException
     {
-        if(this.started.compareAndSet(true, false))
+        if(started.compareAndSet(true, false))
         {
             logger.debug("PluginLoader shutDown called.");
             
@@ -183,7 +183,7 @@ public class PluginLoader
             return null;
         }
         
-        for(OpenWebBeansPlugin plugin : this.plugins)
+        for(OpenWebBeansPlugin plugin : plugins)
         {
             if(plugin instanceof OpenWebBeansEjbPlugin)
             {
@@ -206,7 +206,7 @@ public class PluginLoader
             return null;
         }
         
-        for(OpenWebBeansPlugin plugin : this.plugins)
+        for(OpenWebBeansPlugin plugin : plugins)
         {
             if(plugin instanceof OpenWebBeansEjbLCAPlugin)
             {
@@ -228,7 +228,7 @@ public class PluginLoader
             return null;
         }
         
-        for(OpenWebBeansPlugin plugin : this.plugins)
+        for(OpenWebBeansPlugin plugin : plugins)
         {
             if(plugin instanceof OpenWebBeansJmsPlugin)
             {
@@ -247,7 +247,7 @@ public class PluginLoader
             return null;
         }
         
-        for(OpenWebBeansPlugin plugin : this.plugins)
+        for(OpenWebBeansPlugin plugin : plugins)
         {
             if(plugin instanceof OpenWebBeansJavaEEPlugin)
             {
@@ -265,7 +265,7 @@ public class PluginLoader
             return null;
         }
         
-        for(OpenWebBeansPlugin plugin : this.plugins)
+        for(OpenWebBeansPlugin plugin : plugins)
         {
             if(plugin instanceof OpenWebBeansWebPlugin)
             {
@@ -278,7 +278,7 @@ public class PluginLoader
     
     private boolean pluginsExist()
     {
-        if(this.plugins == null)
+        if(plugins == null)
         {
             return false;
         }
@@ -288,6 +288,6 @@ public class PluginLoader
     
     public boolean isShowDown()
     {
-        return !this.started.get();
+        return !started.get();
     }
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java Thu Oct 13 11:11:03 2011
@@ -77,7 +77,7 @@ abstract class AbstractAnnotated impleme
      */
     protected void addAnnotation(Annotation annotation)
     {
-        this.annotations.add(annotation);
+        annotations.add(annotation);
     }
 
     protected WebBeansContext getWebBeansContext()
@@ -106,7 +106,7 @@ abstract class AbstractAnnotated impleme
     @SuppressWarnings("unchecked")
     public <T extends Annotation> T getAnnotation(Class<T> annotationType)
     {
-        for(Annotation ann : this.annotations)
+        for(Annotation ann : annotations)
         {
             if(ann.annotationType().equals(annotationType))
             {
@@ -124,7 +124,7 @@ abstract class AbstractAnnotated impleme
     @Override
     public Set<Annotation> getAnnotations()
     {
-        return this.annotations;
+        return annotations;
     }
 
     /**
@@ -133,7 +133,7 @@ abstract class AbstractAnnotated impleme
     @Override
     public Type getBaseType()
     {
-        return this.baseType;
+        return baseType;
     }
 
     /**
@@ -154,10 +154,10 @@ abstract class AbstractAnnotated impleme
         if (typeClosures == null)
         {
             typeClosures = new HashSet<Type>();
-            this.typeClosures.add(Object.class);
-            ClassUtil.setTypeHierarchy(this.typeClosures, this.baseType);
+            typeClosures.add(Object.class);
+            ClassUtil.setTypeHierarchy(typeClosures, baseType);
             Set<String> ignoredInterfaces = webBeansContext.getOpenWebBeansConfiguration().getIgnoredInterfaces();
-            for (Iterator<Type> i = this.typeClosures.iterator(); i.hasNext(); )
+            for (Iterator<Type> i = typeClosures.iterator(); i.hasNext(); )
             {
                 Type t = i.next();
                 if (t instanceof Class && ignoredInterfaces.contains(((Class<?>)t).getName()))
@@ -210,7 +210,7 @@ abstract class AbstractAnnotated impleme
     @Override
     public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
     {
-        for(Annotation ann : this.annotations)
+        for(Annotation ann : annotations)
         {
             if(ann.annotationType().equals(annotationType))
             {
@@ -232,4 +232,4 @@ abstract class AbstractAnnotated impleme
         return builder.toString();
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java Thu Oct 13 11:11:03 2011
@@ -69,7 +69,7 @@ abstract class AbstractAnnotatedCallable
      */
     void addAnnotatedParameter(AnnotatedParameter<X> parameter)
     {
-        this.annotatedParameters.add(parameter);
+        annotatedParameters.add(parameter);
     }
     
     /**
@@ -78,7 +78,7 @@ abstract class AbstractAnnotatedCallable
     @Override
     public List<AnnotatedParameter<X>> getParameters()
     {
-        return this.annotatedParameters;
+        return annotatedParameters;
     }
     
     public String toString()
@@ -94,4 +94,4 @@ abstract class AbstractAnnotatedCallable
         
         return builder.toString();
     }
- }
\ No newline at end of file
+ }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java Thu Oct 13 11:11:03 2011
@@ -87,7 +87,7 @@ abstract class AbstractAnnotatedMember<X
     @Override
     public AnnotatedType<X> getDeclaringType()
     {
-        return this.declaringType;
+        return declaringType;
     }
 
     /**
@@ -96,7 +96,7 @@ abstract class AbstractAnnotatedMember<X
     @Override
     public Member getJavaMember()
     {
-        return this.javaMember;
+        return javaMember;
     }
 
     /**
@@ -105,15 +105,15 @@ abstract class AbstractAnnotatedMember<X
     @Override
     public boolean isStatic()
     {
-        return Modifier.isStatic(this.javaMember.getModifiers());
+        return Modifier.isStatic(javaMember.getModifiers());
     }
 
     public String toString()
     {
         StringBuilder builder = new StringBuilder(super.toString());
         builder.append(",");
-        builder.append("Java Member Name : " + this.javaMember.getName());
+        builder.append("Java Member Name : " + javaMember.getName());
         
         return builder.toString();
     }
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedConstructorImpl.java Thu Oct 13 11:11:03 2011
@@ -53,7 +53,7 @@ class AnnotatedConstructorImpl<X> extend
     @SuppressWarnings("unchecked")
     public Constructor<X> getJavaMember()
     {
-        return Constructor.class.cast(this.javaMember);
+        return Constructor.class.cast(javaMember);
     }
     
     public String toString()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedFieldImpl.java Thu Oct 13 11:11:03 2011
@@ -54,7 +54,7 @@ public class AnnotatedFieldImpl<X> exten
      */
     public Field getJavaMember()
     {
-        return Field.class.cast(this.javaMember);
+        return Field.class.cast(javaMember);
     }
     
     public String toString()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedMethodImpl.java Thu Oct 13 11:11:03 2011
@@ -54,7 +54,7 @@ class AnnotatedMethodImpl<X> extends Abs
      */
     public Method getJavaMember()
     {
-        return Method.class.cast(this.javaMember);
+        return Method.class.cast(javaMember);
     }
     
     public String toString()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java Thu Oct 13 11:11:03 2011
@@ -53,7 +53,7 @@ class AnnotatedParameterImpl<X> extends 
     @Override
     public AnnotatedCallable<X> getDeclaringCallable()
     {
-        return this.declaringCallable;
+        return declaringCallable;
     }
 
     /**
@@ -62,7 +62,7 @@ class AnnotatedParameterImpl<X> extends 
     @Override
     public int getPosition()
     {
-        return this.position;
+        return position;
     }
 
     public String toString()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java Thu Oct 13 11:11:03 2011
@@ -112,7 +112,7 @@ class AnnotatedTypeImpl<X> extends Abstr
     @Override
     public Class<X> getJavaClass()
     {
-        return this.annotatedClass;
+        return annotatedClass;
     }
 
 
@@ -127,7 +127,7 @@ class AnnotatedTypeImpl<X> extends Abstr
         {
             init();
         }
-        this.constructors.add(constructor);
+        constructors.add(constructor);
     }
     
     /**
@@ -141,7 +141,7 @@ class AnnotatedTypeImpl<X> extends Abstr
         {
             init();
         }
-        this.fields.add(field);
+        fields.add(field);
     }
 
     /**
@@ -155,7 +155,7 @@ class AnnotatedTypeImpl<X> extends Abstr
         {
             init();
         }
-        this.methods.add(method);
+        methods.add(method);
     }    
     
     /**
@@ -169,7 +169,7 @@ class AnnotatedTypeImpl<X> extends Abstr
             init();
         }
 
-        return Collections.unmodifiableSet(this.constructors);
+        return Collections.unmodifiableSet(constructors);
     }
 
     /**
@@ -183,7 +183,7 @@ class AnnotatedTypeImpl<X> extends Abstr
             init();
         }
 
-        return Collections.unmodifiableSet(this.fields);
+        return Collections.unmodifiableSet(fields);
     }
 
     /**
@@ -197,7 +197,7 @@ class AnnotatedTypeImpl<X> extends Abstr
             init();
         }
 
-        return Collections.unmodifiableSet(this.methods);
+        return Collections.unmodifiableSet(methods);
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java Thu Oct 13 11:11:03 2011
@@ -71,7 +71,7 @@ public abstract class AbstractProducer<T
         T instance;
         if(!(creationalContext instanceof CreationalContextImpl))
         {
-            creationalContext = bean.getWebBeansContext().getCreationalContextFactory().wrappedCreationalContext(creationalContext, this.bean);
+            creationalContext = bean.getWebBeansContext().getCreationalContextFactory().wrappedCreationalContext(creationalContext, bean);
         }
         
         //Save it
@@ -88,7 +88,7 @@ public abstract class AbstractProducer<T
      */
     public void dispose(T instance)
     {
-        this.bean.destroyCreatedInstance(instance, this.creationalContext);
+        bean.destroyCreatedInstance(instance, creationalContext);
     }
 
     /**
@@ -100,6 +100,6 @@ public abstract class AbstractProducer<T
      */
     protected <X> X getBean(Class<X> clazz)
     {
-        return clazz.cast(this.bean);
+        return clazz.cast(bean);
     }
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java Thu Oct 13 11:11:03 2011
@@ -39,37 +39,37 @@ public class DefaultInjectionTargetImpl<
     @Override
     public void inject(T instance, CreationalContext<T> ctx)
     {
-        this.target.inject(instance, ctx);
+        target.inject(instance, ctx);
     }
 
     @Override
     public void postConstruct(T instance)
     {
-        this.target.postConstruct(instance);
+        target.postConstruct(instance);
     }
 
     @Override
     public void preDestroy(T instance)
     {
-        this.target.preDestroy(instance);
+        target.preDestroy(instance);
     }
 
     @Override
     public void dispose(T instance)
     {
-        this.target.dispose(instance);
+        target.dispose(instance);
     }
 
     @Override
     public Set<InjectionPoint> getInjectionPoints()
     {
-        return this.target.getInjectionPoints();
+        return target.getInjectionPoints();
     }
 
     @Override
     public T produce(CreationalContext<T> creationalContext)
     {
-        return this.target.produce(creationalContext);
+        return target.produce(creationalContext);
     }
 
 }

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java Thu Oct 13 11:11:03 2011
@@ -56,7 +56,7 @@ public class InjectionTargetProducer<T> 
     {
         if(!(ctx instanceof CreationalContextImpl))
         {
-            ctx = bean.getWebBeansContext().getCreationalContextFactory().wrappedCreationalContext(ctx, this.bean);
+            ctx = bean.getWebBeansContext().getCreationalContextFactory().wrappedCreationalContext(ctx, bean);
         }
         
         Object oldInstanceUnderInjection = AbstractInjectable.instanceUnderInjection.get();
@@ -120,7 +120,7 @@ public class InjectionTargetProducer<T> 
         InjectionTargetBean<T> bean = getBean(InjectionTargetBean.class);    
         if(!(bean instanceof EnterpriseBeanMarker))
         {
-            bean.postConstruct(instance,this.creationalContext);   
+            bean.postConstruct(instance, creationalContext);
         }
     }
 
@@ -131,7 +131,7 @@ public class InjectionTargetProducer<T> 
     public void preDestroy(T instance)
     {
         InjectionTargetBean<T> bean = getBean(InjectionTargetBean.class);
-        bean.destroyCreatedInstance(instance, this.creationalContext);
+        bean.destroyCreatedInstance(instance, creationalContext);
     }
 
-}
\ No newline at end of file
+}

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java?rev=1182780&r1=1182779&r2=1182780&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java Thu Oct 13 11:11:03 2011
@@ -85,7 +85,7 @@ public class ExtensionLoader
      */
     public void loadExtensionServices(ClassLoader classLoader)
     {
-        List<Extension> loader = this.webBeansContext.getLoaderService().load(Extension.class, classLoader);
+        List<Extension> loader = webBeansContext.getLoaderService().load(Extension.class, classLoader);
         for (Extension extension : loader)
         {
             if (!extensionClasses.contains(extension.getClass()))
@@ -114,9 +114,9 @@ public class ExtensionLoader
     {
         Asserts.assertNotNull(bean,"bean parameter cannot be null");
         
-        if(this.extensions.containsKey(bean))
+        if(extensions.containsKey(bean))
         {
-            return (T)this.extensions.get(bean);
+            return (T) extensions.get(bean);
         }
         
         return null;
@@ -130,7 +130,7 @@ public class ExtensionLoader
     public void addExtension(Extension ext)
     {
         Bean<?> bean = webBeansContext.getWebBeansUtil().createExtensionComponent(ext.getClass());
-        this.extensions.put(bean, ext);
+        extensions.put(bean, ext);
 
         manager.addBean(bean);
     }
@@ -141,7 +141,7 @@ public class ExtensionLoader
      */
     public void clear()
     {
-        this.extensions.clear();
-        this.extensionClasses.clear();
+        extensions.clear();
+        extensionClasses.clear();
     }
 }



Mime
View raw message