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 2011/10/13 15:31:39 UTC
svn commit: r1182847 [1/2] - in /openwebbeans/trunk:
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/
webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/
webbeans-el10/src/main/java/org/apache/webbeans/el10/
webbeans-impl/src/mai...
Author: struberg
Date: Thu Oct 13 13:31:37 2011
New Revision: 1182847
URL: http://svn.apache.org/viewvc?rev=1182847&view=rev
Log:
OWB-615 remove @Override for interfaces (java5 compat)
Modified:
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Adaptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/SimpleSecurityService.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/AbstractDecoratorMethodHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/el22/EL22Adaptor.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.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/logger/WebBeansLogger.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.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/portable/events/ProcessProducerMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObservableMethod.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerField.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessProducerMethod.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessSessionBean.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ProvidedBeansProxyHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/ResourceProxyHandler.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/OpenWebBeansClassLoaderProvider.java
Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/common/proxy/EjbBeanProxyHandler.java Thu Oct 13 13:31:37 2011
@@ -103,7 +103,6 @@ public class EjbBeanProxyHandler impleme
/**
* {@inheritDoc}
*/
- @Override
public Object invoke(Object proxyInstance, Method method, Method proceed, Object[] arguments) throws Exception
{
Object result = null;
@@ -311,7 +310,6 @@ public class EjbBeanProxyHandler impleme
this.dependentEJB = s.readObject();
}
- @Override
public void writeExternal(ObjectOutput out) throws IOException
{
// we have to write the ids for all beans, not only PassivationCapable
@@ -336,7 +334,6 @@ public class EjbBeanProxyHandler impleme
out.writeObject(this.dependentEJB);
}
- @Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException
{
Modified: openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java (original)
+++ openwebbeans/trunk/webbeans-ejb/src/main/java/org/apache/webbeans/ejb/plugin/OpenWebBeansEjbLCAPluginImpl.java Thu Oct 13 13:31:37 2011
@@ -38,19 +38,16 @@ public class OpenWebBeansEjbLCAPluginImp
super();
}
- @Override
public Class<? extends Annotation> getPrePassivateClass()
{
return PrePassivate.class;
}
- @Override
public Class<? extends Annotation> getPostActivateClass()
{
return PostActivate.class;
}
- @Override
public Class<? extends Annotation> getAroundTimeoutClass()
{
return AroundTimeout.class;
Modified: openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Adaptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Adaptor.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Adaptor.java (original)
+++ openwebbeans/trunk/webbeans-el10/src/main/java/org/apache/webbeans/el10/EL10Adaptor.java Thu Oct 13 13:31:37 2011
@@ -26,13 +26,11 @@ import org.apache.webbeans.spi.adaptor.E
public class EL10Adaptor implements ELAdaptor
{
- @Override
public ELResolver getOwbELResolver()
{
return new EL10Resolver();
}
- @Override
public ExpressionFactory getOwbWrappedExpressionFactory(ExpressionFactory expressionFactory)
{
return new EL10WrappedExpressionFactory(expressionFactory);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/InjectionTargetWrapper.java Thu Oct 13 13:31:37 2011
@@ -72,7 +72,6 @@ public class InjectionTargetWrapper<T> i
/**
* {@inheritDoc}
*/
- @Override
public void inject(T instance, CreationalContext<T> ctx)
{
if(wrapped != null)
@@ -84,7 +83,6 @@ public class InjectionTargetWrapper<T> i
/**
* {@inheritDoc}
*/
- @Override
public void postConstruct(T instance)
{
if(wrapped != null)
@@ -96,7 +94,6 @@ public class InjectionTargetWrapper<T> i
/**
* {@inheritDoc}
*/
- @Override
public void preDestroy(T instance)
{
if(wrapped != null)
@@ -108,7 +105,6 @@ public class InjectionTargetWrapper<T> i
/**
* {@inheritDoc}
*/
- @Override
public void dispose(T instance)
{
if(wrappedProducer != null)
@@ -120,7 +116,6 @@ public class InjectionTargetWrapper<T> i
/**
* {@inheritDoc}
*/
- @Override
public Set<InjectionPoint> getInjectionPoints()
{
if(wrappedProducer != null)
@@ -134,7 +129,6 @@ public class InjectionTargetWrapper<T> i
/**
* {@inheritDoc}
*/
- @Override
public T produce(CreationalContext<T> creationalContext)
{
if(wrappedProducer != null)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractBeanCreator.java Thu Oct 13 13:31:37 2011
@@ -72,7 +72,6 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- @Override
public void checkCreateConditions()
{
//Sub-class can override this
@@ -81,7 +80,6 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- @Override
public void defineApiType()
{
if(isDefaultMetaDataProvider())
@@ -107,7 +105,6 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- @Override
public void defineQualifier()
{
if(isDefaultMetaDataProvider())
@@ -124,7 +121,6 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- @Override
public void defineName(String defaultName)
{
if(isDefaultMetaDataProvider())
@@ -142,7 +138,6 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- @Override
public void defineScopeType(String errorMessage, boolean allowLazyInit)
{
if(isDefaultMetaDataProvider())
@@ -158,7 +153,6 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- @Override
public void defineSerializable()
{
definitionUtil.defineSerializable(bean);
@@ -167,7 +161,6 @@ public class AbstractBeanCreator<T> impl
/**
* {@inheritDoc}
*/
- @Override
public void defineStereoTypes()
{
if(isDefaultMetaDataProvider())
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/AbstractInjectedTargetBeanCreator.java Thu Oct 13 13:31:37 2011
@@ -50,7 +50,6 @@ public abstract class AbstractInjectedTa
/**
* {@inheritDoc}
*/
- @Override
public void defineDisposalMethods()
{
AbstractInjectionTargetBean bean = getBean();
@@ -69,7 +68,6 @@ public abstract class AbstractInjectedTa
/**
* {@inheritDoc}
*/
- @Override
public void defineInjectedFields()
{
AbstractInjectionTargetBean bean = getBean();
@@ -87,7 +85,6 @@ public abstract class AbstractInjectedTa
/**
* {@inheritDoc}
*/
- @Override
public void defineInjectedMethods()
{
AbstractInjectionTargetBean bean = getBean();
@@ -105,7 +102,6 @@ public abstract class AbstractInjectedTa
/**
* {@inheritDoc}
*/
- @Override
public Set<ObserverMethod<?>> defineObserverMethods()
{
AbstractInjectionTargetBean bean = getBean();
@@ -122,7 +118,6 @@ public abstract class AbstractInjectedTa
/**
* {@inheritDoc}
*/
- @Override
public Set<ProducerFieldBean<?>> defineProducerFields()
{
AbstractInjectionTargetBean bean = getBean();
@@ -139,7 +134,6 @@ public abstract class AbstractInjectedTa
/**
* {@inheritDoc}
*/
- @Override
public Set<ProducerMethodBean<?>> defineProducerMethods()
{
AbstractInjectionTargetBean bean = getBean();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/creation/ManagedBeanCreatorImpl.java Thu Oct 13 13:31:37 2011
@@ -74,7 +74,6 @@ public class ManagedBeanCreatorImpl<T> e
/**
* {@inheritDoc}
*/
- @Override
public void defineConstructor()
{
Constructor<T> constructor;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OpenWebBeansConfiguration.java Thu Oct 13 13:31:37 2011
@@ -229,7 +229,6 @@ public class OpenWebBeansConfiguration
return AccessController.doPrivileged(
new PrivilegedAction<Properties>()
{
- @Override
public Properties run()
{
return System.getProperties();
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=1182847&r1=1182846&r2=1182847&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 Thu Oct 13 13:31:37 2011
@@ -614,7 +614,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindingTypes)
{
webBeansContext.getAnnotationManager().checkDecoratorResolverParams(types, bindingTypes);
@@ -638,7 +637,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings)
{
webBeansContext.getAnnotationManager().checkInterceptorResolverParams(interceptorBindings);
@@ -735,7 +733,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public <T> AnnotatedType<T> createAnnotatedType(Class<T> type)
{
AnnotatedType<T> annotatedType = annotatedElementFactory.newAnnotatedType(type);
@@ -746,7 +743,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public <T> CreationalContext<T> createCreationalContext(Contextual<T> contextual)
{
if (contextual instanceof SerializableBean)
@@ -760,7 +756,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public Set<Bean<?>> getBeans(Type beanType, Annotation... bindings)
{
if(ClassUtil.isTypeVariable(beanType))
@@ -774,7 +769,6 @@ public class BeanManagerImpl implements
}
- @Override
public Set<Bean<?>> getBeans(String name)
{
Asserts.assertNotNull(name, "name parameter can not be null");
@@ -782,7 +776,6 @@ public class BeanManagerImpl implements
return injectionResolver.implResolveByName(name);
}
- @Override
public ELResolver getELResolver()
{
ELAdaptor elAdaptor = webBeansContext.getService(ELAdaptor.class);
@@ -792,7 +785,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> ownerCreationalContext)
{
Asserts.assertNotNull(injectionPoint, "injectionPoint parameter can not be null");
@@ -860,7 +852,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> binding)
{
Annotation[] annotations = binding.getDeclaredAnnotations();
@@ -885,7 +876,6 @@ public class BeanManagerImpl implements
return specialized;
}
- @Override
public Bean<?> getPassivationCapableBean(String id)
{
return passivationBeans.get(id);
@@ -894,7 +884,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> creationalContext)
{
Asserts.assertNotNull(bean, "bean parameter can not be null");
@@ -1005,7 +994,6 @@ public class BeanManagerImpl implements
}
- @Override
public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype)
{
Annotation[] annotations = stereotype.getDeclaredAnnotations();
@@ -1022,19 +1010,16 @@ public class BeanManagerImpl implements
return set;
}
- @Override
public boolean isQualifier(Class<? extends Annotation> annotationType)
{
return webBeansContext.getAnnotationManager().isQualifierAnnotation(annotationType);
}
- @Override
public boolean isInterceptorBinding(Class<? extends Annotation> annotationType)
{
return webBeansContext.getAnnotationManager().isInterceptorBindingAnnotation(annotationType);
}
- @Override
public boolean isScope(Class<? extends Annotation> annotationType)
{
if(AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), Scope.class) ||
@@ -1054,7 +1039,6 @@ public class BeanManagerImpl implements
return false;
}
- @Override
public boolean isNormalScope(Class<? extends Annotation> annotationType)
{
for (ExternalScope extScope : additionalScopes)
@@ -1068,7 +1052,6 @@ public class BeanManagerImpl implements
return AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), NormalScope.class);
}
- @Override
public boolean isPassivatingScope(Class<? extends Annotation> annotationType)
{
for (ExternalScope extScope : additionalScopes)
@@ -1089,13 +1072,11 @@ public class BeanManagerImpl implements
}
- @Override
public boolean isStereotype(Class<? extends Annotation> annotationType)
{
return AnnotationUtil.hasAnnotation(annotationType.getDeclaredAnnotations(), Stereotype.class);
}
- @Override
public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans)
{
Set set = new HashSet<Bean<Object>>();
@@ -1122,7 +1103,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public void validate(InjectionPoint injectionPoint)
{
Bean<?> bean = injectionPoint.getBean();
@@ -1152,7 +1132,6 @@ public class BeanManagerImpl implements
/**
* {@inheritDoc}
*/
- @Override
public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type)
{
InjectionTargetBean<T> bean = webBeansContext.getWebBeansUtil().defineManagedBean(type);
@@ -1165,7 +1144,6 @@ public class BeanManagerImpl implements
return new InjectionTargetProducer<T>(bean);
}
- @Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods( T event, Annotation... qualifiers )
{
if(ClassUtil.isDefinitionContainsTypeVariables(event.getClass()))
@@ -1176,7 +1154,6 @@ public class BeanManagerImpl implements
return notificationManager.resolveObservers(event, qualifiers);
}
- @Override
public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory)
{
ELAdaptor elAdaptor = webBeansContext.getService(ELAdaptor.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectableBeanManager.java Thu Oct 13 13:31:37 2011
@@ -73,163 +73,135 @@ public class InjectableBeanManager imple
bm = WebBeansContext.getInstance().getBeanManagerImpl();
}
- @Override
public <T> AnnotatedType<T> createAnnotatedType(Class<T> type)
{
return bm.createAnnotatedType(type);
}
- @Override
public <T> CreationalContext<T> createCreationalContext(Contextual<T> contextual)
{
return bm.createCreationalContext(contextual);
}
- @Override
public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type)
{
return bm.createInjectionTarget(type);
}
- @Override
public void fireEvent(Object event, Annotation... qualifiers)
{
bm.fireEvent(event, qualifiers);
}
- @Override
public Set<Bean<?>> getBeans(String name)
{
return bm.getBeans(name);
}
- @Override
public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers)
{
return bm.getBeans(beanType, qualifiers);
}
- @Override
public Context getContext(Class<? extends Annotation> scope)
{
return bm.getContext(scope);
}
- @Override
public ELResolver getELResolver()
{
return bm.getELResolver();
}
- @Override
public Object getInjectableReference(InjectionPoint injectionPoint, CreationalContext<?> ctx)
{
return bm.getInjectableReference(injectionPoint, ctx);
}
- @Override
public Set<Annotation> getInterceptorBindingDefinition(Class<? extends Annotation> qualifier)
{
return bm.getInterceptorBindingDefinition(qualifier);
}
- @Override
public Bean<?> getPassivationCapableBean(String id)
{
return bm.getPassivationCapableBean(id);
}
- @Override
public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?> ctx)
{
return bm.getReference(bean, beanType, ctx);
}
- @Override
public Set<Annotation> getStereotypeDefinition(Class<? extends Annotation> stereotype)
{
return bm.getStereotypeDefinition(stereotype);
}
- @Override
public boolean isInterceptorBinding(Class<? extends Annotation> annotationType)
{
return bm.isInterceptorBinding(annotationType);
}
- @Override
public boolean isNormalScope(Class<? extends Annotation> annotationType)
{
return bm.isNormalScope(annotationType);
}
- @Override
public boolean isPassivatingScope(Class<? extends Annotation> annotationType)
{
return bm.isPassivatingScope(annotationType);
}
- @Override
public boolean isQualifier(Class<? extends Annotation> annotationType)
{
return bm.isQualifier(annotationType);
}
- @Override
public boolean isScope(Class<? extends Annotation> annotationType)
{
return bm.isScope(annotationType);
}
- @Override
public boolean isStereotype(Class<? extends Annotation> annotationType)
{
return bm.isStereotype(annotationType);
}
- @Override
public <X> Bean<? extends X> resolve(Set<Bean<? extends X>> beans)
{
return bm.resolve(beans);
}
- @Override
public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... qualifiers)
{
return bm.resolveDecorators(types, qualifiers);
}
- @Override
public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings)
{
return bm.resolveInterceptors(type, interceptorBindings);
}
- @Override
public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(T event, Annotation... qualifiers)
{
return bm.resolveObserverMethods(event, qualifiers);
}
- @Override
public void validate(InjectionPoint injectionPoint)
{
bm.validate(injectionPoint);
}
- @Override
public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory)
{
return bm.wrapExpressionFactory(expressionFactory);
}
- @Override
public void writeExternal(ObjectOutput out) throws IOException
{
}
- @Override
- @SuppressWarnings("deprecated")
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/SerializableBean.java Thu Oct 13 13:31:37 2011
@@ -69,73 +69,61 @@ public final class SerializableBean<T> i
this.bean = bean;
}
- @Override
public Set<Type> getTypes()
{
return bean.getTypes();
}
- @Override
public Set<Annotation> getQualifiers()
{
return bean.getQualifiers();
}
- @Override
public Class<? extends Annotation> getScope()
{
return bean.getScope();
}
- @Override
public String getName()
{
return bean.getName();
}
- @Override
public boolean isNullable()
{
return bean.isNullable();
}
- @Override
public Set<InjectionPoint> getInjectionPoints()
{
return bean.getInjectionPoints();
}
- @Override
public Class<?> getBeanClass()
{
return bean.getBeanClass();
}
- @Override
public Set<Class<? extends Annotation>> getStereotypes()
{
return bean.getStereotypes();
}
- @Override
public boolean isAlternative()
{
return bean.isAlternative();
}
- @Override
public T create(CreationalContext<T> tCreationalContext)
{
return bean.create(tCreationalContext);
}
- @Override
public void destroy(T instance, CreationalContext<T> tCreationalContext)
{
bean.destroy(instance, tCreationalContext);
}
- @Override
public String getId()
{
return ((OwbBean<?>) bean).getId();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContextsService.java Thu Oct 13 13:31:37 2011
@@ -28,44 +28,37 @@ import org.apache.webbeans.spi.ContextsS
public abstract class AbstractContextsService implements ContextsService
{
- @Override
public void destroy(Object destroyObject)
{
//Default no-op
}
- @Override
public void endContext(Class<? extends Annotation> scopeType, Object endParameters)
{
//Default no-op
}
- @Override
public Context getCurrentContext(Class<? extends Annotation> scopeType)
{
return null;
}
- @Override
public void init(Object initializeObject)
{
//Default no-op
}
- @Override
public void startContext(Class<? extends Annotation> scopeType, Object startParameter) throws ContextException
{
//Default no-op
}
- @Override
public boolean supportsContext(Class<? extends Annotation> scopeType)
{
return false;
}
- @Override
public void activateContext(Class<? extends Annotation> scopeType)
{
if(supportsContext(scopeType))
@@ -78,7 +71,6 @@ public abstract class AbstractContextsSe
}
}
- @Override
public void deActivateContext(Class<? extends Annotation> scopeType)
{
if(supportsContext(scopeType))
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/creational/CreationalContextImpl.java Thu Oct 13 13:31:37 2011
@@ -332,7 +332,6 @@ public class CreationalContextImpl<T> im
/**
* {@inheritDoc}
*/
- @Override
public void release()
{
removeAllDependents();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java Thu Oct 13 13:31:37 2011
@@ -121,7 +121,6 @@ public class ConversationImpl implements
/**
* {@inheritDoc}
*/
- @Override
public void begin()
{
//Transient state
@@ -158,7 +157,6 @@ public class ConversationImpl implements
/**
* {@inheritDoc}
*/
- @Override
public void begin(String id)
{
//Look at other conversation, that may collate with this is
@@ -182,7 +180,6 @@ public class ConversationImpl implements
/**
* {@inheritDoc}
*/
- @Override
public void end()
{
if(!isTransient)
@@ -227,7 +224,6 @@ public class ConversationImpl implements
/**
* {@inheritDoc}
*/
- @Override
public String getId()
{
return id;
@@ -236,7 +232,6 @@ public class ConversationImpl implements
/**
* {@inheritDoc}
*/
- @Override
public long getTimeout()
{
return timeout;
@@ -245,7 +240,6 @@ public class ConversationImpl implements
/**
* {@inheritDoc}
*/
- @Override
public boolean isTransient()
{
return isTransient;
@@ -254,7 +248,6 @@ public class ConversationImpl implements
/**
* {@inheritDoc}
*/
- @Override
public void setTimeout(long milliseconds)
{
timeout = milliseconds;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/DefaultSingletonService.java Thu Oct 13 13:31:37 2011
@@ -103,7 +103,6 @@ public class DefaultSingletonService imp
/**
* {@inheritDoc}
*/
- @Override
public void clear(Object classLoader)
{
assertClassLoaderKey(classLoader);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/ManagedSecurityService.java Thu Oct 13 13:31:37 2011
@@ -90,14 +90,12 @@ public class ManagedSecurityService impl
}
}
- @Override
public Principal getCurrentPrincipal()
{
// no pricipal by default
return null;
}
- @Override
public <T> Constructor<T> doPrivilegedGetDeclaredConstructor(Class<T> clazz, Class<?>... parameterTypes)
{
Object obj = AccessController.doPrivileged(
@@ -109,7 +107,6 @@ public class ManagedSecurityService impl
return (Constructor<T>)obj;
}
- @Override
public <T> Constructor<?>[] doPrivilegedGetDeclaredConstructors(Class<T> clazz)
{
Object obj = AccessController.doPrivileged(
@@ -117,7 +114,6 @@ public class ManagedSecurityService impl
return (Constructor<T>[])obj;
}
- @Override
public <T> Method doPrivilegedGetDeclaredMethod(Class<T> clazz, String name, Class<?>... parameterTypes)
{
Object obj = AccessController.doPrivileged(
@@ -129,7 +125,6 @@ public class ManagedSecurityService impl
return (Method)obj;
}
- @Override
public <T> Method[] doPrivilegedGetDeclaredMethods(Class<T> clazz)
{
Object obj = AccessController.doPrivileged(
@@ -137,7 +132,6 @@ public class ManagedSecurityService impl
return (Method[])obj;
}
- @Override
public <T> Field doPrivilegedGetDeclaredField(Class<T> clazz, String name)
{
Object obj = AccessController.doPrivileged(
@@ -149,7 +143,6 @@ public class ManagedSecurityService impl
return (Field)obj;
}
- @Override
public <T> Field[] doPrivilegedGetDeclaredFields(Class<T> clazz)
{
Object obj = AccessController.doPrivileged(
@@ -157,37 +150,31 @@ public class ManagedSecurityService impl
return (Field[])obj;
}
- @Override
public void doPrivilegedSetAccessible(AccessibleObject obj, boolean flag)
{
AccessController.doPrivileged(new PrivilegedActionForSetAccessible(obj, flag));
}
- @Override
public boolean doPrivilegedIsAccessible(AccessibleObject obj)
{
return (Boolean) AccessController.doPrivileged(new PrivilegedActionForIsAccessible(obj));
}
- @Override
public <T> T doPrivilegedObjectCreate(Class<T> clazz) throws PrivilegedActionException, IllegalAccessException, InstantiationException
{
return (T) AccessController.doPrivileged(new PrivilegedActionForObjectCreation(clazz));
}
- @Override
public void doPrivilegedSetSystemProperty(String propertyName, String value)
{
AccessController.doPrivileged(new PrivilegedActionForSetProperty(propertyName, value));
}
- @Override
public String doPrivilegedGetSystemProperty(String propertyName, String defaultValue)
{
return AccessController.doPrivileged(new PrivilegedActionForProperty(propertyName, defaultValue));
}
- @Override
public Properties doPrivilegedGetSystemProperties()
{
return AccessController.doPrivileged(SYSTEM_PROPERTY_ACTION);
@@ -292,7 +279,6 @@ public class ManagedSecurityService impl
this.defaultValue = defaultValue;
}
- @Override
public String run()
{
return System.getProperty(propertyName, defaultValue);
@@ -312,7 +298,6 @@ public class ManagedSecurityService impl
this.value = value;
}
- @Override
public String run()
{
System.setProperty(propertyName, value);
@@ -324,7 +309,6 @@ public class ManagedSecurityService impl
protected static class PrivilegedActionGetSystemProperties implements PrivilegedAction<Properties>
{
- @Override
public Properties run()
{
return System.getProperties();
@@ -341,7 +325,6 @@ public class ManagedSecurityService impl
this.clazz = clazz;
}
- @Override
public Object run() throws Exception
{
try
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/SimpleSecurityService.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/SimpleSecurityService.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/SimpleSecurityService.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/security/SimpleSecurityService.java Thu Oct 13 13:31:37 2011
@@ -39,13 +39,11 @@ public class SimpleSecurityService imple
/**
* @return always <code>null</code> in the default implementation
*/
- @Override
public Principal getCurrentPrincipal()
{
return null;
}
- @Override
public <T> Constructor<T> doPrivilegedGetDeclaredConstructor(Class<T> clazz, Class<?>... parameterTypes)
{
try
@@ -58,13 +56,11 @@ public class SimpleSecurityService imple
}
}
- @Override
public <T> Constructor<?>[] doPrivilegedGetDeclaredConstructors(Class<T> clazz)
{
return clazz.getDeclaredConstructors();
}
- @Override
public <T> Method doPrivilegedGetDeclaredMethod(Class<T> clazz, String name, Class<?>... parameterTypes)
{
try
@@ -77,13 +73,11 @@ public class SimpleSecurityService imple
}
}
- @Override
public <T> Method[] doPrivilegedGetDeclaredMethods(Class<T> clazz)
{
return clazz.getDeclaredMethods();
}
- @Override
public <T> Field doPrivilegedGetDeclaredField(Class<T> clazz, String name)
{
try
@@ -96,44 +90,37 @@ public class SimpleSecurityService imple
}
}
- @Override
public <T> Field[] doPrivilegedGetDeclaredFields(Class<T> clazz)
{
return clazz.getDeclaredFields();
}
- @Override
public void doPrivilegedSetAccessible(AccessibleObject obj, boolean flag)
{
obj.setAccessible(flag);
}
- @Override
public boolean doPrivilegedIsAccessible(AccessibleObject obj)
{
return obj.isAccessible();
}
- @Override
public <T> T doPrivilegedObjectCreate(Class<T> clazz)
throws PrivilegedActionException, IllegalAccessException, InstantiationException
{
return clazz.newInstance();
}
- @Override
public void doPrivilegedSetSystemProperty(String propertyName, String value)
{
System.setProperty(propertyName, value);
}
- @Override
public String doPrivilegedGetSystemProperty(String propertyName, String defaultValue)
{
return System.getProperty(propertyName, defaultValue);
}
- @Override
public Properties doPrivilegedGetSystemProperties()
{
return System.getProperties();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/AbstractDecoratorMethodHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/AbstractDecoratorMethodHandler.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/AbstractDecoratorMethodHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/AbstractDecoratorMethodHandler.java Thu Oct 13 13:31:37 2011
@@ -31,7 +31,6 @@ public class AbstractDecoratorMethodHand
private static final long serialVersionUID = 1L;
- @Override
public Object invoke(Object self, Method thisMethod, Method proceed, Object[] args) throws Throwable
{
//Don't attempt to call it if the method doesn't exist
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DelegateHandler.java Thu Oct 13 13:31:37 2011
@@ -69,7 +69,6 @@ public class DelegateHandler implements
this.ejbContext = ejbContext;
}
- @Override
public Object invoke(Object instance, Method method, Method proceed, Object[] arguments) throws Exception
{
// Tuck away a reference to the bean being Decorated
@@ -214,7 +213,6 @@ public class DelegateHandler implements
decorators = dec;
}
- @Override
public void writeExternal(ObjectOutput out) throws IOException
{
String id = WebBeansUtil.isPassivationCapable(bean);
@@ -232,7 +230,6 @@ public class DelegateHandler implements
//from the env.
}
- @Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException
{
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=1182847&r1=1182846&r2=1182847&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 Oct 13 13:31:37 2011
@@ -301,7 +301,6 @@ public class WebBeansDecorator<T> extend
return true;
}
- @Override
public Set<Annotation> getDelegateQualifiers()
{
if(customDecorator != null)
@@ -312,7 +311,6 @@ public class WebBeansDecorator<T> extend
return delegateBindings;
}
- @Override
public Type getDelegateType()
{
if(customDecorator != null)
@@ -557,7 +555,6 @@ public class WebBeansDecorator<T> extend
return wrappedBean.getStereotypes();
}
- @Override
public Set<Type> getDecoratedTypes()
{
if(customDecorator != null)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/el22/EL22Adaptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/el22/EL22Adaptor.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/el22/EL22Adaptor.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/el22/EL22Adaptor.java Thu Oct 13 13:31:37 2011
@@ -32,13 +32,11 @@ public class EL22Adaptor implements ELAd
}
- @Override
public ELResolver getOwbELResolver()
{
return new WebBeansELResolver();
}
- @Override
public ExpressionFactory getOwbWrappedExpressionFactory(ExpressionFactory expressionFactroy)
{
return new WrappedExpressionFactory(expressionFactroy);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java Thu Oct 13 13:31:37 2011
@@ -109,7 +109,6 @@ public class EventImpl<T> implements Eve
/**
* {@inheritDoc}
*/
- @Override
public Event<T> select(Annotation... bindings)
{
Event<T> sub = new EventImpl<T>(getEventBindings(bindings), eventType, webBeansContext);
@@ -120,7 +119,6 @@ public class EventImpl<T> implements Eve
/**
* {@inheritDoc}
*/
- @Override
public <U extends T> Event<U> select(Class<U> subtype, Annotation... bindings)
{
if(ClassUtil.isDefinitionContainsTypeVariables(subtype))
@@ -143,7 +141,6 @@ public class EventImpl<T> implements Eve
/**
* {@inheritDoc}
*/
- @Override
public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... bindings)
{
return select(subtype.getRawType(), bindings);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java Thu Oct 13 13:31:37 2011
@@ -125,7 +125,6 @@ class InstanceImpl<T> implements Instanc
/**
* {@inheritDoc}
*/
- @Override
public boolean isAmbiguous()
{
Set<Bean<?>> beans = resolveBeans();
@@ -136,7 +135,6 @@ class InstanceImpl<T> implements Instanc
/**
* {@inheritDoc}
*/
- @Override
public boolean isUnsatisfied()
{
Set<Bean<?>> beans = resolveBeans();
@@ -147,7 +145,6 @@ class InstanceImpl<T> implements Instanc
/**
* {@inheritDoc}
*/
- @Override
public Instance<T> select(Annotation... qualifiers)
{
Annotation[] newQualifiersArray = getAdditionalQualifiers(qualifiers);
@@ -190,7 +187,6 @@ class InstanceImpl<T> implements Instanc
/**
* {@inheritDoc}
*/
- @Override
public <U extends T> Instance<U> select(Class<U> subtype, Annotation... qualifiers)
{
webBeansContext.getAnnotationManager().checkQualifierConditions(qualifiers);
@@ -212,7 +208,6 @@ class InstanceImpl<T> implements Instanc
/**
* {@inheritDoc}
*/
- @Override
public <U extends T> Instance<U> select(TypeLiteral<U> subtype, Annotation... qualifiers)
{
return select(subtype.getRawType(), qualifiers);
@@ -221,7 +216,6 @@ class InstanceImpl<T> implements Instanc
/**
* {@inheritDoc}
*/
- @Override
@SuppressWarnings("unchecked")
public Iterator<T> iterator()
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DependentScopedBeanInterceptorHandler.java Thu Oct 13 13:31:37 2011
@@ -69,7 +69,6 @@ public class DependentScopedBeanIntercep
/**
* {@inheritDoc}
*/
- @Override
public Object invoke(Object instance, Method method, Method proceed, Object[] arguments) throws Exception
{
return super.invoke(actualInstance, method, proceed, arguments, (CreationalContextImpl<?>)creationalContext);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java Thu Oct 13 13:31:37 2011
@@ -394,7 +394,6 @@ public class InterceptorDataImpl impleme
return null;
}
- @Override
public boolean isLifecycleInterceptor()
{
if (preDestroy != null || postConstruct != null || prePassivate != null || postActivate != null)
@@ -405,7 +404,6 @@ public class InterceptorDataImpl impleme
return false;
}
- @Override
@SuppressWarnings("unchecked")
public Object createNewInstance(Object ownerInstance, CreationalContextImpl<?> ownerCreationalContext)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java Thu Oct 13 13:31:37 2011
@@ -466,7 +466,6 @@ public class InvocationContextImpl imple
/**
* {@inheritDoc}
*/
- @Override
public Object getTimer()
{
// TODO Auto-generated method stub
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=1182847&r1=1182846&r2=1182847&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 Thu Oct 13 13:31:37 2011
@@ -243,7 +243,6 @@ public class WebBeansInterceptor<T> exte
this.clazz = clazz;
}
- @Override
public Set<Annotation> getInterceptorBindings()
{
Set<Annotation> set = new HashSet<Annotation>();
@@ -401,7 +400,6 @@ public class WebBeansInterceptor<T> exte
return delegateBean.getStereotypes();
}
- @Override
public Object intercept(InterceptionType type, T instance,InvocationContext ctx)
{
Method method = getMethod(type);
@@ -418,7 +416,6 @@ public class WebBeansInterceptor<T> exte
return null;
}
- @Override
public boolean intercepts(InterceptionType type)
{
Method method = getMethod(type);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/logger/WebBeansLogger.java Thu Oct 13 13:31:37 2011
@@ -316,14 +316,12 @@ public final class WebBeansLogger implem
return (logger.isLoggable(WebBeansLogger.WBL_TRACE));
}
- @Override
public void writeExternal(ObjectOutput out) throws IOException
{
out.writeObject(caller);
out.writeObject(locale);
}
- @Override
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotated.java Thu Oct 13 13:31:37 2011
@@ -102,7 +102,6 @@ abstract class AbstractAnnotated impleme
/**
* {@inheritDoc}
*/
- @Override
@SuppressWarnings("unchecked")
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
@@ -121,7 +120,6 @@ abstract class AbstractAnnotated impleme
/**
* {@inheritDoc}
*/
- @Override
public Set<Annotation> getAnnotations()
{
return annotations;
@@ -130,7 +128,6 @@ abstract class AbstractAnnotated impleme
/**
* {@inheritDoc}
*/
- @Override
public Type getBaseType()
{
return baseType;
@@ -139,7 +136,6 @@ abstract class AbstractAnnotated impleme
/**
* {@inheritDoc}
*/
- @Override
public Set<Type> getTypeClosure()
{
if (typeClosures == null)
@@ -207,7 +203,6 @@ abstract class AbstractAnnotated impleme
/**
* {@inheritDoc}
*/
- @Override
public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
{
for(Annotation ann : annotations)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedCallable.java Thu Oct 13 13:31:37 2011
@@ -75,7 +75,6 @@ abstract class AbstractAnnotatedCallable
/**
* {@inheritDoc}
*/
- @Override
public List<AnnotatedParameter<X>> getParameters()
{
return annotatedParameters;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractAnnotatedMember.java Thu Oct 13 13:31:37 2011
@@ -84,7 +84,6 @@ abstract class AbstractAnnotatedMember<X
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedType<X> getDeclaringType()
{
return declaringType;
@@ -93,7 +92,6 @@ abstract class AbstractAnnotatedMember<X
/**
* {@inheritDoc}
*/
- @Override
public Member getJavaMember()
{
return javaMember;
@@ -102,7 +100,6 @@ abstract class AbstractAnnotatedMember<X
/**
* {@inheritDoc}
*/
- @Override
public boolean isStatic()
{
return Modifier.isStatic(javaMember.getModifiers());
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedParameterImpl.java Thu Oct 13 13:31:37 2011
@@ -50,7 +50,6 @@ class AnnotatedParameterImpl<X> extends
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedCallable<X> getDeclaringCallable()
{
return declaringCallable;
@@ -59,7 +58,6 @@ class AnnotatedParameterImpl<X> extends
/**
* {@inheritDoc}
*/
- @Override
public int getPosition()
{
return position;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AnnotatedTypeImpl.java Thu Oct 13 13:31:37 2011
@@ -109,7 +109,6 @@ class AnnotatedTypeImpl<X> extends Abstr
/**
* {@inheritDoc}
*/
- @Override
public Class<X> getJavaClass()
{
return annotatedClass;
@@ -161,7 +160,6 @@ class AnnotatedTypeImpl<X> extends Abstr
/**
* {@inheritDoc}
*/
- @Override
public Set<AnnotatedConstructor<X>> getConstructors()
{
if (constructors == null)
@@ -175,7 +173,6 @@ class AnnotatedTypeImpl<X> extends Abstr
/**
* {@inheritDoc}
*/
- @Override
public Set<AnnotatedField<? super X>> getFields()
{
if (constructors == null)
@@ -189,7 +186,6 @@ class AnnotatedTypeImpl<X> extends Abstr
/**
* {@inheritDoc}
*/
- @Override
public Set<AnnotatedMethod<? super X>> getMethods()
{
if (constructors == null)
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/AbstractProducer.java Thu Oct 13 13:31:37 2011
@@ -55,7 +55,6 @@ public abstract class AbstractProducer<T
/**
* {@inheritDoc}
*/
- @Override
public Set<InjectionPoint> getInjectionPoints()
{
return bean.getInjectionPoints();
@@ -64,7 +63,6 @@ public abstract class AbstractProducer<T
/**
* {@inheritDoc}
*/
- @Override
@SuppressWarnings("unchecked")
public T produce(CreationalContext<T> creationalContext)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/DefaultInjectionTargetImpl.java Thu Oct 13 13:31:37 2011
@@ -36,37 +36,31 @@ public class DefaultInjectionTargetImpl<
target = new InjectionTargetProducer<T>(WebBeansContext.getInstance().getWebBeansUtil().defineManagedBean(annotatedType));
}
- @Override
public void inject(T instance, CreationalContext<T> ctx)
{
target.inject(instance, ctx);
}
- @Override
public void postConstruct(T instance)
{
target.postConstruct(instance);
}
- @Override
public void preDestroy(T instance)
{
target.preDestroy(instance);
}
- @Override
public void dispose(T instance)
{
target.dispose(instance);
}
- @Override
public Set<InjectionPoint> getInjectionPoints()
{
return target.getInjectionPoints();
}
- @Override
public T produce(CreationalContext<T> creationalContext)
{
return target.produce(creationalContext);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/creation/InjectionTargetProducer.java Thu Oct 13 13:31:37 2011
@@ -51,7 +51,6 @@ public class InjectionTargetProducer<T>
/**
* {@inheritDoc}
*/
- @Override
public void inject(T instance, CreationalContext<T> ctx)
{
if(!(ctx instanceof CreationalContextImpl))
@@ -114,7 +113,6 @@ public class InjectionTargetProducer<T>
/**
* {@inheritDoc}
*/
- @Override
public void postConstruct(T instance)
{
InjectionTargetBean<T> bean = getBean(InjectionTargetBean.class);
@@ -127,7 +125,6 @@ public class InjectionTargetProducer<T>
/**
* {@inheritDoc}
*/
- @Override
public void preDestroy(T instance)
{
InjectionTargetBean<T> bean = getBean(InjectionTargetBean.class);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessAnnotatedTypeImpl.java Thu Oct 13 13:31:37 2011
@@ -56,7 +56,6 @@ public class ProcessAnnotatedTypeImpl<X>
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedType<X> getAnnotatedType()
{
return annotatedType;
@@ -65,7 +64,6 @@ public class ProcessAnnotatedTypeImpl<X>
/**
* {@inheritDoc}
*/
- @Override
public void setAnnotatedType(AnnotatedType<X> type)
{
annotatedType = type;
@@ -85,7 +83,6 @@ public class ProcessAnnotatedTypeImpl<X>
/**
* {@inheritDoc}
*/
- @Override
public void veto()
{
veto = true;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessBeanImpl.java Thu Oct 13 13:31:37 2011
@@ -48,7 +48,6 @@ public class ProcessBeanImpl<X> impleme
/**
* {@inheritDoc}
*/
- @Override
public void addDefinitionError(Throwable t)
{
WebBeansContext.getInstance().getBeanManagerImpl().getErrorStack().pushError(t);
@@ -57,7 +56,6 @@ public class ProcessBeanImpl<X> impleme
/**
* {@inheritDoc}
*/
- @Override
public Annotated getAnnotated()
{
return annotated;
@@ -66,7 +64,6 @@ public class ProcessBeanImpl<X> impleme
/**
* {@inheritDoc}
*/
- @Override
public Bean<X> getBean()
{
return bean;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessInjectionTargetImpl.java Thu Oct 13 13:31:37 2011
@@ -56,13 +56,11 @@ public class ProcessInjectionTargetImpl<
/**
* {@inheritDoc}
*/
- @Override
public void addDefinitionError(Throwable t)
{
WebBeansContext.getInstance().getBeanManagerImpl().getErrorStack().pushError(t);
}
- @Override
public AnnotatedType<X> getAnnotatedType()
{
return annotatedType;
@@ -71,7 +69,6 @@ public class ProcessInjectionTargetImpl<
/**
* {@inheritDoc}
*/
- @Override
public InjectionTarget<X> getInjectionTarget()
{
return injectionTarget;
@@ -80,7 +77,6 @@ public class ProcessInjectionTargetImpl<
/**
* {@inheritDoc}
*/
- @Override
public void setInjectionTarget(InjectionTarget<X> injectionTarget)
{
this.injectionTarget = injectionTarget;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessManagedBeanImpl.java Thu Oct 13 13:31:37 2011
@@ -44,7 +44,6 @@ public class ProcessManagedBeanImpl<X> e
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedType<X> getAnnotatedBeanClass()
{
return annotatedBeanClass;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessObserverMethodImpl.java Thu Oct 13 13:31:37 2011
@@ -49,7 +49,6 @@ public class ProcessObserverMethodImpl<T
/**
* {@inheritDoc}
*/
- @Override
public void addDefinitionError(Throwable t)
{
WebBeansContext.getInstance().getBeanManagerImpl().getErrorStack().pushError(t);
@@ -58,7 +57,6 @@ public class ProcessObserverMethodImpl<T
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedMethod<X> getAnnotatedMethod()
{
return annotatedMethod;
@@ -67,7 +65,6 @@ public class ProcessObserverMethodImpl<T
/**
* {@inheritDoc}
*/
- @Override
public ObserverMethod<T> getObserverMethod()
{
return observerMethod;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerFieldImpl.java Thu Oct 13 13:31:37 2011
@@ -45,7 +45,6 @@ public class ProcessProducerFieldImpl<X,
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedField<X> getAnnotatedProducerField()
{
return annotatedField;
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=1182847&r1=1182846&r2=1182847&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 Thu Oct 13 13:31:37 2011
@@ -52,7 +52,6 @@ public class ProcessProducerImpl<X,T> im
/**
* {@inheritDoc}
*/
- @Override
public void addDefinitionError(Throwable t)
{
WebBeansContext.getInstance().getBeanManagerImpl().getErrorStack().pushError(t);
@@ -61,7 +60,6 @@ public class ProcessProducerImpl<X,T> im
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedMember<X> getAnnotatedMember()
{
return annotateMember;
@@ -70,7 +68,6 @@ public class ProcessProducerImpl<X,T> im
/**
* {@inheritDoc}
*/
- @Override
public Producer<T> getProducer()
{
return producer;
@@ -79,7 +76,6 @@ public class ProcessProducerImpl<X,T> im
/**
* {@inheritDoc}
*/
- @Override
public void setProducer(Producer<T> producer)
{
this.producer = producer;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessProducerMethodImpl.java Thu Oct 13 13:31:37 2011
@@ -50,7 +50,6 @@ public class ProcessProducerMethodImpl<X
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedParameter<X> getAnnotatedDisposedParameter()
{
return annotatedDisposedParameter;
@@ -59,7 +58,6 @@ public class ProcessProducerMethodImpl<X
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedMethod<X> getAnnotatedProducerMethod()
{
return annotatedProducerMethod;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/ProcessSessionBeanImpl.java Thu Oct 13 13:31:37 2011
@@ -53,7 +53,6 @@ public class ProcessSessionBeanImpl<X> e
/**
* {@inheritDoc}
*/
- @Override
public String getEjbName()
{
return ejbName;
@@ -62,7 +61,6 @@ public class ProcessSessionBeanImpl<X> e
/**
* {@inheritDoc}
*/
- @Override
public SessionBeanType getSessionBeanType()
{
return type;
@@ -71,7 +69,6 @@ public class ProcessSessionBeanImpl<X> e
/**
* {@inheritDoc}
*/
- @Override
public AnnotatedType<Object> getAnnotatedBeanClass()
{
return annotatedBeanClass;
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterBeanDiscoveryImpl.java Thu Oct 13 13:31:37 2011
@@ -62,7 +62,6 @@ public class AfterBeanDiscoveryImpl impl
/**
* {@inheritDoc}
*/
- @Override
@SuppressWarnings("unchecked")
public void addBean(Bean<?> bean)
{
@@ -151,7 +150,6 @@ public class AfterBeanDiscoveryImpl impl
/**
* {@inheritDoc}
*/
- @Override
public void addContext(Context context)
{
beanManager.addContext(context);
@@ -161,7 +159,6 @@ public class AfterBeanDiscoveryImpl impl
/**
* {@inheritDoc}
*/
- @Override
public void addDefinitionError(Throwable t)
{
beanManager.getErrorStack().pushError(t);
@@ -170,7 +167,6 @@ public class AfterBeanDiscoveryImpl impl
/**
* {@inheritDoc}
*/
- @Override
public void addObserverMethod(ObserverMethod<?> observerMethod)
{
ProcessObserverMethod<?, ?> event = new GProcessObservableMethod(null,observerMethod);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/AfterDeploymentValidationImpl.java Thu Oct 13 13:31:37 2011
@@ -41,7 +41,6 @@ public class AfterDeploymentValidationIm
/**
* {@inheritDoc}
*/
- @Override
public void addDeploymentProblem(Throwable t)
{
beanManagerImpl.getErrorStack().pushError(t);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/discovery/BeforeBeanDiscoveryImpl.java Thu Oct 13 13:31:37 2011
@@ -49,7 +49,6 @@ public class BeforeBeanDiscoveryImpl imp
/**
* {@inheritDoc}
*/
- @Override
public void addAnnotatedType(AnnotatedType<?> type)
{
beanManager.addAdditionalAnnotatedType(type);
@@ -58,7 +57,6 @@ public class BeforeBeanDiscoveryImpl imp
/**
* {@inheritDoc}
*/
- @Override
public void addQualifier(Class<? extends Annotation> qualifier)
{
beanManager.addAdditionalQualifier(qualifier);
@@ -68,7 +66,6 @@ public class BeforeBeanDiscoveryImpl imp
/**
* {@inheritDoc}
*/
- @Override
public void addInterceptorBinding(Class<? extends Annotation> binding, Annotation... bindingDef)
{
webBeansContext.getBeanManagerImpl().addInterceptorBindingType(binding, bindingDef);
@@ -77,7 +74,6 @@ public class BeforeBeanDiscoveryImpl imp
/**
* {@inheritDoc}
*/
- @Override
public void addScope(Class<? extends Annotation> scope, boolean normal, boolean passivating)
{
ExternalScope additionalScope = new ExternalScope(scope, normal, passivating);
@@ -87,7 +83,6 @@ public class BeforeBeanDiscoveryImpl imp
/**
* {@inheritDoc}
*/
- @Override
public void addStereotype(Class<? extends Annotation> stereotype, Annotation... stereotypeDef)
{
webBeansContext.getAnnotationManager().checkStereoTypeClass(stereotype, stereotypeDef);
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessAnnotatedType.java Thu Oct 13 13:31:37 2011
@@ -30,7 +30,6 @@ public class GProcessAnnotatedType exten
super(annotatedType);
}
- @Override
public Class<?> getBeanClassFor(Class<?> eventClass)
{
return getAnnotatedType().getJavaClass();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessBean.java Thu Oct 13 13:31:37 2011
@@ -31,7 +31,6 @@ public class GProcessBean extends Proces
super(bean,annotated);
}
- @Override
public Class<?> getBeanClassFor(Class<?> eventClass)
{
return getBean().getBeanClass();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessInjectionTarget.java Thu Oct 13 13:31:37 2011
@@ -31,7 +31,6 @@ public class GProcessInjectionTarget ext
super(injectionTarget, annotatedType);
}
- @Override
public Class<?> getBeanClassFor(Class<?> eventClass)
{
return getAnnotatedType().getJavaClass();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessManagedBean.java Thu Oct 13 13:31:37 2011
@@ -31,7 +31,6 @@ public class GProcessManagedBean extends
super(bean,annotated);
}
- @Override
public Class<?> getBeanClassFor(Class<?> eventClass)
{
return getBean().getBeanClass();
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObservableMethod.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObservableMethod.java?rev=1182847&r1=1182846&r2=1182847&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObservableMethod.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/events/generics/GProcessObservableMethod.java Thu Oct 13 13:31:37 2011
@@ -33,13 +33,11 @@ public class GProcessObservableMethod ex
super(annotatedMethod, observerMethod);
}
- @Override
public Class<?> getBeanClass()
{
return getObserverMethod().getBeanClass();
}
- @Override
public Class<?> getProducerOrObserverType()
{
return ClassUtil.getClazz(getObserverMethod().getObservedType());