You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by ge...@apache.org on 2009/01/17 12:24:40 UTC
svn commit: r735273 - in
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
component/ component/xml/ config/ context/ decorator/ decorator/xml/
deployment/ event/ event/xml/ inject/ inject/xml/ intercept/
intercept/webbeans...
Author: gerdogdu
Date: Sat Jan 17 03:24:35 2009
New Revision: 735273
URL: http://svn.apache.org/viewvc?rev=735273&view=rev
Log:
Formatting the source.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContextReference.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectionPointModel.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractComponent.java Sat Jan 17 03:24:35 2009
@@ -108,7 +108,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.component.Component#create()
*/
public T create()
@@ -129,11 +128,11 @@
}
catch (RuntimeException re)
{
- throw new CreationException(re);
+ throw new CreationException(re);
}
catch (Exception e)
{
- throw new WebBeansException(e);
+ throw new WebBeansException(e);
}
finally
{
@@ -156,7 +155,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.component.Component#destroy(java.lang.Object)
*/
public void destroy(T instance)
@@ -329,7 +327,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.manager.Bean#getBindingTypes()
*/
@Override
@@ -340,7 +337,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.manager.Bean#getDeploymentType()
*/
@Override
@@ -351,7 +347,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.manager.Bean#getScopeType()
*/
@Override
@@ -362,7 +357,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.manager.Bean#getTypes()
*/
@Override
@@ -416,7 +410,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.component.Component#setNullable()
*/
@Override
@@ -427,7 +420,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.component.Component#setSerializable()
*/
@Override
@@ -439,7 +431,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.manager.Bean#isNullable()
*/
@Override
@@ -451,7 +442,6 @@
/*
* (non-Javadoc)
- *
* @see javax.webbeans.manager.Bean#isSerializable()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/AbstractObservesComponent.java Sat Jan 17 03:24:35 2009
@@ -28,8 +28,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.component.ObservableComponent#addObservableMethod(java.lang.reflect.Method)
+ * @see
+ * org.apache.webbeans.component.ObservableComponent#addObservableMethod
+ * (java.lang.reflect.Method)
*/
public void addObservableMethod(Method observerMethod)
{
@@ -38,8 +39,8 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.component.ObservableComponent#getObservableMethods()
+ * @see
+ * org.apache.webbeans.component.ObservableComponent#getObservableMethods()
*/
public Set<Method> getObservableMethods()
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ComponentImpl.java Sat Jan 17 03:24:35 2009
@@ -63,7 +63,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.component.AbstractComponent#createInstance()
*/
@Override
@@ -158,8 +157,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.component.AbstractComponent#destroyInstance(java.lang.Object)
+ * @see
+ * org.apache.webbeans.component.AbstractComponent#destroyInstance(java.
+ * lang.Object)
*/
@Override
protected void destroyInstance(T instance)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ProducerComponentImpl.java Sat Jan 17 03:24:35 2009
@@ -127,7 +127,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.component.AbstractComponent#createInstance()
*/
@Override
@@ -167,8 +166,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.component.AbstractComponent#destroyInstance(java.lang.Object)
+ * @see
+ * org.apache.webbeans.component.AbstractComponent#destroyInstance(java.
+ * lang.Object)
*/
@Override
protected void destroyInstance(T instance)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/WebBeansType.java Sat Jan 17 03:24:35 2009
@@ -16,8 +16,8 @@
import javax.webbeans.Produces;
/**
- * There are different <i>Web Beans Component</i> with regard to the
- * definition. These are the;
+ * There are different <i>Web Beans Component</i> with regard to the definition.
+ * These are the;
* <ul>
* <li>Bean Implementation Class Components</li>
* <li>Producer Method Components</li>
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLComponentImpl.java Sat Jan 17 03:24:35 2009
@@ -59,7 +59,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.component.ComponentImpl#createInstance()
*/
@Override
@@ -88,8 +87,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.component.ComponentImpl#injectFields(java.lang.Object)
+ * @see
+ * org.apache.webbeans.component.ComponentImpl#injectFields(java.lang.Object
+ * )
*/
@Override
protected void injectFields(T instance)
@@ -141,8 +141,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.component.ComponentImpl#injectMethods(java.lang.Object)
+ * @see
+ * org.apache.webbeans.component.ComponentImpl#injectMethods(java.lang.Object
+ * )
*/
@Override
protected void injectMethods(T instance)
@@ -201,10 +202,10 @@
listModel = new ArrayList<XMLInjectionPointModel>();
this.injectableMethods.put(method, listModel);
}
-
- if(model != null)
+
+ if (model != null)
{
- listModel.add(model);
+ listModel.add(model);
}
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/xml/XMLProducerComponentImpl.java Sat Jan 17 03:24:35 2009
@@ -53,8 +53,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.component.ProducerComponentImpl#getActualTypeArguments()
+ * @see
+ * org.apache.webbeans.component.ProducerComponentImpl#getActualTypeArguments
+ * ()
*/
@Override
public Type[] getActualTypeArguments()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/DefinitionUtil.java Sat Jan 17 03:24:35 2009
@@ -99,8 +99,8 @@
component.setType(p.getParent().getType());
found = true;
}
-
- if(!found)
+
+ if (!found)
{
component.setType(WebBeansUtil.getMaxPrecedenceSteroTypeDeploymentType(component));
@@ -344,18 +344,18 @@
if (AnnotationUtil.isMethodHasAnnotation(declaredMethod, Specializes.class))
{
- if(ClassUtil.isStatic(declaredMethod.getModifiers()))
+ if (ClassUtil.isStatic(declaredMethod.getModifiers()))
{
throw new WebBeansConfigurationException("Specializing producer method : " + declaredMethod.getName() + " in class : " + clazz.getName() + " can not be static");
- }
-
+ }
+
isSpecializes = true;
}
Type[] observableTypes = AnnotationUtil.getMethodParameterGenericTypesWithGivenAnnotation(declaredMethod, Fires.class);
EventUtil.checkObservableMethodParameterConditions(observableTypes, "method parameter", "method : " + declaredMethod.getName() + "in class : " + clazz.getName());
- ProducerComponentImpl<?> newComponent = createProducerComponent(declaredMethod.getReturnType(), declaredMethod, component,isSpecializes);
+ ProducerComponentImpl<?> newComponent = createProducerComponent(declaredMethod.getReturnType(), declaredMethod, component, isSpecializes);
if (newComponent != null)
{
producerComponents.add(newComponent);
@@ -367,14 +367,14 @@
}
- private static <T> ProducerComponentImpl<T> createProducerComponent(Class<T> returnType, Method method, AbstractComponent<?> parent,boolean isSpecializes)
+ private static <T> ProducerComponentImpl<T> createProducerComponent(Class<T> returnType, Method method, AbstractComponent<?> parent, boolean isSpecializes)
{
ProducerComponentImpl<T> component = new ProducerComponentImpl<T>(parent, returnType);
component.setCreatorMethod(method);
-
- if(isSpecializes)
+
+ if (isSpecializes)
{
- WebBeansUtil.configureProducerSpecialization(component, method, parent.getReturnType().getSuperclass());
+ WebBeansUtil.configureProducerSpecialization(component, method, parent.getReturnType().getSuperclass());
}
if (returnType.isPrimitive())
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContext.java Sat Jan 17 03:24:35 2009
@@ -71,7 +71,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.context.AbstractContext#destroy()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContextReference.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContextReference.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContextReference.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/DependentContextReference.java Sat Jan 17 03:24:35 2009
@@ -29,7 +29,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -43,7 +42,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/WebBeansDecorator.java Sat Jan 17 03:24:35 2009
@@ -277,7 +277,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -291,7 +290,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/xml/WebBeansXMLDecorator.java Sat Jan 17 03:24:35 2009
@@ -30,7 +30,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.decorator.WebBeansDecorator#initDelegate()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/StereoTypeModel.java Sat Jan 17 03:24:35 2009
@@ -199,7 +199,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -220,7 +219,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/XMLStereoTypeModel.java Sat Jan 17 03:24:35 2009
@@ -221,7 +221,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -242,7 +241,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/TransactionalNotifier.java Sat Jan 17 03:24:35 2009
@@ -96,7 +96,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -110,7 +109,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/xml/BeanObserverXMLImpl.java Sat Jan 17 03:24:35 2009
@@ -39,8 +39,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.event.BeanObserverImpl#getMethodArguments(java.lang.Object)
+ * @see
+ * org.apache.webbeans.event.BeanObserverImpl#getMethodArguments(java.lang
+ * .Object)
*/
@Override
protected List<Object> getMethodArguments(Object event)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableField.java Sat Jan 17 03:24:35 2009
@@ -44,7 +44,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.inject.Injectable#doInjection()
*/
public Object doInjection()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableMethods.java Sat Jan 17 03:24:35 2009
@@ -50,7 +50,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.inject.Injectable#doInjection()
*/
public T doInjection()
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableConstructor.java Sat Jan 17 03:24:35 2009
@@ -38,7 +38,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.inject.InjectableConstructor#doInjection()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableField.java Sat Jan 17 03:24:35 2009
@@ -32,7 +32,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.inject.InjectableField#doInjection()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectableMethods.java Sat Jan 17 03:24:35 2009
@@ -35,7 +35,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.inject.InjectableMethods#doInjection()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectionPointModel.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectionPointModel.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectionPointModel.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/xml/XMLInjectionPointModel.java Sat Jan 17 03:24:35 2009
@@ -138,7 +138,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -155,7 +154,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorData.java Sat Jan 17 03:24:35 2009
@@ -31,7 +31,7 @@
* <ul>
* <li>EJB related interceptors with {@link Interceptors} annotation</li>
* <li>WebBeans specific interceptor definition with using
- * {@link InterceptorBindingType} and {@link Interceptor} </li>
+ * {@link InterceptorBindingType} and {@link Interceptor}</li>
* </ul>
* </p>
* <p>
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataComparator.java Sat Jan 17 03:24:35 2009
@@ -22,7 +22,6 @@
/*
* (non-Javadoc)
- *
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
public int compare(InterceptorData o1, InterceptorData o2)
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorDataImpl.java Sat Jan 17 03:24:35 2009
@@ -65,9 +65,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#setInterceptor(java.lang.reflect.Method,
- * java.lang.Class)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#setInterceptor(java.lang
+ * .reflect.Method, java.lang.Class)
*/
public void setInterceptor(Method m, Class<? extends Annotation> annotation)
{
@@ -87,8 +87,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#addAroundInvoke(java.lang.reflect.Method)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#addAroundInvoke(java.lang
+ * .reflect.Method)
*/
protected void setAroundInvoke(Method m)
{
@@ -97,8 +98,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#addPostConstruct(java.lang.reflect.Method)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#addPostConstruct(java.lang
+ * .reflect.Method)
*/
protected void setPostConstruct(Method m)
{
@@ -107,8 +109,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#addPreDestroy(java.lang.reflect.Method)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#addPreDestroy(java.lang
+ * .reflect.Method)
*/
protected void setPreDestroy(Method m)
{
@@ -117,7 +120,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.intercept.InterceptorData#getPostConstruct()
*/
public Method getPostConstruct()
@@ -127,7 +129,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.intercept.InterceptorData#getPreDestroy()
*/
public Method getPreDestroy()
@@ -137,7 +138,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.intercept.InterceptorData#getAroundInvoke()
*/
public Method getAroundInvoke()
@@ -147,8 +147,8 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#getInterceptorInstance()
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#getInterceptorInstance()
*/
public Object getInterceptorInstance()
{
@@ -157,8 +157,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#setInterceptorInstance(java.lang.Object)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#setInterceptorInstance(
+ * java.lang.Object)
*/
public void setInterceptorInstance(Object interceptorInstance)
{
@@ -167,8 +168,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#isDefinedInInterceptorClass()
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#isDefinedInInterceptorClass
+ * ()
*/
public boolean isDefinedInInterceptorClass()
{
@@ -177,8 +179,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#setDefinedInInterceptorClass(boolean)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#setDefinedInInterceptorClass
+ * (boolean)
*/
public void setDefinedInInterceptorClass(boolean definedInInterceptorClass)
{
@@ -187,7 +190,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.intercept.InterceptorData#isDefinedInMethod()
*/
public boolean isDefinedInMethod()
@@ -197,8 +199,8 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#setDefinedInMethod(boolean)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#setDefinedInMethod(boolean)
*/
public void setDefinedInMethod(boolean definedInMethod)
{
@@ -207,7 +209,6 @@
/*
* (non-Javadoc)
- *
* @see org.apache.webbeans.intercept.InterceptorData#getAnnotatedMethod()
*/
public Method getAnnotatedMethod()
@@ -217,8 +218,9 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#setAnnotatedMethod(java.lang.reflect.Method)
+ * @see
+ * org.apache.webbeans.intercept.InterceptorData#setAnnotatedMethod(java
+ * .lang.reflect.Method)
*/
public void setAnnotatedMethod(Method annotatedMethod)
{
@@ -227,8 +229,8 @@
/*
* (non-Javadoc)
- *
- * @see org.apache.webbeans.intercept.InterceptorData#isDefinedWithWebBeansInterceptor()
+ * @seeorg.apache.webbeans.intercept.InterceptorData#
+ * isDefinedWithWebBeansInterceptor()
*/
public boolean isDefinedWithWebBeansInterceptor()
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java Sat Jan 17 03:24:35 2009
@@ -71,7 +71,6 @@
/*
* (non-Javadoc)
- *
* @see javax.interceptor.InvocationContext#getContextData()
*/
public Map<String, Object> getContextData()
@@ -81,7 +80,6 @@
/*
* (non-Javadoc)
- *
* @see javax.interceptor.InvocationContext#getMethod()
*/
public Method getMethod()
@@ -91,7 +89,6 @@
/*
* (non-Javadoc)
- *
* @see javax.interceptor.InvocationContext#getParameters()
*/
public Object[] getParameters()
@@ -101,7 +98,6 @@
/*
* (non-Javadoc)
- *
* @see javax.interceptor.InvocationContext#getTarget()
*/
public Object getTarget()
@@ -111,7 +107,6 @@
/*
* (non-Javadoc)
- *
* @see javax.interceptor.InvocationContext#proceed()
*/
public Object proceed() throws Exception
@@ -217,8 +212,8 @@
/*
* (non-Javadoc)
- *
- * @see javax.interceptor.InvocationContext#setParameters(java.lang.Object[])
+ * @see
+ * javax.interceptor.InvocationContext#setParameters(java.lang.Object[])
*/
public void setParameters(Object[] params)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/webbeans/WebBeansInterceptor.java Sat Jan 17 03:24:35 2009
@@ -311,7 +311,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
@@ -338,7 +337,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -349,7 +347,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#toString()
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/ConversationImpl.java Sat Jan 17 03:24:35 2009
@@ -124,7 +124,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#hashCode()
*/
@Override
@@ -139,7 +138,6 @@
/*
* (non-Javadoc)
- *
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansJSFFilter.java Sat Jan 17 03:24:35 2009
@@ -46,8 +46,9 @@
/*
* (non-Javadoc)
- *
- * @see javax.servlet.http.HttpServletResponseWrapper#sendRedirect(java.lang.String)
+ * @see
+ * javax.servlet.http.HttpServletResponseWrapper#sendRedirect(java
+ * .lang.String)
*/
@Override
public void sendRedirect(String location) throws IOException
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ArrayUtil.java Sat Jan 17 03:24:35 2009
@@ -1,46 +1,37 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
*/
package org.apache.webbeans.util;
public final class ArrayUtil
{
-
+
private ArrayUtil()
{
-
+
}
/**
* TODO please review this function and move to some place where all tests
* can use it! See also
* EJBInterceptComponentTest#testMultipleInterceptedComponent and other test
- * functions
- *
- * Compare two arrays regardless of the position of the elements in the
- * arrays.
- * The complex handling with temporary flags is necessary due to the
- * possibility of having multiple occurrences of the same element in the
- * arrays. In this case both arrays have to contain the exactly same amount
- * of those elements.
- *
- * This is only suited for smaller arrays (e.g. count < 100) since the
- * algorithm uses a product of both arrays.
- *
- * If one likes to use this for larger arrays, we'd have to use hashes.
+ * functions Compare two arrays regardless of the position of the elements
+ * in the arrays. The complex handling with temporary flags is necessary due
+ * to the possibility of having multiple occurrences of the same element in
+ * the arrays. In this case both arrays have to contain the exactly same
+ * amount of those elements. This is only suited for smaller arrays (e.g.
+ * count < 100) since the algorithm uses a product of both arrays. If one
+ * likes to use this for larger arrays, we'd have to use hashes.
*
* @param arr1
* @param arr2
@@ -94,5 +85,5 @@
}
return true;
}
-
+
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/ClassUtil.java Sat Jan 17 03:24:35 2009
@@ -788,7 +788,7 @@
int j = 0;
for (Method method : methods)
{
- if(method.getName().equals(methodName))
+ if (method.getName().equals(methodName))
{
Class<?>[] defineTypes = method.getParameterTypes();
@@ -798,13 +798,13 @@
}
boolean ok = true;
-
- if(parameterTypes != null && parameterTypes.size() > 0)
+
+ if (parameterTypes != null && parameterTypes.size() > 0)
{
ok = false;
}
-
- if(!ok)
+
+ if (!ok)
{
for (Class<?> defineType : defineTypes)
{
@@ -818,15 +818,15 @@
}
j++;
- }
+ }
}
-
+
if (ok)
{
methodList.add(method);
- }
+ }
}
-
+
}
return methodList;
@@ -843,9 +843,9 @@
int j = 0;
for (Method method : methods)
{
- if(method.getName().equals(methodName))
- {
- if(parameterTypes != null && parameterTypes.size() > 0)
+ if (method.getName().equals(methodName))
+ {
+ if (parameterTypes != null && parameterTypes.size() > 0)
{
Class<?>[] defineTypes = method.getParameterTypes();
@@ -853,9 +853,9 @@
{
continue;
}
-
+
boolean ok = false;
-
+
for (Class<?> defineType : defineTypes)
{
if (defineType.equals(parameterTypes.get(j)))
@@ -871,13 +871,13 @@
if (ok)
{
return method;
- }
+ }
}
else
{
return method;
}
- }
+ }
}
return null;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java Sat Jan 17 03:24:35 2009
@@ -1177,14 +1177,14 @@
{
throw new WebBeansConfigurationException("Producer method specialization is failed. Method " + method.getName() + " not found in super class : " + superClass.getName());
}
-
- if(!AnnotationUtil.isAnnotationExist(superMethod.getAnnotations(), Produces.class))
+
+ if (!AnnotationUtil.isAnnotationExist(superMethod.getAnnotations(), Produces.class))
{
throw new WebBeansConfigurationException("Producer method specialization is failed. Method " + method.getName() + " found in super class : " + superClass.getName() + " is not annotated with @Produces");
}
Annotation[] anns = AnnotationUtil.getBindingAnnotations(superMethod.getAnnotations());
-
+
for (Annotation ann : anns)
{
component.addBindingType(ann);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/WebBeansXMLConfigurator.java Sat Jan 17 03:24:35 2009
@@ -785,7 +785,7 @@
public <T> void configureProducerTypeLevelMetaData(AbstractComponent<T> component, List<Class<? extends Annotation>> annotationSet, List<Element> annotationElementList, Element webBeanDecleration)
{
configureBindingType(component, annotationSet, annotationElementList);
-
+
// StereoType
configureStereoType(component, annotationSet, annotationElementList);
@@ -1185,7 +1185,7 @@
*/
private <T> void configureMethodInitializeAnnotation(XMLComponentImpl<T> component, Method initializeMethod, List<Element> methodParameterElements)
{
- if(methodParameterElements.isEmpty())
+ if (methodParameterElements.isEmpty())
{
component.addMethodInjectionPoint(initializeMethod, null);
}
@@ -1195,7 +1195,7 @@
{
XMLInjectionPointModel model = XMLUtil.getInjectionPointModel(element, createConfigurationFailedMessage());
component.addMethodInjectionPoint(initializeMethod, model);
- }
+ }
}
}
@@ -1503,10 +1503,10 @@
}
if (ClassUtil.isPrimitive(fieldType) || ClassUtil.isPrimitiveWrapper(fieldType)) /*
- * Primitive
- * type
- * value
- */
+ * Primitive
+ * type
+ * value
+ */
{
Object objVal = null;
@@ -1539,10 +1539,10 @@
}
else if (fieldType.equals(Date.class) /*
- * Date, Time, Sql Date,
- * Time stamp, Calendar
- * value
- */
+ * Date, Time, Sql Date,
+ * Time stamp, Calendar
+ * value
+ */
|| fieldType.equals(java.sql.Date.class) || fieldType.equals(Time.class) || fieldType.equals(Timestamp.class))
{
Date date = ClassUtil.isValueOkForDate(value);
@@ -1573,11 +1573,11 @@
}
else if (fieldType.equals(BigDecimal.class) || fieldType.equals(BigInteger.class)) /*
- * BigDecimal
- * or
- * BigInteger
- * value
- */
+ * BigDecimal
+ * or
+ * BigInteger
+ * value
+ */
{
Object bigValue = ClassUtil.isValueOkForBigDecimalOrInteger(fieldType, value);
@@ -1605,9 +1605,8 @@
}
}
else if (List.class.isAssignableFrom(fieldType)) /*
- * List
- * value
- */
+ * List value
+ */
{
configureFieldListValue(component, field, child, errorMessage);
}
@@ -1642,9 +1641,9 @@
List list = null;
if (type instanceof ParameterizedType) /*
- * Type must be parametrized
- * type to mark type
- */
+ * Type must be parametrized type
+ * to mark type
+ */
{
ParameterizedType pt = (ParameterizedType) type;
Type arg = pt.getActualTypeArguments()[0];
@@ -1736,9 +1735,9 @@
Set set = null;
if (type instanceof ParameterizedType) /*
- * Type must be parametrized
- * type to mark type
- */
+ * Type must be parametrized type
+ * to mark type
+ */
{
ParameterizedType pt = (ParameterizedType) type;
Type arg = pt.getActualTypeArguments()[0];
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java?rev=735273&r1=735272&r2=735273&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLUtil.java Sat Jan 17 03:24:35 2009
@@ -59,10 +59,10 @@
@SuppressWarnings("unchecked")
public final class XMLUtil
{
-
- private XMLUtil()
- {
- }
+
+ private XMLUtil()
+ {
+ }
private static final Logger log = LogManager.getLogger(XMLUtil.class);