openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1363032 - in /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans: component/ context/creational/ event/ intercept/ plugins/ portable/events/ proxy/
Date Wed, 18 Jul 2012 18:04:36 GMT
Author: struberg
Date: Wed Jul 18 18:04:35 2012
New Revision: 1363032

URL: http://svn.apache.org/viewvc?rev=1363032&view=rev
Log:
OWB-680 drop unused getInstance() methods

Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorsManager.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/plugins/PluginLoader.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ExtensionLoader.java
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java?rev=1363032&r1=1363031&r2=1363032&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
Wed Jul 18 18:04:35 2012
@@ -112,7 +112,7 @@ public abstract class AbstractOwbBean<T>
      */
     protected String passivatingId = null;
     
-    private final WebBeansContext webBeansContext;
+    protected final WebBeansContext webBeansContext;
 
     /**
      * Constructor definiton. Each subclass redefines its own constructor with

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java?rev=1363032&r1=1363031&r2=1363032&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/BuildInOwbBean.java
Wed Jul 18 18:04:35 2012
@@ -34,7 +34,6 @@ import javassist.util.proxy.MethodHandle
 import javassist.util.proxy.ProxyObject;
 
 import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.proxy.JavassistProxyFactory;
 
 /**
  * Following 3 options are provided for vendor's build-in beans implementation:
@@ -211,8 +210,8 @@ public abstract class BuildInOwbBean<T> 
         {
             return actualInstance;
         }
-        
-        T proxy = (T)JavassistProxyFactory.getInstance().createBuildInBeanProxy(this);
+
+        T proxy = (T) webBeansContext.getJavassistProxyFactory().createBuildInBeanProxy(this);
         if (handlerClassName.equals(PROXY_HANDLER_VALUE_DEFAULT)) 
         {
             ((ProxyObject)proxy).setHandler(new BuildInBeanMethodHandler(this, actualInstance));

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java?rev=1363032&r1=1363031&r2=1363032&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextFactory.java
Wed Jul 18 18:04:35 2012
@@ -44,18 +44,6 @@ public final class CreationalContextFact
     }
 
     /**
-     * Gets singleton instance.
-     *
-     * @return singleton factory per class loader per VM
-     */
-    @SuppressWarnings("unchecked")
-    @Deprecated
-    public static CreationalContextFactory getInstance()
-    {
-        return WebBeansContext.getInstance().getCreationalContextFactory();
-    }
-
-    /**
      * Returns a new creational context for given contextual.
      * 
      * @param contextual contextual instance
@@ -71,4 +59,4 @@ public final class CreationalContextFact
         return new WrappedCreationalContext<T>(contextual, creationalContext, webBeansContext);
     }
     
-}
\ 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=1363032&r1=1363031&r2=1363032&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
Wed Jul 18 18:04:35 2012
@@ -68,11 +68,6 @@ public final class NotificationManager
         this.webBeansContext = webBeansContext;
     }
 
-    public static NotificationManager getInstance()
-    {
-        return WebBeansContext.getInstance().getBeanManagerImpl().getNotificationManager();
-    }
-
     public <T> void addObserver(ObserverMethod<T> observer, Type eventType)
     {
         webBeansContext.getAnnotationManager().checkQualifierConditions(observer.getObservedQualifiers());

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=1363032&r1=1363031&r2=1363032&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
Wed Jul 18 18:04:35 2012
@@ -42,12 +42,6 @@ public class InterceptorsManager
         manager = webBeansContext.getBeanManagerImpl();
     }
 
-    @Deprecated
-    public static InterceptorsManager getInstance()
-    {
-        return WebBeansContext.getInstance().getInterceptorsManager();
-    }
-
     public void addNewInterceptor(Class<?> interceptorClazz)
     {
         Asserts.nullCheckForClass(interceptorClazz, "interceptorClazz can not be null");

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=1363032&r1=1363031&r2=1363032&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
Wed Jul 18 18:04:35 2012
@@ -56,15 +56,6 @@ public class PluginLoader
 
     private AtomicBoolean started = new AtomicBoolean(false);
 
-    /**
-     * @return singleton PluginLoader
-     */
-    @Deprecated
-    public static PluginLoader getInstance()
-    {
-        return WebBeansContext.getInstance().getPluginLoader();
-    }
-
     public PluginLoader()
     {
     }    

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=1363032&r1=1363031&r2=1363032&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
Wed Jul 18 18:04:35 2012
@@ -61,17 +61,6 @@ public class ExtensionLoader
     }
 
     /**
-     * Returns singleton <code>ExtensionLoader</code> instance.
-     *
-     * @return singleton instance
-     */
-    @Deprecated
-    public static ExtensionLoader getInstance()
-    {
-        return WebBeansContext.getInstance().getExtensionLoader();
-    }
-
-    /**
      * Load extension services.
      */
     public void loadExtensionServices()

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java?rev=1363032&r1=1363031&r2=1363032&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
Wed Jul 18 18:04:35 2012
@@ -41,7 +41,6 @@ import org.apache.webbeans.component.Inj
 import org.apache.webbeans.component.OwbBean;
 import org.apache.webbeans.component.ResourceBean;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
-import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.context.creational.CreationalContextImpl;
 import org.apache.webbeans.decorator.WebBeansDecorator;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
@@ -83,12 +82,6 @@ public final class JavassistProxyFactory
         return interceptorProxyClasses;
     }
 
-    @Deprecated
-    public static JavassistProxyFactory getInstance()
-    {
-        return WebBeansContext.getInstance().getJavassistProxyFactory();
-    }
-
     public void clear()
     {
         normalScopedBeanProxyClasses.clear();



Mime
View raw message