svn commit: r1042052 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: config/WebBeansContext.java container/BeanManagerImpl.java intercept/InterceptorsManager.java

[dblevins]

Author: dblevins
Date: Fri Dec  3 23:52:32 2010
New Revision: 1042052

URL: http://svn.apache.org/viewvc?rev=1042052&view=rev
Log:
Removed some static references that simply resulted in 'this' being returned
OWB-503 status: 544 code usages, 263646 runtime calls

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java?rev=1042052&r1=1042051&r2=1042052&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContext.java
 Fri Dec  3 23:52:32 2010
@@ -38,6 +38,7 @@ import org.apache.webbeans.util.ClassUti
 import org.apache.webbeans.xml.WebBeansNameSpaceContainer;
 import org.apache.webbeans.xml.XMLAnnotationTypeManager;
 import org.apache.webbeans.xml.XMLSpecializesManager;
+import util.Track;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -191,7 +192,7 @@ public class WebBeansContext
 
     public Object get(String singletonName)
     {
-
+//        Track.get(singletonName);
         Object object = managerMap.get(singletonName);
 
         /* No singleton for this application, create one */

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1042052&r1=1042051&r2=1042052&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
 Fri Dec  3 23:52:32 2010
@@ -508,13 +508,13 @@ public class BeanManagerImpl implements 
     
     public Set<Bean<?>> getComponents()
     {
-        return getManager().deploymentBeans;
+        return deploymentBeans;
     }
     
     
     public BeanManager addDecorator(Decorator decorator)
     {
-        getManager().webBeansDecorators.add(decorator);
+        webBeansDecorators.add(decorator);
         if (decorator instanceof OwbBean)
         {
             OwbBean<?> owbBean = (OwbBean<?>)decorator;
@@ -530,7 +530,7 @@ public class BeanManagerImpl implements 
     
     public BeanManager addInterceptor(Interceptor interceptor)
     {
-        getManager().webBeansInterceptors.add(interceptor);
+        webBeansInterceptors.add(interceptor);
         if (interceptor instanceof OwbBean)
         {
             OwbBean<?> owbBean = (OwbBean<?>)interceptor;

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=1042052&r1=1042051&r2=1042052&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
 Fri Dec  3 23:52:32 2010
@@ -52,7 +52,7 @@ public class InterceptorsManager
 
         if (!enabledInterceptors.contains(interceptorClazz))
         {
-            getInstance().enabledInterceptors.add(interceptorClazz);
+            enabledInterceptors.add(interceptorClazz);
         }
     }
 
@@ -88,7 +88,7 @@ public class InterceptorsManager
     {
         Asserts.nullCheckForClass(interceptorClazz, "interceptorClazz can not 
be null");
 
-        return getInstance().enabledInterceptors.contains(interceptorClazz);
+        return enabledInterceptors.contains(interceptorClazz);
     }
     
     public void validateInterceptorClasses()