Author: struberg
Date: Wed Jul 18 20:15:55 2012
New Revision: 1363092
URL: http://svn.apache.org/viewvc?rev=1363092&view=rev
Log:
OWB-683 remove unused fields and methods
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractOwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/OwbDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/OWBInjector.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.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/ProcessProducerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java?rev=1363092&r1=1363091&r2=1363092&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
(original)
+++
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/util/EjbUtility.java
Wed Jul 18 20:15:55 2012
@@ -119,8 +119,6 @@ public final class EjbUtility
annotatedMethods.put(producerMethod, method);
manager.putInjectionTargetWrapper(producerMethod, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
- producerEvent.setProducerSet(false);
}
Map<ProducerFieldBean<?>,AnnotatedField<?>> annotatedFields = new
HashMap<ProducerFieldBean<?>, AnnotatedField<?>>();
@@ -134,9 +132,6 @@ public final class EjbUtility
annotatedFields.put(producerField, field);
manager.putInjectionTargetWrapper(producerField, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
-
- producerEvent.setProducerSet(false);
}
Map<ObserverMethod<?>,AnnotatedMethod<?>> observerMethodsMap = new
HashMap<ObserverMethod<?>, AnnotatedMethod<?>>();
@@ -210,8 +205,6 @@ public final class EjbUtility
annotatedMethods.put(producerMethod, method);
manager.putInjectionTargetWrapper(producerMethod, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
- producerEvent.setProducerSet(false);
}
// PRODUCER FIELDS
@@ -226,9 +219,6 @@ public final class EjbUtility
annotatedFields.put(producerField, field);
manager.putInjectionTargetWrapper(producerField, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
-
- producerEvent.setProducerSet(false);
}
//Fires ProcessProducerMethod
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=1363092&r1=1363091&r2=1363092&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 20:15:55 2012
@@ -398,16 +398,6 @@ public abstract class AbstractOwbBean<T>
}
/**
- * Get qualifiers.
- *
- * @return qualifiers
- */
- public Set<Annotation> getImplQualifiers()
- {
- return implQualifiers;
- }
-
- /**
* Gets the stereotypes.
*
* @return stereotypes of the bean
@@ -442,7 +432,7 @@ public abstract class AbstractOwbBean<T>
}
else
{
- throw new UnsupportedOperationException("Component name is not
null, is " + this.name);
+ throw new UnsupportedOperationException("Component name is already
set to: " + this.name);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java?rev=1363092&r1=1363091&r2=1363092&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/OwbBean.java
Wed Jul 18 20:15:55 2012
@@ -103,13 +103,6 @@ public interface OwbBean<T> extends Bean
public void addInjectionPoint(InjectionPoint injectionPoint);
/**
- * Returns set of qualifier annotations.
- *
- * @return set of qualifier annotations
- */
- public Set<Annotation> getImplQualifiers();
-
- /**
* Gets stereotypes annotations.
*/
public Set<Annotation> getOwbStereotypes();
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/OwbDecorator.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/OwbDecorator.java?rev=1363092&r1=1363091&r2=1363092&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/OwbDecorator.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/OwbDecorator.java
Wed Jul 18 20:15:55 2012
@@ -25,7 +25,6 @@ import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.inject.spi.Decorator;
-import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.InterceptedMarker;
public interface OwbDecorator<T> extends Decorator<T>, InterceptedMarker
@@ -35,7 +34,4 @@ public interface OwbDecorator<T> extends
public void setDelegate(Object instance, Object delegate);
public void setInjections(Object proxy, CreationalContext<?>
cretionalContext);
-
- public AbstractOwbBean<T> getDelegateComponent();
-
}
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=1363092&r1=1363091&r2=1363092&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
Wed Jul 18 20:15:55 2012
@@ -19,7 +19,6 @@
package org.apache.webbeans.decorator;
import org.apache.webbeans.component.AbstractInjectionTargetBean;
-import org.apache.webbeans.component.AbstractOwbBean;
import org.apache.webbeans.component.ManagedBean;
import org.apache.webbeans.component.WebBeansType;
import org.apache.webbeans.config.OWBLogConst;
@@ -504,14 +503,6 @@ public class WebBeansDecorator<T> extend
return wrappedBean.isSerializable();
}
- /**
- * @return the delegateComponent
- */
- public AbstractOwbBean<T> getDelegateComponent()
- {
- return wrappedBean;
- }
-
public Set<InjectionPoint> getInjectionPoints()
{
if(customDecorator != null)
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=1363092&r1=1363091&r2=1363092&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
Wed Jul 18 20:15:55 2012
@@ -68,11 +68,6 @@ public final class OWBInjector implement
private final WebBeansContext webBeansContext;
- public OWBInjector()
- {
- this(WebBeansContext.getInstance());
- }
-
/**
* Creates a new instance
* @param webBeansContext
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java?rev=1363092&r1=1363091&r2=1363092&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/OwbInterceptor.java
Wed Jul 18 20:15:55 2012
@@ -42,7 +42,5 @@ public interface OwbInterceptor<T> exten
public Set<Interceptor<?>> getMetaInceptors();
- public void setClazz(Class<?> clazz);
-
- public void setInjections(Object proxy, CreationalContext<?>
creationalContext);
+ public void setInjections(Object proxy, CreationalContext<?>
creationalContext);
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=1363092&r1=1363091&r2=1363092&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
Wed Jul 18 20:15:55 2012
@@ -234,16 +234,6 @@ public class WebBeansInterceptor<T> exte
return set;
}
- /**
- * Sets interceptor class.
- *
- * @param clazz class instance
- */
- public void setClazz(Class<?> clazz)
- {
- this.clazz = clazz;
- }
-
public Set<Annotation> getInterceptorBindings()
{
Set<Annotation> set = new HashSet<Annotation>();
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=1363092&r1=1363091&r2=1363092&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 20:15:55 2012
@@ -278,9 +278,4 @@ public class PluginLoader
return true;
}
-
- public boolean isShowDown()
- {
- return !started.get();
- }
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java?rev=1363092&r1=1363091&r2=1363092&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerImpl.java
Wed Jul 18 20:15:55 2012
@@ -40,9 +40,6 @@ public class ProcessProducerImpl<X,T> im
/**Used by container to produce instance for producer method or field*/
private Producer<T> producer = null;
- /**Set or not*/
- private boolean set;
-
public ProcessProducerImpl(Producer<T> producer,AnnotatedMember<X>
annotateMember)
{
this.annotateMember = annotateMember;
@@ -79,22 +76,5 @@ public class ProcessProducerImpl<X,T> im
public void setProducer(Producer<T> producer)
{
this.producer = producer;
- set = true;
- }
-
- /**
- * Returns set or not.
- *
- * @return set or not
- */
- public boolean isProducerSet()
- {
- return set;
}
-
- public void setProducerSet(boolean set)
- {
- this.set = set;
- }
-
}
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=1363092&r1=1363091&r2=1363092&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
Wed Jul 18 20:15:55 2012
@@ -2645,8 +2645,6 @@ public final class WebBeansUtil
annotatedMethods.put(producerMethod, method);
manager.putInjectionTargetWrapper(producerMethod, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
- producerEvent.setProducerSet(false);
}
Map<ProducerFieldBean<?>,AnnotatedField<?>> annotatedFields =
@@ -2663,8 +2661,6 @@ public final class WebBeansUtil
annotatedFields.put(producerField, field);
manager.putInjectionTargetWrapper(producerField, new
InjectionTargetWrapper(producerEvent.getProducer()));
-
- producerEvent.setProducerSet(false);
}
Map<ObserverMethod<?>,AnnotatedMethod<?>> observerMethodsMap =
