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/01/17 16:32:46 UTC
svn commit: r1434726 - in
/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ManagedBean.java decorator/WebBeansDecorator.java
proxy/ProxyFactory.java util/WebBeansUtil.java
Author: struberg
Date: Thu Jan 17 15:32:46 2013
New Revision: 1434726
URL: http://svn.apache.org/viewvc?rev=1434726&view=rev
Log:
OWB-344 and remove even more unused code...
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java?rev=1434726&r1=1434725&r2=1434726&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ManagedBean.java Thu Jan 17 15:32:46 2013
@@ -40,8 +40,6 @@ public class ManagedBean<T> extends Inje
/** Constructor of the web bean component */
private Constructor<T> constructor;
- protected boolean isAbstractDecorator;
-
public ManagedBean(WebBeansContext webBeansContext,
WebBeansType webBeansType,
AnnotatedType<T> annotatedType,
@@ -128,9 +126,5 @@ public class ManagedBean<T> extends Inje
/** cache previously calculated result */
private Boolean isPassivationCapable = null;
-
- public void setIsAbstractDecorator(boolean flag)
- {
- isAbstractDecorator = flag;
- }
+
}
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=1434726&r1=1434725&r2=1434726&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 Jan 17 15:32:46 2013
@@ -434,20 +434,6 @@ public class WebBeansDecorator<T> extend
}
-
- /**
- * @return the clazz
- */
- public Class<?> getClazz()
- {
- if(customDecorator != null)
- {
- return customDecorator.getBeanClass();
- }
-
- return clazz;
- }
-
@Override
public Class<?> getBeanClass()
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java?rev=1434726&r1=1434725&r2=1434726&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProxyFactory.java Thu Jan 17 15:32:46 2013
@@ -41,7 +41,6 @@ import org.apache.webbeans.decorator.Del
import org.apache.webbeans.decorator.WebBeansDecorator;
import org.apache.webbeans.intercept.DependentScopedBeanInterceptorHandlerRemove;
import org.apache.webbeans.intercept.InterceptorData;
-import org.apache.webbeans.intercept.InterceptorHandlerPleaseRemove;
import org.apache.webbeans.intercept.webbeans.WebBeansInterceptorBeanPleaseRemove;
import org.apache.webbeans.proxy.javassist.JavassistFactory;
import org.apache.webbeans.util.ClassUtil;
@@ -70,12 +69,6 @@ public final class ProxyFactory
{
}
- /**
- * This map contains all configured special Scope->InterceptorHandler mappings.
- * If no mapping is configured, a {@link org.apache.webbeans.intercept.NormalScopedBeanInterceptorHandlerRemove} will get created.
- */
- private Map<String, Class<? extends InterceptorHandlerPleaseRemove>> interceptorHandlerClasses =
- new ConcurrentHashMap<String, Class<? extends InterceptorHandlerPleaseRemove>>();
public void setHandler(Object proxy, MethodHandler handler)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1434726&r1=1434725&r2=1434726&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Thu Jan 17 15:32:46 2013
@@ -2465,7 +2465,6 @@ public final class WebBeansUtil
Class clazz = webBeansContext.getProxyFactoryRemove().createAbstractDecoratorProxyClass(bean);
bean.setConstructor(defineConstructor(clazz));
- bean.setIsAbstractDecorator(true);
return bean;
}