You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2013/02/13 22:37:58 UTC
svn commit: r1445941 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component:
AbstractOwbBean.java AbstractProducerBean.java DecoratorBean.java
Author: struberg
Date: Wed Feb 13 21:37:57 2013
New Revision: 1445941
URL: http://svn.apache.org/r1445941
Log:
OWB-344 remove now unused dead code
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/AbstractProducerBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.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=1445941&r1=1445940&r2=1445941&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 Feb 13 21:37:57 2013
@@ -36,7 +36,6 @@ import javax.enterprise.inject.spi.Produ
import org.apache.webbeans.config.OWBLogConst;
import org.apache.webbeans.config.WebBeansContext;
-import org.apache.webbeans.container.BeanManagerImpl;
import org.apache.webbeans.context.creational.CreationalContextImpl;
import org.apache.webbeans.logger.WebBeansLoggerFacade;
@@ -98,16 +97,6 @@ public abstract class AbstractOwbBean<T>
return webBeansContext;
}
- /**
- * Gets manager instance
- *
- * @return manager instance
- */
- protected BeanManagerImpl getManager()
- {
- return webBeansContext.getBeanManagerImpl();
- }
-
@Override
public Class<?> getBeanClass()
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java?rev=1445941&r1=1445940&r2=1445941&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractProducerBean.java Wed Feb 13 21:37:57 2013
@@ -22,7 +22,6 @@ import java.io.Serializable;
import java.lang.reflect.Modifier;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.PassivationCapable;
@@ -76,24 +75,6 @@ public abstract class AbstractProducerBe
// Do nothing
}
- /**
- * Destroys bean.
- *
- * @param <K> bean type info
- * @param bean bean info
- * @param instance bean instance
- */
- @SuppressWarnings("unchecked")
- protected <K> void destroyBean(Bean<?> bean, Object instance, CreationalContext<?> creationalContext)
- {
- Bean<K> destroy = (Bean<K>) bean;
- K inst = (K) instance;
-
- CreationalContext<K> cc = (CreationalContext<K>) creationalContext;
- destroy.destroy(inst, cc);
- }
-
-
protected boolean isPassivationCapable(Class<?> returnType, Integer modifiers)
{
if(Modifier.isFinal(modifiers) && !(Serializable.class.isAssignableFrom(returnType)))
@@ -109,13 +90,6 @@ public abstract class AbstractProducerBe
return false;
}
- public void validatePassivationDependencies()
- {
- // don't call super.validatePassivationDependencies()!
- // the injection points of producers are the parameters of the producermethod.
- // since CDI-1.1 we must not check those for is serializable anymore.
- }
-
@Override
public int hashCode()
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java?rev=1445941&r1=1445940&r2=1445941&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/DecoratorBean.java Wed Feb 13 21:37:57 2013
@@ -21,7 +21,6 @@ package org.apache.webbeans.component;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Decorator;
import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
import java.util.Set;
@@ -32,11 +31,6 @@ import org.apache.webbeans.config.WebBea
*/
public class DecoratorBean<T> extends InjectionTargetBean<T> implements Decorator<T>
{
- /*
- * Constructor of the Decorator component
- */
- private Constructor<T> constructor;
-
/**
* The Types the decorator itself implements
*/
@@ -86,14 +80,4 @@ public class DecoratorBean<T> extends In
{
return delegateQualifiers;
}
-
- public void setConstructor(Constructor<T> constructor)
- {
- this.constructor = constructor;
- }
-
- public Constructor<T> getConstructor()
- {
- return constructor;
- }
}