Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6AC21919D for ; Thu, 13 Oct 2011 11:11:37 +0000 (UTC) Received: (qmail 52233 invoked by uid 500); 13 Oct 2011 11:11:37 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 52156 invoked by uid 500); 13 Oct 2011 11:11:36 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 52135 invoked by uid 99); 13 Oct 2011 11:11:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 11:11:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Oct 2011 11:11:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B1CC02388AB9 for ; Thu, 13 Oct 2011 11:11:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1182780 [2/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 -0000 To: commits@openwebbeans.apache.org From: struberg@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111013111112.B1CC02388AB9@eris.apache.org> Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java Thu Oct 13 11:11:03 2011 @@ -70,7 +70,7 @@ public class InjectableBeanManager imple public InjectableBeanManager() { - this.bm = WebBeansContext.getInstance().getBeanManagerImpl(); + bm = WebBeansContext.getInstance().getBeanManagerImpl(); } @Override @@ -234,7 +234,7 @@ public class InjectableBeanManager imple ClassNotFoundException { //static lookup required for bean manager - this.bm = WebBeansContext.currentInstance().getBeanManagerImpl(); + bm = WebBeansContext.currentInstance().getBeanManagerImpl(); } @Override Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Thu Oct 13 11:11:03 2011 @@ -99,8 +99,8 @@ public class InjectionResolver */ public void clearCaches() { - this.resolvedBeansByName.clear(); - this.resolvedBeansByType.clear(); + resolvedBeansByName.clear(); + resolvedBeansByType.clear(); } /** @@ -307,7 +307,7 @@ public class InjectionResolver } resolvedComponents = new HashSet>(); - Set> deployedComponents = this.webBeansContext.getBeanManagerImpl().getBeans(); + Set> deployedComponents = webBeansContext.getBeanManagerImpl().getBeans(); Iterator> it = deployedComponents.iterator(); //Finding all beans with given name @@ -482,7 +482,7 @@ public class InjectionResolver returnAll = true; } - for (Bean component : this.webBeansContext.getBeanManagerImpl().getBeans()) + for (Bean component : webBeansContext.getBeanManagerImpl().getBeans()) { if (returnAll) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Thu Oct 13 11:11:03 2011 @@ -85,18 +85,18 @@ public abstract class AbstractContext im { BeanInstanceBag bag = new BeanInstanceBag(creationalContext); - if(this.componentInstanceMap instanceof ConcurrentMap) + if(componentInstanceMap instanceof ConcurrentMap) { - T exist = (T) ((ConcurrentMap) this.componentInstanceMap).putIfAbsent(contextual, bag); + T exist = (T) ((ConcurrentMap) componentInstanceMap).putIfAbsent(contextual, bag); //no instance if(exist == null) { - this.componentInstanceMap.put(contextual, bag); + componentInstanceMap.put(contextual, bag); } } else { - this.componentInstanceMap.put(contextual , bag); + componentInstanceMap.put(contextual, bag); } } @@ -133,27 +133,27 @@ public abstract class AbstractContext im { if (type.equals(ContextTypes.APPLICATION)) { - this.scopeType = ApplicationScoped.class; + scopeType = ApplicationScoped.class; } else if (type.equals(ContextTypes.SESSION)) { - this.scopeType = SessionScoped.class; + scopeType = SessionScoped.class; } else if (type.equals(ContextTypes.REQUEST)) { - this.scopeType = RequestScoped.class; + scopeType = RequestScoped.class; } else if (type.equals(ContextTypes.DEPENDENT)) { - this.scopeType = Dependent.class; + scopeType = Dependent.class; } else if (type.equals(ContextTypes.CONVERSATION)) { - this.scopeType = ConversationScoped.class; + scopeType = ConversationScoped.class; } else if (type.equals(ContextTypes.SINGLETON)) { - this.scopeType = Singleton.class; + scopeType = Singleton.class; } else { @@ -280,8 +280,8 @@ public abstract class AbstractContext im } //Clear context map - this.componentInstanceMap.clear(); - this.setActive(false); + componentInstanceMap.clear(); + setActive(false); } /** @@ -329,7 +329,7 @@ public abstract class AbstractContext im public Class getScope() { - return this.scopeType; + return scopeType; } /** @@ -415,4 +415,4 @@ public abstract class AbstractContext im } } } -} \ No newline at end of file +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ApplicationContext.java Thu Oct 13 11:11:03 2011 @@ -39,7 +39,7 @@ public class ApplicationContext extends @Override public void setComponentInstanceMap() { - this.componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); + componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ConversationContext.java Thu Oct 13 11:11:03 2011 @@ -51,14 +51,14 @@ public class ConversationContext extends @Override public void setComponentInstanceMap() { - this.componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); + componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); } public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - this.type = (ContextTypes) in.readObject(); - this.scopeType = (Class) in.readObject(); + type = (ContextTypes) in.readObject(); + scopeType = (Class) in.readObject(); Map> map = (Map>)in.readObject(); setComponentInstanceMap(); Iterator it = map.keySet().iterator(); @@ -79,8 +79,8 @@ public class ConversationContext extends public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(this.type); - out.writeObject(this.scopeType); + out.writeObject(type); + out.writeObject(scopeType); Iterator> it = componentInstanceMap.keySet().iterator(); Map> map = new HashMap>(); while(it.hasNext()) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/CustomContextImpl.java Thu Oct 13 11:11:03 2011 @@ -35,22 +35,22 @@ class CustomContextImpl implements Conte public Class getScope() { - return this.context.getScope(); + return context.getScope(); } public T get(Contextual component, CreationalContext crreationalContext) { - return this.context.get(component, crreationalContext); + return context.get(component, crreationalContext); } public T get(Contextual component) { - return this.context.get(component); + return context.get(component); } public boolean isActive() { - return this.context.isActive(); + return context.isActive(); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java Thu Oct 13 11:11:03 2011 @@ -46,7 +46,7 @@ public class DependentContext extends Ab public DependentContext() { super(ContextTypes.DEPENDENT); - this.active = true; + active = true; } @@ -93,4 +93,4 @@ public class DependentContext extends Ab return null; } -} \ No newline at end of file +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/RequestContext.java Thu Oct 13 11:11:03 2011 @@ -44,7 +44,7 @@ public class RequestContext extends Abst @Override public void setComponentInstanceMap() { - this.componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); + componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SessionContext.java Thu Oct 13 11:11:03 2011 @@ -52,7 +52,7 @@ public class SessionContext extends Abst @Override public void setComponentInstanceMap() { - this.componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); + componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); } public void readExternal(ObjectInput in) throws IOException, @@ -60,8 +60,8 @@ public class SessionContext extends Abst { WebBeansContext webBeansContext = WebBeansContext.currentInstance(); - this.type = (ContextTypes) in.readObject(); - this.scopeType = (Class) in.readObject(); + type = (ContextTypes) in.readObject(); + scopeType = (Class) in.readObject(); Map> map = (Map>)in.readObject(); setComponentInstanceMap(); Iterator it = map.keySet().iterator(); @@ -82,8 +82,8 @@ public class SessionContext extends Abst public void writeExternal(ObjectOutput out) throws IOException { - out.writeObject(this.type); - out.writeObject(this.scopeType); + out.writeObject(type); + out.writeObject(scopeType); Iterator> it = componentInstanceMap.keySet().iterator(); Map> map = new HashMap>(); while(it.hasNext()) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/SingletonContext.java Thu Oct 13 11:11:03 2011 @@ -39,6 +39,6 @@ public class SingletonContext extends Ab @Override public void setComponentInstanceMap() { - this.componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); + componentInstanceMap = new ConcurrentHashMap, BeanInstanceBag>(); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/BeanInstanceBag.java Thu Oct 13 11:11:03 2011 @@ -72,7 +72,7 @@ public class BeanInstanceBag implemen { try { - this.lock.lock(); + lock.lock(); // we need to check again, maybe we got blocked by a previous invocation if (beanInstance == null) @@ -83,7 +83,7 @@ public class BeanInstanceBag implemen } finally { - this.lock.unlock(); + lock.unlock(); } return beanInstance; Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Thu Oct 13 11:11:03 2011 @@ -84,19 +84,19 @@ public class CreationalContextImpl im Asserts.assertNotNull(instance,"Instance parameter can not be null"); List list = null; - if (this.ejbInterceptors == null) + if (ejbInterceptors == null) { - this.ejbInterceptors = new ConcurrentHashMap>(); + ejbInterceptors = new ConcurrentHashMap>(); } else { - list = this.ejbInterceptors.get(ownerInstance); + list = ejbInterceptors.get(ownerInstance); } if(list == null) { list = new ArrayList(); - List oldList = this.ejbInterceptors.putIfAbsent(ownerInstance, list); + List oldList = ejbInterceptors.putIfAbsent(ownerInstance, list); if(oldList != null) { list = oldList; @@ -116,12 +116,12 @@ public class CreationalContextImpl im { Asserts.assertNotNull(ownerInstance,"Owner instance can not be null"); - if (this.ejbInterceptors == null) + if (ejbInterceptors == null) { return null; } - List ejbInts = this.ejbInterceptors.get(ownerInstance); + List ejbInts = ejbInterceptors.get(ownerInstance); if(ejbInts != null) { for(EjbInterceptorContext ejbInterceptor : ejbInts) @@ -187,7 +187,7 @@ public class CreationalContextImpl im if(dependentList == null) { dependentList = new ArrayList>(); - this.dependentObjects.put(ownerInstance, dependentList); + dependentObjects.put(ownerInstance, dependentList); } dependentList.add(dependentCreational); @@ -211,7 +211,7 @@ public class CreationalContextImpl im synchronized(this) { - List> values = this.dependentObjects.get(ownerInstance); + List> values = dependentObjects.get(ownerInstance); if(values != null && !values.isEmpty()) { Iterator> it = values.iterator(); @@ -246,7 +246,7 @@ public class CreationalContextImpl im synchronized(this) { - List> values = this.dependentObjects.get(ownerInstance); + List> values = dependentObjects.get(ownerInstance); if (values != null && values.size() > 0) { Iterator> it = values.iterator(); @@ -278,7 +278,7 @@ public class CreationalContextImpl im synchronized(this) { - Collection>> values = this.dependentObjects.values(); + Collection>> values = dependentObjects.values(); if(values != null) { for(List> value : values) @@ -303,13 +303,13 @@ public class CreationalContextImpl im } } - this.dependentObjects = null; + dependentObjects = null; } Collection> interceptorValues = null; - if (this.ejbInterceptors != null) + if (ejbInterceptors != null) { - interceptorValues = this.ejbInterceptors.values(); + interceptorValues = ejbInterceptors.values(); } if(interceptorValues != null) @@ -325,7 +325,7 @@ public class CreationalContextImpl im } } - this.ejbInterceptors.clear(); + ejbInterceptors.clear(); } } @@ -344,7 +344,7 @@ public class CreationalContextImpl im */ public Contextual getBean() { - return this.contextual; + return contextual; } @@ -376,7 +376,7 @@ public class CreationalContextImpl im private synchronized void readObject(ObjectInputStream s) throws IOException, ClassNotFoundException { - this.webBeansContext = WebBeansContext.currentInstance(); + webBeansContext = WebBeansContext.currentInstance(); dependentObjects = (HashMap>>)s.readObject(); String id = (String) s.readObject(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/WrappedCreationalContext.java Thu Oct 13 11:11:03 2011 @@ -33,7 +33,7 @@ class WrappedCreationalContext extend WebBeansContext webBeansContext) { super(contextual, webBeansContext); - this.wrapped = creationalContext; + wrapped = creationalContext; } @Override Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Thu Oct 13 11:11:03 2011 @@ -83,12 +83,12 @@ public class ConversationImpl implements this.webBeansContext = webBeansContext; try { - this.timeout = Long.parseLong(this.webBeansContext.getOpenWebBeansConfiguration(). + timeout = Long.parseLong(this.webBeansContext.getOpenWebBeansConfiguration(). getProperty(OpenWebBeansConfiguration.CONVERSATION_TIMEOUT_INTERVAL, "1800000")); } catch(NumberFormatException e) { - this.timeout = 30 * 60 * 1000; + timeout = 30 * 60 * 1000; } } @@ -106,12 +106,12 @@ public class ConversationImpl implements try { - this.timeout = Long.parseLong(this.webBeansContext.getOpenWebBeansConfiguration(). + timeout = Long.parseLong(this.webBeansContext.getOpenWebBeansConfiguration(). getProperty(OpenWebBeansConfiguration.CONVERSATION_TIMEOUT_INTERVAL, "1800000")); } catch(NumberFormatException e) { - this.timeout = 30 * 60 * 1000; + timeout = 30 * 60 * 1000; } this.sessionId = sessionId; @@ -125,11 +125,11 @@ public class ConversationImpl implements public void begin() { //Transient state - if(this.isTransient) + if(isTransient) { - this.isTransient = false; - this.id = Integer.toString(conversationIdGenerator.incrementAndGet()); - this.updateTimeOut(); + isTransient = false; + id = Integer.toString(conversationIdGenerator.incrementAndGet()); + updateTimeOut(); //Conversation manager ConversationManager manager = webBeansContext.getConversationManager(); @@ -170,11 +170,11 @@ public class ConversationImpl implements } //Transient state - if(this.isTransient) + if(isTransient) { - this.isTransient = false; + isTransient = false; this.id = id; - this.updateTimeOut(); + updateTimeOut(); conversationManager.addConversationContext(this, (ConversationContext) webBeansContext.getBeanManagerImpl().getContext(ConversationScoped.class)); } } @@ -185,16 +185,16 @@ public class ConversationImpl implements @Override public void end() { - if(!this.isTransient) + if(!isTransient) { - this.isTransient = true; + isTransient = true; webBeansContext.getConversationManager().removeConversation(this); } else { logger.warn(OWBLogConst.WARN_0004, id); - throw new IllegalStateException(this.toString() + " has already ended"); + throw new IllegalStateException(toString() + " has already ended"); } } @@ -221,7 +221,7 @@ public class ConversationImpl implements */ public void setTransient(boolean value) { - this.isTransient = value; + isTransient = value; } /** @@ -230,7 +230,7 @@ public class ConversationImpl implements @Override public String getId() { - return this.id; + return id; } /** @@ -239,7 +239,7 @@ public class ConversationImpl implements @Override public long getTimeout() { - return this.timeout; + return timeout; } /** @@ -257,7 +257,7 @@ public class ConversationImpl implements @Override public void setTimeout(long milliseconds) { - this.timeout = milliseconds; + timeout = milliseconds; } /** @@ -266,7 +266,7 @@ public class ConversationImpl implements */ public String getSessionId() { - return this.sessionId; + return sessionId; } /** @@ -283,7 +283,7 @@ public class ConversationImpl implements */ public void updateTimeOut() { - this.activeTime = System.currentTimeMillis(); + activeTime = System.currentTimeMillis(); } /* @@ -354,7 +354,7 @@ public class ConversationImpl implements { StringBuilder builder = new StringBuilder(); builder.append("Conversation with id [ "); - builder.append(this.id); + builder.append(id); builder.append(" ]"); return builder.toString(); Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java Thu Oct 13 11:11:03 2011 @@ -247,7 +247,7 @@ public class ConversationManager */ public void destroyAllConversations() { - Collection collection = this.conversations.values(); + Collection collection = conversations.values(); if(collection != null && collection.size() > 0) { for (ConversationContext context : collection) Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/scanner/AbstractMetaDataDiscovery.java Thu Oct 13 11:11:03 2011 @@ -152,7 +152,7 @@ public abstract class AbstractMetaDataDi // occurs before // properties are loaded. String usage = WebBeansContext.getInstance().getOpenWebBeansConfiguration().getProperty(OpenWebBeansConfiguration.USE_BDA_BEANSXML_SCANNER); - this.isBDAScannerEnabled = Boolean.parseBoolean(usage); + isBDAScannerEnabled = Boolean.parseBoolean(usage); if (isBDAScannerEnabled) { annotationDB = new BeansXmlAnnotationDB(); @@ -182,9 +182,9 @@ public abstract class AbstractMetaDataDi */ protected void addWebBeansXmlLocation(URL beansXmlUrl) { - if(this.logger.wblWillLogInfo()) + if(logger.wblWillLogInfo()) { - this.logger.info("added beans.xml marker: " + beansXmlUrl.toExternalForm()); + logger.info("added beans.xml marker: " + beansXmlUrl.toExternalForm()); } webBeansXmlLocations.add(beansXmlUrl); } @@ -197,7 +197,7 @@ public abstract class AbstractMetaDataDi crossReferenceBeans(); Set> classSet = new HashSet>(); - Map> index = this.annotationDB.getClassIndex(); + Map> index = annotationDB.getClassIndex(); if(index != null) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultScannerService.java Thu Oct 13 11:11:03 2011 @@ -47,7 +47,7 @@ public class DefaultScannerService exten try { - this.getAnnotationDB().scanArchives(urlPaths); + getAnnotationDB().scanArchives(urlPaths); } catch (IOException e) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java Thu Oct 13 11:11:03 2011 @@ -84,7 +84,7 @@ public class ManagedSecurityService impl // we also need to make sure that this very class didn't get subclassed // to prevent man in the middle attacks - if (this.getClass() != ManagedSecurityService.class) + if (getClass() != ManagedSecurityService.class) { throw new SecurityException("ManagedSecurityService must not get subclassed!"); } @@ -295,7 +295,7 @@ public class ManagedSecurityService impl @Override public String run() { - return System.getProperty(this.propertyName,this.defaultValue); + return System.getProperty(propertyName, defaultValue); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java Thu Oct 13 11:11:03 2011 @@ -211,7 +211,7 @@ public class DelegateHandler implements public void setDecorators(List dec) { - this.decorators = dec; + decorators = dec; } @Override Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Thu Oct 13 11:11:03 2011 @@ -93,7 +93,7 @@ public class WebBeansDecorator extend super(WebBeansType.DECORATOR,wrappedBean.getReturnType(), wrappedBean.getWebBeansContext()); this.wrappedBean = wrappedBean; this.customDecorator = customDecorator; - this.ignoredDecoratorInterfaces = getIgnoredDecoratorInterfaces(wrappedBean); + ignoredDecoratorInterfaces = getIgnoredDecoratorInterfaces(wrappedBean); initDelegate(); } @@ -106,8 +106,8 @@ public class WebBeansDecorator extend super(WebBeansType.DECORATOR,wrappedBean.getReturnType(), wrappedBean.getWebBeansContext()); this.wrappedBean = wrappedBean; - this.clazz = wrappedBean.getReturnType(); - this.ignoredDecoratorInterfaces = getIgnoredDecoratorInterfaces(wrappedBean); + clazz = wrappedBean.getReturnType(); + ignoredDecoratorInterfaces = getIgnoredDecoratorInterfaces(wrappedBean); init(); } @@ -121,9 +121,9 @@ public class WebBeansDecorator extend protected void init() { - ClassUtil.setInterfaceTypeHierarchy(this.decoratedTypes, this.clazz); + ClassUtil.setInterfaceTypeHierarchy(decoratedTypes, clazz); - for (Iterator i = this.decoratedTypes.iterator(); i.hasNext(); ) + for (Iterator i = decoratedTypes.iterator(); i.hasNext(); ) { Type t = i.next(); if (t instanceof Class && ignoredDecoratorInterfaces.contains(((Class) t).getName())) @@ -183,25 +183,25 @@ public class WebBeansDecorator extend @Override public boolean isPassivationCapable() { - return this.wrappedBean.isPassivationCapable(); + return wrappedBean.isPassivationCapable(); } private void initDelegateInternal(InjectionPoint ip) { - if(this.customDecorator != null) + if(customDecorator != null) { - this.delegateType = this.customDecorator.getDelegateType(); - this.delegateBindings = this.customDecorator.getDelegateQualifiers(); + delegateType = customDecorator.getDelegateType(); + delegateBindings = customDecorator.getDelegateQualifiers(); } else { - this.delegateType = ip.getType(); - this.delegateBindings = ip.getQualifiers(); + delegateType = ip.getType(); + delegateBindings = ip.getQualifiers(); } if(ip.getMember() instanceof Field) { - this.delegateField = (Field)ip.getMember(); + delegateField = (Field)ip.getMember(); } else { @@ -215,11 +215,11 @@ public class WebBeansDecorator extend { throw new WebBeansConfigurationException("More than one delegate injection field is found for decorator : " + toString()); } - - this.delegateField = fields[0]; + + delegateField = fields[0]; } - Type fieldType = this.delegateField.getGenericType(); + Type fieldType = delegateField.getGenericType(); for (Type decType : getDecoratedTypes()) { @@ -304,9 +304,9 @@ public class WebBeansDecorator extend @Override public Set getDelegateQualifiers() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getDelegateQualifiers(); + return customDecorator.getDelegateQualifiers(); } return delegateBindings; @@ -315,9 +315,9 @@ public class WebBeansDecorator extend @Override public Type getDelegateType() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getDelegateType(); + return customDecorator.getDelegateType(); } return delegateType; @@ -352,24 +352,24 @@ public class WebBeansDecorator extend @SuppressWarnings("unchecked") protected T createInstance(CreationalContext creationalContext) { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.create(creationalContext); + return customDecorator.create(creationalContext); } WebBeansContext webBeansContext = wrappedBean.getWebBeansContext(); Context context = webBeansContext.getBeanManagerImpl().getContext(getScope()); - Object actualInstance = context.get((Bean)this.wrappedBean, (CreationalContext)creationalContext); - T proxy = (T) webBeansContext.getJavassistProxyFactory().createDependentScopedBeanProxy(this.wrappedBean, actualInstance, creationalContext); + Object actualInstance = context.get((Bean) wrappedBean, (CreationalContext)creationalContext); + T proxy = (T) webBeansContext.getJavassistProxyFactory().createDependentScopedBeanProxy(wrappedBean, actualInstance, creationalContext); return proxy; } public void setInjections(Object proxy, CreationalContext cretionalContext) { - if(this.customDecorator != null) + if(customDecorator != null) { - Set injections = this.customDecorator.getInjectionPoints(); + Set injections = customDecorator.getInjectionPoints(); if(injections != null) { for(InjectionPoint ip : injections) @@ -392,7 +392,7 @@ public class WebBeansDecorator extend else { // Set injected fields - ManagedBean delegate = (ManagedBean) this.wrappedBean; + ManagedBean delegate = (ManagedBean) wrappedBean; Set injectedFields = delegate.getInjectedFromSuperFields(); for (Field injectedField : injectedFields) @@ -432,23 +432,23 @@ public class WebBeansDecorator extend private void injectField(Field field, Object instance, CreationalContext creationalContext) { - InjectableField f = new InjectableField(field, instance, this.wrappedBean, creationalContext); + InjectableField f = new InjectableField(field, instance, wrappedBean, creationalContext); f.doInjection(); } @SuppressWarnings("unchecked") private void injectMethod(Method method, Object instance, CreationalContext creationalContext) { - InjectableMethods m = new InjectableMethods(method, instance, this.wrappedBean, creationalContext); + InjectableMethods m = new InjectableMethods(method, instance, wrappedBean, creationalContext); m.doInjection(); } @Override public Set getQualifiers() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getQualifiers(); + return customDecorator.getQualifiers(); } return wrappedBean.getQualifiers(); @@ -457,9 +457,9 @@ public class WebBeansDecorator extend @Override public String getName() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getName(); + return customDecorator.getName(); } return wrappedBean.getName(); @@ -468,9 +468,9 @@ public class WebBeansDecorator extend @Override public Class getScope() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getScope(); + return customDecorator.getScope(); } return wrappedBean.getScope(); @@ -479,9 +479,9 @@ public class WebBeansDecorator extend public Set getTypes() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getTypes(); + return customDecorator.getTypes(); } return wrappedBean.getTypes(); @@ -490,9 +490,9 @@ public class WebBeansDecorator extend @Override public boolean isNullable() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.isNullable(); + return customDecorator.isNullable(); } return wrappedBean.isNullable(); @@ -514,9 +514,9 @@ public class WebBeansDecorator extend public Set getInjectionPoints() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getInjectionPoints(); + return customDecorator.getInjectionPoints(); } return wrappedBean.getInjectionPoints(); @@ -527,9 +527,9 @@ public class WebBeansDecorator extend */ public Class getClazz() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getBeanClass(); + return customDecorator.getBeanClass(); } return clazz; @@ -538,51 +538,51 @@ public class WebBeansDecorator extend @Override public Class getBeanClass() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getBeanClass(); + return customDecorator.getBeanClass(); } - return this.wrappedBean.getBeanClass(); + return wrappedBean.getBeanClass(); } @Override public Set> getStereotypes() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getStereotypes(); + return customDecorator.getStereotypes(); } - return this.wrappedBean.getStereotypes(); + return wrappedBean.getStereotypes(); } @Override public Set getDecoratedTypes() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.getDecoratedTypes(); + return customDecorator.getDecoratedTypes(); } - return this.decoratedTypes; + return decoratedTypes; } @Override public boolean isAlternative() { - if(this.customDecorator != null) + if(customDecorator != null) { - return this.customDecorator.isAlternative(); + return customDecorator.isAlternative(); } - return this.wrappedBean.isAlternative(); + return wrappedBean.isAlternative(); } @Override public void validatePassivationDependencies() { - this.wrappedBean.validatePassivationDependencies(); + wrappedBean.validatePassivationDependencies(); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Thu Oct 13 11:11:03 2011 @@ -76,7 +76,7 @@ public class StereoTypeModel implements public StereoTypeModel(WebBeansContext webBeansContext, Class clazz, Annotation[] annotationDefs) { - this.name = clazz.getName(); + name = clazz.getName(); configAnnotations(clazz, webBeansContext, annotationDefs); @@ -116,12 +116,12 @@ public class StereoTypeModel implements if (AnnotationUtil.hasMetaAnnotation(annotations, NormalScope.class)) { - this.defaultScopeType = AnnotationUtil.getMetaAnnotations(annotations, NormalScope.class)[0]; + defaultScopeType = AnnotationUtil.getMetaAnnotations(annotations, NormalScope.class)[0]; } if (AnnotationUtil.hasMetaAnnotation(annotations, Scope.class)) { - this.defaultScopeType = AnnotationUtil.getMetaAnnotations(annotations, Scope.class)[0]; + defaultScopeType = AnnotationUtil.getMetaAnnotations(annotations, Scope.class)[0]; } if (annotationManager.hasInterceptorBindingMetaAnnotation(annotations)) @@ -130,7 +130,7 @@ public class StereoTypeModel implements annotationManager.getInterceptorBindingMetaAnnotations(annotations); for (Annotation ann : ibs) { - this.interceptorBindingTypes.add(ann); + interceptorBindingTypes.add(ann); } } @@ -173,7 +173,7 @@ public class StereoTypeModel implements } } - this.inherits.add(is); + inherits.add(is); } } } @@ -215,7 +215,7 @@ public class StereoTypeModel implements */ public Set getInterceptorBindingTypes() { - return this.interceptorBindingTypes; + return interceptorBindingTypes; } /** @@ -223,7 +223,7 @@ public class StereoTypeModel implements */ public Set getInheritedStereoTypes() { - return this.inherits; + return inherits; } /** @@ -249,7 +249,7 @@ public class StereoTypeModel implements StereoTypeModel model = (StereoTypeModel) obj; - return model.name.equals(this.name); + return model.name.equals(name); } /** @@ -258,6 +258,6 @@ public class StereoTypeModel implements @Override public int hashCode() { - return this.name.hashCode(); + return name.hashCode(); } -} \ No newline at end of file +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/ELContextStore.java Thu Oct 13 11:11:03 2011 @@ -154,8 +154,8 @@ public class ELContextStore */ public void addDependent(Bean bean, Object dependent, CreationalContext creationalContext) { - this.dependentObjects.put(bean, new CreationalStore(dependent,creationalContext)); - this.beanNameToDependentBeanMapping.put(bean.getName(), bean); + dependentObjects.put(bean, new CreationalStore(dependent, creationalContext)); + beanNameToDependentBeanMapping.put(bean.getName(), bean); } /** @@ -165,7 +165,7 @@ public class ELContextStore */ public Object getDependent(Bean bean) { - CreationalStore sc = this.dependentObjects.get(bean); + CreationalStore sc = dependentObjects.get(bean); return sc != null ? sc.getObject() : null; } @@ -197,16 +197,16 @@ public class ELContextStore */ public void destroyDependents() { - Set> beans = this.dependentObjects.keySet(); + Set> beans = dependentObjects.keySet(); for(Bean bean : beans) { Bean o = (Bean)bean; - CreationalStore store = this.dependentObjects.get(bean); + CreationalStore store = dependentObjects.get(bean); o.destroy(store.getObject(), (CreationalContext)store.getCreational()); } - - this.dependentObjects.clear(); - this.beanNameToDependentBeanMapping.clear(); + + dependentObjects.clear(); + beanNameToDependentBeanMapping.clear(); } /** Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedExpressionFactory.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedExpressionFactory.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedExpressionFactory.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedExpressionFactory.java Thu Oct 13 11:11:03 2011 @@ -36,19 +36,19 @@ public class WrappedExpressionFactory ex @Override public Object coerceToType(Object arg0, Class arg1) throws ELException { - return this.expressionFactory.coerceToType(arg0, arg1); + return expressionFactory.coerceToType(arg0, arg1); } @Override public MethodExpression createMethodExpression(ELContext arg0, String arg1, Class arg2, Class[] arg3) throws ELException, NullPointerException { - return this.expressionFactory.createMethodExpression(arg0, arg1, arg2, arg3); + return expressionFactory.createMethodExpression(arg0, arg1, arg2, arg3); } @Override public ValueExpression createValueExpression(Object arg0, Class arg1) { - ValueExpression wrapped = this.expressionFactory.createValueExpression(arg0, arg1); + ValueExpression wrapped = expressionFactory.createValueExpression(arg0, arg1); return new WrappedValueExpression(wrapped); } @@ -56,7 +56,7 @@ public class WrappedExpressionFactory ex @Override public ValueExpression createValueExpression(ELContext arg0, String arg1, Class arg2) throws NullPointerException, ELException { - ValueExpression wrapped = this.expressionFactory.createValueExpression(arg0, arg1, arg2); + ValueExpression wrapped = expressionFactory.createValueExpression(arg0, arg1, arg2); return new WrappedValueExpression(wrapped); } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WrappedValueExpression.java Thu Oct 13 11:11:03 2011 @@ -50,13 +50,13 @@ public class WrappedValueExpression exte @Override public Class getExpectedType() { - return this.valueExpression.getExpectedType(); + return valueExpression.getExpectedType(); } @Override public Class getType(ELContext arg0) throws NullPointerException, PropertyNotFoundException, ELException { - return this.valueExpression.getType(arg0); + return valueExpression.getType(arg0); } @Override @@ -65,7 +65,7 @@ public class WrappedValueExpression exte Object value = null; try { - value = this.valueExpression.getValue(context); + value = valueExpression.getValue(context); } finally @@ -84,37 +84,37 @@ public class WrappedValueExpression exte @Override public boolean isReadOnly(ELContext arg0) throws NullPointerException, PropertyNotFoundException, ELException { - return this.valueExpression.isReadOnly(arg0); + return valueExpression.isReadOnly(arg0); } @Override public void setValue(ELContext arg0, Object arg1) throws NullPointerException, PropertyNotFoundException, PropertyNotWritableException, ELException { - this.valueExpression.setValue(arg0, arg1); + valueExpression.setValue(arg0, arg1); } @Override public boolean equals(Object arg0) { - return this.valueExpression.equals(arg0); + return valueExpression.equals(arg0); } @Override public String getExpressionString() { - return this.valueExpression.getExpressionString(); + return valueExpression.getExpressionString(); } @Override public int hashCode() { - return this.valueExpression.hashCode(); + return valueExpression.hashCode(); } @Override public boolean isLiteralText() { - return this.valueExpression.isLiteralText(); + return valueExpression.isLiteralText(); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Thu Oct 13 11:11:03 2011 @@ -72,7 +72,7 @@ public class EventImpl implements Eve */ public void fire(T event) { - this.webBeansContext.getBeanManagerImpl().fireEvent(event, this.injectedBindings); + webBeansContext.getBeanManagerImpl().fireEvent(event, injectedBindings); } /** @@ -87,7 +87,7 @@ public class EventImpl implements Eve Set eventBindings = new HashSet(); - for(Annotation ann : this.injectedBindings) + for(Annotation ann : injectedBindings) { eventBindings.add(ann); } @@ -112,7 +112,7 @@ public class EventImpl implements Eve @Override public Event select(Annotation... bindings) { - Event sub = new EventImpl(getEventBindings(bindings),this.eventType, webBeansContext); + Event sub = new EventImpl(getEventBindings(bindings), eventType, webBeansContext); return sub; } @@ -132,7 +132,7 @@ public class EventImpl implements Eve if(sub == null) { - sub = this.eventType; + sub = eventType; } Event subEvent = new EventImpl(getEventBindings(bindings),sub, webBeansContext); @@ -152,8 +152,8 @@ public class EventImpl implements Eve private void writeObject(java.io.ObjectOutputStream op) throws IOException { ObjectOutputStream oos = new ObjectOutputStream(op); - oos.writeObject(this.eventType); - oos.writeObject(this.injectedBindings); + oos.writeObject(eventType); + oos.writeObject(injectedBindings); oos.flush(); } @@ -161,9 +161,9 @@ public class EventImpl implements Eve private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException { final ObjectInputStream inputStream = new OwbCustomObjectInputStream(in, WebBeansUtil.getCurrentClassLoader()); - this.eventType = (Type)inputStream.readObject(); - this.injectedBindings = (Annotation[])inputStream.readObject(); + eventType = (Type)inputStream.readObject(); + injectedBindings = (Annotation[])inputStream.readObject(); - this.webBeansContext = WebBeansContext.currentInstance(); + webBeansContext = WebBeansContext.currentInstance(); } -} \ No newline at end of file +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Thu Oct 13 11:11:03 2011 @@ -100,7 +100,7 @@ public final class NotificationManager if (observers.containsKey(eventType)) { - Set> set = this.observers.get(eventType); + Set> set = observers.get(eventType); for (ObserverMethod ob : set) { Set evenBindings = ob.getObservedQualifiers(); @@ -162,7 +162,7 @@ public final class NotificationManager } } - Set keySet = this.observers.keySet(); + Set keySet = observers.keySet(); for (Type type : keySet) { @@ -170,7 +170,7 @@ public final class NotificationManager { if (ClassUtil.checkEventTypeAssignability(check, type)) { - Set> wrappers = this.observers.get(type); + Set> wrappers = observers.get(type); for (ObserverMethod wrapper : wrappers) { @@ -186,7 +186,7 @@ public final class NotificationManager private Set> filterByExtensionEventType(T event, Class eventType) { Set> matching = new HashSet>(); - Set keySet = this.observers.keySet(); + Set keySet = observers.keySet(); for (Type type : keySet) { Class beanClass = null; @@ -311,7 +311,7 @@ public final class NotificationManager private void addToMatching(Type type, Set> matching) { - Set> wrappers = this.observers.get(type); + Set> wrappers = observers.get(type); for (ObserverMethod wrapper : wrappers) { Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Thu Oct 13 11:11:03 2011 @@ -135,16 +135,16 @@ public class ObserverMethodImpl imple getWebBeansContext().getAnnotationManager().getMethodFirstParameterQualifierWithGivenAnnotation( observerMethod, Observes.class); getWebBeansContext().getAnnotationManager().checkQualifierConditions(qualifiers); - this.observedQualifiers = new HashSet(qualifiers.length); + observedQualifiers = new HashSet(qualifiers.length); for (Annotation qualifier : qualifiers) { observedQualifiers.add(qualifier); } - - this.observedEventType = AnnotationUtil.getTypeOfParameterWithGivenAnnotation(observerMethod, Observes.class); - - this.phase = EventUtil.getObserverMethodTransactionType(observerMethod); + + observedEventType = AnnotationUtil.getTypeOfParameterWithGivenAnnotation(observerMethod, Observes.class); + + phase = EventUtil.getObserverMethodTransactionType(observerMethod); } /** @@ -161,13 +161,13 @@ public class ObserverMethodImpl imple this.bean = bean; this.observerMethod = observerMethod; this.ifExist = ifExist; - this.observedQualifiers = new HashSet(qualifiers.length); + observedQualifiers = new HashSet(qualifiers.length); for (Annotation qualifier : qualifiers) { observedQualifiers.add(qualifier); } this.observedEventType = observedEventType; - this.phase = EventUtil.getObserverMethodTransactionType(observerMethod); + phase = EventUtil.getObserverMethodTransactionType(observerMethod); } @@ -210,7 +210,7 @@ public class ObserverMethodImpl imple ObserverParams[] obargs = null; try { - boolean isPrivateMethod = !this.observerMethod.isAccessible(); + boolean isPrivateMethod = !observerMethod.isAccessible(); if (isPrivateMethod) { bean.getWebBeansContext().getSecurityService().doPrivilegedSetAccessible(observerMethod, true); @@ -226,10 +226,10 @@ public class ObserverMethodImpl imple } //Static or not - if (Modifier.isStatic(this.observerMethod.getModifiers())) + if (Modifier.isStatic(observerMethod.getModifiers())) { //Invoke Method - this.observerMethod.invoke(object, args); + observerMethod.invoke(object, args); } else { @@ -289,7 +289,7 @@ public class ObserverMethodImpl imple if (object != null) { //Invoke Method - this.observerMethod.invoke(object, args); + observerMethod.invoke(object, args); } } } @@ -334,11 +334,11 @@ public class ObserverMethodImpl imple AnnotationManager annotationManager = webBeansContext.getAnnotationManager(); //Define annotated parameter - AnnotatedType annotatedType = (AnnotatedType) annotatedElementFactory.newAnnotatedType(this.bean.getReturnType()); - AnnotatedMethod annotatedMethod = annotatedElementFactory.newAnnotatedMethod(this.observerMethod, annotatedType); + AnnotatedType annotatedType = (AnnotatedType) annotatedElementFactory.newAnnotatedType(bean.getReturnType()); + AnnotatedMethod annotatedMethod = annotatedElementFactory.newAnnotatedMethod(observerMethod, annotatedType); - Type[] types = this.observerMethod.getGenericParameterTypes(); - Annotation[][] annots = this.observerMethod.getParameterAnnotations(); + Type[] types = observerMethod.getGenericParameterTypes(); + Annotation[][] annots = observerMethod.getParameterAnnotations(); List list = new ArrayList(); BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); @@ -381,7 +381,7 @@ public class ObserverMethodImpl imple AnnotatedParameter annotatedParameter = annotatedMethod.getParameters().get(i); //Creating injection point - InjectionPoint point = InjectionPointFactory.getPartialInjectionPoint(this.bean, type, this.observerMethod, annotatedParameter, bindingTypes); + InjectionPoint point = InjectionPointFactory.getPartialInjectionPoint(bean, type, observerMethod, annotatedParameter, bindingTypes); //Injected Bean Bean injectedBean = (Bean)getWebBeansContext().getBeanManagerImpl().getInjectionResolver().getInjectionPointBean(point); @@ -424,7 +424,7 @@ public class ObserverMethodImpl imple final AnnotationManager annotationManager = webBeansContext.getAnnotationManager(); final BeanManagerImpl manager = webBeansContext.getBeanManagerImpl(); List list = new ArrayList(); - List> parameters = this.annotatedMethod.getParameters(); + List> parameters = annotatedMethod.getParameters(); ObserverParams param = null; for(AnnotatedParameter parameter : parameters) { @@ -441,7 +441,7 @@ public class ObserverMethodImpl imple annotationManager.getQualifierAnnotations(AnnotationUtil. getAnnotationsFromSet(parameter.getAnnotations())); - InjectionPoint point = InjectionPointFactory.getPartialInjectionPoint(this.bean, parameter.getBaseType(), + InjectionPoint point = InjectionPointFactory.getPartialInjectionPoint(bean, parameter.getBaseType(), parameter.getDeclaringCallable().getJavaMember(), parameter, bindingTypes); //Get observer parameter instance @@ -480,7 +480,7 @@ public class ObserverMethodImpl imple @SuppressWarnings("unchecked") public Class getBeanClass() { - AbstractInjectionTargetBean abs = (AbstractInjectionTargetBean)this.bean; + AbstractInjectionTargetBean abs = (AbstractInjectionTargetBean) bean; return abs.getBeanClass(); } @@ -515,7 +515,7 @@ public class ObserverMethodImpl imple public Method getObserverMethod() { - return this.observerMethod; + return observerMethod; } protected WebBeansContext getWebBeansContext() @@ -532,6 +532,6 @@ public class ObserverMethodImpl imple */ public void setObserverMethod(Method m) { - this.observerMethod = m; + observerMethod = m; } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansException.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansException.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansException.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/WebBeansException.java Thu Oct 13 11:11:03 2011 @@ -35,13 +35,13 @@ public class WebBeansException extends R public WebBeansException(Throwable e) { super(e); - this.cause = e; + cause = e; } public WebBeansException(String message, Throwable e) { super(message, e); - this.cause = e; + cause = e; } public Throwable getCause() Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ViolationMessageBuilder.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ViolationMessageBuilder.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ViolationMessageBuilder.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/exception/helper/ViolationMessageBuilder.java Thu Oct 13 11:11:03 2011 @@ -53,29 +53,29 @@ public class ViolationMessageBuilder private void appendText(String[] text, boolean appendLineSeparator) { - if(this.violationMessage == null) + if(violationMessage == null) { - this.violationMessage = new StringBuilder(); + violationMessage = new StringBuilder(); } else if(appendLineSeparator) { - this.violationMessage.append(lineSeparator); + violationMessage.append(lineSeparator); } for(String t : text) { - this.violationMessage.append(t); + violationMessage.append(t); } } public boolean containsViolation() { - return this.violationMessage != null; + return violationMessage != null; } @Override public String toString() { - return containsViolation() ? this.violationMessage.toString() : "no violation recorded"; + return containsViolation() ? violationMessage.toString() : "no violation recorded"; } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Thu Oct 13 11:11:03 2011 @@ -121,7 +121,7 @@ public abstract class AbstractInjectable { if(injectedBean instanceof AbstractProducerBean) { - if(this.injectionOwnerBean.isPassivationCapable()) + if(injectionOwnerBean.isPassivationCapable()) { dependentProducer = true; } @@ -130,7 +130,7 @@ public abstract class AbstractInjectable } //Gets injectable reference for injected bean - injected = beanManager.getInjectableReference(injectionPoint, this.injectionOwnerCreationalContext); + injected = beanManager.getInjectableReference(injectionPoint, injectionOwnerCreationalContext); /*X TODO see spec issue CDI-140 */ if(dependentProducer) @@ -148,7 +148,7 @@ public abstract class AbstractInjectable { if(instanceUnderInjection.get() != null) { - ((CreationalContextImpl)this.injectionOwnerCreationalContext).addDependent(instanceUnderInjection.get(),injectedBean, injected); + ((CreationalContextImpl) injectionOwnerCreationalContext).addDependent(instanceUnderInjection.get(),injectedBean, injected); } } @@ -163,7 +163,7 @@ public abstract class AbstractInjectable */ protected List getInjectedPoints(Member member) { - List injectedFields = this.injectionOwnerBean.getInjectionPoint(member); + List injectedFields = injectionOwnerBean.getInjectionPoint(member); return injectedFields; @@ -213,7 +213,7 @@ public abstract class AbstractInjectable */ public OwbBean getInjectionOwnerComponent() { - return this.injectionOwnerBean; + return injectionOwnerBean; } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AlternativesManager.java Thu Oct 13 11:11:03 2011 @@ -63,14 +63,14 @@ public class AlternativesManager { boolean isBDAScanningEnabled=(scanner!=null && scanner.isBDABeansXmlScanningEnabled()); if(isBDAScanningEnabled && !scanner.getBDABeansXmlScanner().addStereoType(stereo, fileName) || - (!isBDAScanningEnabled && this.stereoAlternatives.contains(stereo)) ) + (!isBDAScanningEnabled && stereoAlternatives.contains(stereo)) ) { throw new WebBeansConfigurationException("Given alternative class : " + alternative.getName() + " is already added as @Alternative" ); } ok = true; - - this.stereoAlternatives.add(stereo); + + stereoAlternatives.add(stereo); } } @@ -91,12 +91,12 @@ public class AlternativesManager { boolean isBDAScanningEnabled=(scanner!=null && scanner.isBDABeansXmlScanningEnabled()); if((isBDAScanningEnabled && !scanner.getBDABeansXmlScanner().addAlternative(alternative, fileName)) || - (!isBDAScanningEnabled && this.alternatives.contains(alternative))) + (!isBDAScanningEnabled && alternatives.contains(alternative))) { throw new WebBeansConfigurationException("Given class : " + alternative.getName() + " is already added as @Alternative" ); } - - this.alternatives.add(alternative); + + alternatives.add(alternative); } else { @@ -106,7 +106,7 @@ public class AlternativesManager public boolean isClassAlternative(Class clazz) { - if(this.alternatives.contains(clazz)) + if(alternatives.contains(clazz)) { return true; } @@ -116,14 +116,14 @@ public class AlternativesManager public boolean isStereoAlternative(Class stereo) { - return this.stereoAlternatives.contains(stereo); + return stereoAlternatives.contains(stereo); } public boolean isBeanHasAlternative(Bean bean) { Class returnType = bean.getBeanClass(); - if(this.alternatives.contains(returnType)) + if(alternatives.contains(returnType)) { return true; } @@ -131,7 +131,7 @@ public class AlternativesManager Set> set = bean.getStereotypes(); for(Class ann : set) { - if(this.stereoAlternatives.contains(ann)) + if(stereoAlternatives.contains(ann)) { return true; } @@ -142,7 +142,7 @@ public class AlternativesManager public void clear() { - this.alternatives.clear(); - this.stereoAlternatives.clear(); + alternatives.clear(); + stereoAlternatives.clear(); } } Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Thu Oct 13 11:11:03 2011 @@ -50,8 +50,8 @@ public class InjectableConstructor ex public InjectableConstructor(Constructor cons, AbstractOwbBean owner,CreationalContext creationalContext) { super(owner,creationalContext); - this.con = cons; - this.injectionMember = con; + con = cons; + injectionMember = con; } /** @@ -62,7 +62,7 @@ public class InjectableConstructor ex { T instance = null; - List injectedPoints = getInjectedPoints(this.con); + List injectedPoints = getInjectedPoints(con); List list = new ArrayList(); @@ -96,4 +96,4 @@ public class InjectableConstructor ex return instance; } -} \ No newline at end of file +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java Thu Oct 13 11:11:03 2011 @@ -42,14 +42,14 @@ public class InjectableField extends Abs super(owner,creationalContext); this.field = field; this.instance = instance; - this.injectionMember = field; + injectionMember = field; } public Object doInjection() { try { - InjectionPoint injectedField = getInjectedPoints(this.field).get(0); + InjectionPoint injectedField = getInjectedPoints(field).get(0); if (!field.isAccessible()) { @@ -68,4 +68,4 @@ public class InjectableField extends Abs return null; } -} \ No newline at end of file +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java Thu Oct 13 11:11:03 2011 @@ -64,9 +64,9 @@ public class InjectableMethods extend public InjectableMethods(Method m, Object instance, OwbBean owner,CreationalContext creationalContext) { super(owner,creationalContext); - this.method = m; + method = m; this.instance = instance; - this.injectionMember = m; + injectionMember = m; } /* @@ -75,7 +75,7 @@ public class InjectableMethods extend */ public T doInjection() { - List injectedPoints = getInjectedPoints(this.method); + List injectedPoints = getInjectedPoints(method); List list = new ArrayList(); @@ -87,15 +87,15 @@ public class InjectableMethods extend if(parameter.getPosition() == i) { boolean injectionPoint = false; - if(this.injectionOwnerBean instanceof ProducerMethodBean) + if(injectionOwnerBean instanceof ProducerMethodBean) { if(parameter.getBaseType().equals(InjectionPoint.class)) { BeanManager manager = injectionOwnerBean.getWebBeansContext().getBeanManagerImpl(); Bean injectionPointBean = manager.getBeans(InjectionPoint.class, new DefaultLiteral()).iterator().next(); Object reference = manager.getReference(injectionPointBean, InjectionPoint.class, manager.createCreationalContext(injectionPointBean)); - - this.dependentParameters.put(injectionPointBean, reference); + + dependentParameters.put(injectionPointBean, reference); list.add(reference); injectionPoint = true; @@ -107,7 +107,7 @@ public class InjectableMethods extend { if(isDisposable() && parameter.getAnnotation(Disposes.class) != null) { - list.add(this.producerMethodInstance); + list.add(producerMethodInstance); } else { @@ -117,7 +117,7 @@ public class InjectableMethods extend Bean injectedBean = (Bean) injectionResolver.getInjectionPointBean(point); if(injectedBean.getScope() == Dependent.class) { - this.dependentParameters.put(injectedBean, instance); + dependentParameters.put(injectedBean, instance); } list.add(instance); @@ -147,7 +147,7 @@ public class InjectableMethods extend public Map,Object> getDependentBeanParameters() { - return this.dependentParameters; + return dependentParameters; } /** @@ -168,6 +168,6 @@ public class InjectableMethods extend public void setProducerMethodInstance(Object instance) { - this.producerMethodInstance = instance; + producerMethodInstance = instance; } -} \ No newline at end of file +} Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java?rev=1182780&r1=1182779&r2=1182780&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java Thu Oct 13 11:11:03 2011 @@ -107,10 +107,10 @@ public final class OWBInjector implement BeanManagerImpl beanManager = webBeansContext.getBeanManagerImpl(); try { - this.javaEEInstance = javaEeComponentInstance; + javaEEInstance = javaEeComponentInstance; if(creationalContext == null) { - this.ownerCreationalContext = (CreationalContextImpl) beanManager.createCreationalContext(null); + ownerCreationalContext = (CreationalContextImpl) beanManager.createCreationalContext(null); } Class injectableComponentClass = (Class)javaEeComponentInstance.getClass(); @@ -119,7 +119,7 @@ public final class OWBInjector implement InjectionTargetWrapper wrapper = beanManager.getInjectionTargetWrapper(injectableComponentClass); if(wrapper != null) { - wrapper.inject(javaEeComponentInstance, (CreationalContext)this.ownerCreationalContext); + wrapper.inject(javaEeComponentInstance, (CreationalContext) ownerCreationalContext); return this; } @@ -178,16 +178,16 @@ public final class OWBInjector implement if(wrapper != null) { wrapper.dispose(javaEEInstance); - this.javaEEInstance = null; - this.ownerCreationalContext = null; + javaEEInstance = null; + ownerCreationalContext = null; } else { - if(this.ownerCreationalContext != null) + if(ownerCreationalContext != null) { - this.ownerCreationalContext.release(); - this.ownerCreationalContext = null; + ownerCreationalContext.release(); + ownerCreationalContext = null; } } }