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/09 22:15:28 UTC
svn commit: r733153 [1/2] - in
/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans:
annotation/ component/ component/xml/ config/ container/ context/
decorator/ deployment/ el/ event/ inject/ inject/xml/ intercept/
intercept/w...
Author: gerdogdu
Date: Fri Jan 9 13:15:26 2009
New Revision: 733153
URL: http://svn.apache.org/viewvc?rev=733153&view=rev
Log:
Formatting sources.
Modified:
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java
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/ComponentImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.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/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/config/SimpleWebBeansConfigurator.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.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/DecoratorComparator.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.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/deployment/DeploymentTypeManager.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/el/WebBeansELResolver.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.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/inject/AbstractInjectable.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.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/InterceptorComparator.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/InterceptorHandler.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.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/WebBeansPhaseListener.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/transaction/TransactionUtil.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/AnnotationUtil.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/JNDIUtil.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/XMLAnnotationTypeManager.java
incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/xml/XMLDefinitionUtil.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/annotation/WebBeansAnnotation.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/WebBeansAnnotation.java Fri Jan 9 13:15:26 2009
@@ -144,7 +144,8 @@
}
return true;
}
- } else if (other instanceof WebBeansAnnotation)
+ }
+ else if (other instanceof WebBeansAnnotation)
{
WebBeansAnnotation that = (WebBeansAnnotation) other;
if (this.annotationType().equals(that.annotationType()))
@@ -191,13 +192,16 @@
{
return method.invoke(instance);
- } catch (IllegalArgumentException e)
+ }
+ catch (IllegalArgumentException e)
{
throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
- } catch (IllegalAccessException e)
+ }
+ catch (IllegalAccessException e)
{
throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
- } catch (InvocationTargetException e)
+ }
+ catch (InvocationTargetException e)
{
throw new ExecutionException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -125,13 +125,15 @@
instance = createInstance();
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
if (Exception.class.isAssignableFrom(e.getClass()))
{
throw new CreationException(e);
}
- } finally
+ }
+ finally
{
if (isActiveSet)
{
@@ -171,7 +173,8 @@
destroyInstance(instance);
destroyDependents();
- } finally
+ }
+ finally
{
if (isActiveSet)
{
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -110,7 +110,8 @@
{
impl.proceed();
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new WebBeansException(e);
}
@@ -170,7 +171,8 @@
{
impl.proceed();
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new WebBeansException(e);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationComponent.java Fri Jan 9 13:15:26 2009
@@ -36,7 +36,8 @@
if (conversationId != null)
{
conversation = ConversationManager.getInstance().getConversation(conversationId);
- } else
+ }
+ else
{
conversation = new ConversationImpl(JSFUtil.getSession().getId());
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ObservableComponentImpl.java Fri Jan 9 13:15:26 2009
@@ -56,7 +56,8 @@
{
instance = getConstructor().newInstance(new Object[] { bindingTypes, eventType });
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
throw new WebBeansException("Exception in creating Observable implicit component for event type : " + eventType.getName());
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -141,7 +141,8 @@
InjectableMethods<T> m = new InjectableMethods<T>(creatorMethod, parentInstance, this);
instance = m.doInjection();
- } finally
+ }
+ finally
{
if (getParent().getScopeType().equals(Dependent.class))
{
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -70,7 +70,8 @@
if (this.injectableConstructor == null)
{
instance = super.createInstance();
- } else
+ }
+ else
{
instance = this.injectableConstructor.doInjection();
super.afterConstructor(instance);
@@ -123,12 +124,14 @@
{
field.set(instance, this.fieldValues.get(field));
- } catch (IllegalArgumentException e)
+ }
+ catch (IllegalArgumentException e)
{
logger.error("IllegalArgumentException is occured while calling the field : " + field.getName() + " on class " + instance.getClass().getName());
throw new WebBeansException(e);
- } catch (IllegalAccessException e)
+ }
+ catch (IllegalAccessException e)
{
logger.error("IllegalAccessException is occured while calling the field : " + field.getName() + " on class " + instance.getClass().getName());
throw new WebBeansException(e);
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -91,7 +91,8 @@
{
XMLInjectableMethods<T> methods = new XMLInjectableMethods<T>(creatorMethod, parentInstance, this, this.producerMethodParameters);
methods.doInjection();
- } finally
+ }
+ finally
{
if (getParent().getScopeType().equals(Dependent.class))
{
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -84,7 +84,8 @@
if (found == true)
{
throw new WebBeansConfigurationException(errorMessage);
- } else
+ }
+ else
{
component.setType(annotation);// component type
found = true;
@@ -96,7 +97,8 @@
{
ProducerComponentImpl<?> p = (ProducerComponentImpl<?>) component;
component.setType(p.getParent().getType());
- } else
+ }
+ else
{
component.setType(WebBeansUtil.getMaxPrecedenceSteroTypeDeploymentType(component));
@@ -130,7 +132,8 @@
{
component.getTypes().add(clazz);
component.getTypes().add(Object.class);
- } else
+ }
+ else
{
ClassUtil.setTypeHierarchy(component.getTypes(), clazz);
}
@@ -200,7 +203,8 @@
if (found)
{
throw new WebBeansConfigurationException(exceptionMessage);
- } else
+ }
+ else
{
found = true;
component.setImplScopeType(annotation);
@@ -236,7 +240,8 @@
if (stereos.size() == 0)
{
component.setImplScopeType(new DependentScopeLiteral());
- } else
+ }
+ else
{
Annotation defined = null;
Set<Annotation> anns = component.getStereoTypes();
@@ -249,7 +254,8 @@
if (defined == null)
{
defined = next;
- } else
+ }
+ else
{
if (!defined.equals(next))
{
@@ -262,7 +268,8 @@
if (defined != null)
{
component.setImplScopeType(defined);
- } else
+ }
+ else
{
component.setImplScopeType(new DependentScopeLiteral());
}
@@ -297,13 +304,15 @@
isDefault = true;
}
- } else
+ }
+ else
// yes @Named
{
if (nameAnnot.value().equals(""))
{
isDefault = true;
- } else
+ }
+ else
{
component.setName(nameAnnot.value());
}
@@ -336,7 +345,8 @@
if (AnnotationUtil.isMethodHasAnnotation(declaredMethod, Override.class))
{
WebBeansUtil.configureProducerSpecialization(component, declaredMethod, clazz.getSuperclass());
- } else
+ }
+ else
{
throw new WebBeansConfigurationException("Producer method : " + declaredMethod.getName() + " in class : " + clazz.getName() + " must override its super class method");
}
@@ -414,7 +424,8 @@
if (previous == null)
{
previous = pr;
- } else
+ }
+ else
{
// multiple same producer
if (previous.equals(pr))
@@ -488,7 +499,8 @@
component.addInjectedMethod(method);
}
- } else
+ }
+ else
{
throw new WebBeansConfigurationException("Initializer method : " + method.getName() + " in class : " + clazz.getName() + " can not be annotated with @Produces or @Destructor");
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/SimpleWebBeansConfigurator.java Fri Jan 9 13:15:26 2009
@@ -90,7 +90,8 @@
{
WebBeansUtil.isSimpleWebBeanClass(clazz);
- } catch (WebBeansConfigurationException e)
+ }
+ catch (WebBeansConfigurationException e)
{
return false;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansContainerDeployer.java Fri Jan 9 13:15:26 2009
@@ -101,10 +101,12 @@
deployed = true;
}
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
throw new WebBeansDeploymentException(e);
- } finally
+ }
+ finally
{
Manager manager = ManagerImpl.getManager();
manager.fireEvent(manager, new Annotation[] { new InitializedManagerLiteral() });
@@ -131,7 +133,8 @@
{
logger.info("Simple WebBeans Component with class name : " + componentClassName + " is found");
defineSimpleWebBeans(implClass);
- } else if (EJBWebBeansConfigurator.isEJBWebBean(implClass))
+ }
+ else if (EJBWebBeansConfigurator.isEJBWebBean(implClass))
{
logger.info("Enterprise WebBeans Component with class name : " + componentClassName + " is found");
defineEnterpriseWebBeans();
@@ -227,7 +230,8 @@
if (superClass == null)
{
superClass = specialClass.getSuperclass();
- } else
+ }
+ else
{
if (superClass.equals(specialClass.getSuperclass()))
{
@@ -260,7 +264,8 @@
if (superClass == null)
{
superClass = specialClass.getSuperclass();
- } else
+ }
+ else
{
if (superClass.equals(specialClass.getSuperclass()))
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java Fri Jan 9 13:15:26 2009
@@ -68,11 +68,13 @@
object = clazz.newInstance();
managerMap.put(classLoader, object);
- } catch (InstantiationException e)
+ }
+ catch (InstantiationException e)
{
throw new WebBeansException("Unable to instantiate class : " + singletonName, e);
- } catch (IllegalAccessException e)
+ }
+ catch (IllegalAccessException e)
{
throw new WebBeansException("Illegal access exception in creating instance with class : " + singletonName, e);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansScanner.java Fri Jan 9 13:15:26 2009
@@ -102,7 +102,8 @@
}
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
logger.error("Initializing of the WebBeans container is failed.", e);
throw new WebBeansConfigurationException(e);
@@ -145,7 +146,8 @@
{
fileDir = fileDir.substring(0, fileDir.lastIndexOf("/")) + "/META-INF/web-beans.xml";
addPath = new URL("jar:" + fileDir);
- } else
+ }
+ else
{
addPath = new URL("file:" + url.getFile() + "META-INF/web-beans.xml");
}
@@ -173,7 +175,8 @@
{
fileDir = fileDir.substring(0, fileDir.lastIndexOf("/")) + "/META-INF/ejb-jar.xml";
addPath = new URL("jar:" + fileDir);
- } else
+ }
+ else
{
addPath = new URL("file:" + ejbUrl.getFile() + "META-INF/ejb-jar.xml");
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/InjectionResolver.java Fri Jan 9 13:15:26 2009
@@ -68,14 +68,16 @@
{
resolvedComponent = component;
resolvedComponents.add(resolvedComponent);
- } else
+ }
+ else
{
if (DeploymentTypeManager.getInstance().comparePrecedences(component.getDeploymentType(), resolvedComponent.getDeploymentType()) > 0)
{
resolvedComponents.clear();
resolvedComponent = component;
resolvedComponents.add(resolvedComponent);
- } else if (DeploymentTypeManager.getInstance().comparePrecedences(component.getDeploymentType(), resolvedComponent.getDeploymentType()) == 0)
+ }
+ else if (DeploymentTypeManager.getInstance().comparePrecedences(component.getDeploymentType(), resolvedComponent.getDeploymentType()) == 0)
{
resolvedComponents.add(component);
}
@@ -159,7 +161,8 @@
{
results.add((Bean<T>) component);
break;
- } else
+ }
+ else
{
List<Type[]> listActualArgs = ClassUtil.getGenericSuperInterfacesTypeArguments(componentApiType);
Iterator<Type[]> itListActualArgs = listActualArgs.iterator();
@@ -179,7 +182,8 @@
}
}
- } else
+ }
+ else
{
if (apiType instanceof Class)
{
@@ -218,20 +222,23 @@
{
resolvedComponent = component;
res.add(resolvedComponent);
- } else
+ }
+ else
{
DeploymentTypeManager typeManager = DeploymentTypeManager.getInstance();
if (typeManager.comparePrecedences(component.getDeploymentType(), resolvedComponent.getDeploymentType()) < 0)
{
continue;
- } else if (typeManager.comparePrecedences(component.getDeploymentType(), resolvedComponent.getDeploymentType()) > 0)
+ }
+ else if (typeManager.comparePrecedences(component.getDeploymentType(), resolvedComponent.getDeploymentType()) > 0)
{
res.clear();
resolvedComponent = component;
res.add(resolvedComponent);
- } else
+ }
+ else
{
res.add(component);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/ManagerImpl.java Fri Jan 9 13:15:26 2009
@@ -262,7 +262,8 @@
if (this.proxyMap.containsKey(bean))
{
instance = (T) this.proxyMap.get(bean);
- } else
+ }
+ else
{
instance = (T) JavassistProxyFactory.createNewProxyInstance(bean);
@@ -276,7 +277,8 @@
instance = context.get(bean, true);
}
- } finally
+ }
+ finally
{
if (isSetOnThis)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/AbstractContext.java Fri Jan 9 13:15:26 2009
@@ -71,16 +71,20 @@
if (type.equals(ContextTypes.APPLICATION))
{
this.scopeType = ApplicationScoped.class;
- } else if (type.equals(ContextTypes.SESSION))
+ }
+ else if (type.equals(ContextTypes.SESSION))
{
this.scopeType = SessionScoped.class;
- } else if (type.equals(ContextTypes.REQUEST))
+ }
+ else if (type.equals(ContextTypes.REQUEST))
{
this.scopeType = RequestScoped.class;
- } else if (type.equals(ContextTypes.DEPENDENT))
+ }
+ else if (type.equals(ContextTypes.DEPENDENT))
{
this.scopeType = Dependent.class;
- } else if (type.equals(ContextTypes.CONVERSATION))
+ }
+ else if (type.equals(ContextTypes.CONVERSATION))
{
this.scopeType = ConversationScoped.class;
}
@@ -105,7 +109,8 @@
if ((instance = componentInstanceMap.get(component)) != null)
{
return (T) instance;
- } else
+ }
+ else
{
if (create)
{
@@ -168,7 +173,8 @@
{
componentInstanceMap.remove(component);
removeInstance(component);
- } else
+ }
+ else
{
throw new ContextRemoveException("Given component with " + component + " is not found in the current context with type : " + getType().getTypeName());
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/context/ContextFactory.java Fri Jan 9 13:15:26 2009
@@ -199,7 +199,8 @@
if (context == null)
{
conversationContext.set(new ConversationContext());
- } else
+ }
+ else
{
conversationContext.set(context);
}
@@ -268,17 +269,21 @@
if (scopeType.equals(RequestScoped.class))
{
context = getRequestContext();
- } else if (scopeType.equals(SessionScoped.class))
+ }
+ else if (scopeType.equals(SessionScoped.class))
{
context = getSessionContext();
- } else if (scopeType.equals(ApplicationScoped.class))
+ }
+ else if (scopeType.equals(ApplicationScoped.class))
{
context = getApplicationContext();
- } else if (scopeType.equals(ConversationScoped.class))
+ }
+ else if (scopeType.equals(ConversationScoped.class))
{
context = getConversationContext();
- } else if (scopeType.equals(Dependent.class))
+ }
+ else if (scopeType.equals(Dependent.class))
{
context = getDependentContext();
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -60,7 +60,8 @@
{
if (other.object != null)
return false;
- } else if (!object.equals(other.object))
+ }
+ else if (!object.equals(other.object))
return false;
return true;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorComparator.java Fri Jan 9 13:15:26 2009
@@ -28,7 +28,8 @@
if (o1.equals(o2))
{
return 0;
- } else
+ }
+ else
{
Class<?> o1Clazz = src.getClazz();
Class<?> o2Clazz = target.getClazz();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/decorator/DecoratorUtil.java Fri Jan 9 13:15:26 2009
@@ -55,7 +55,8 @@
if (found)
{
throw new WebBeansConfigurationException("Decorator class : " + decoratorClazz.getName() + " can only contain one delegate attribute but find more than one!.");
- } else
+ }
+ else
{
Class<?> fieldType = field.getType();
if (!ClassUtil.isInterface(fieldType.getModifiers()))
@@ -116,12 +117,14 @@
}
- } catch (SecurityException e)
+ }
+ catch (SecurityException e)
{
logger.error("Security exception, can not access decorator class : " + decClazz.getName() + " method : " + method.getName(), e);
throw new WebBeansException(e);
- } catch (NoSuchMethodException e)
+ }
+ catch (NoSuchMethodException e)
{
continue;
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -121,7 +121,8 @@
if (bindingOk)
{
allBindingsOk = true;
- } else
+ }
+ else
{
allBindingsOk = false;
break;
@@ -162,12 +163,14 @@
{
field.set(instance, delegate);
- } catch (IllegalArgumentException e)
+ }
+ catch (IllegalArgumentException e)
{
logger.error("Delegate field is not found on the given decorator class : " + instance.getClass().getName(), e);
throw new WebBeansException(e);
- } catch (IllegalAccessException e)
+ }
+ catch (IllegalAccessException e)
{
logger.error("Illegal access exception for field " + field.getName() + " in decorator class : " + instance.getClass().getName(), e);
}
@@ -305,7 +308,8 @@
{
if (other.clazz != null)
return false;
- } else if (!clazz.equals(other.clazz))
+ }
+ else if (!clazz.equals(other.clazz))
return false;
return true;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/deployment/DeploymentTypeManager.java Fri Jan 9 13:15:26 2009
@@ -60,7 +60,8 @@
if (!deploymentTypeMap.containsKey(deploymentType))
{
throw new IllegalArgumentException("Deployment type with annotation class : " + deploymentType.getName() + " is not applicable");
- } else
+ }
+ else
{
return deploymentTypeMap.get(deploymentType);
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -94,7 +94,8 @@
throw new WebBeansConfigurationException("Inherited StereoType with class name : " + clazz.getName() + " must have compatible @Target annotation with Stereotype class name : " + clazz.getName());
}
}
- } else if (innerValue.equals(ElementType.TYPE))
+ }
+ else if (innerValue.equals(ElementType.TYPE))
{
for (ElementType outerValue : outerValues)
{
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -92,7 +92,8 @@
defaultScopeType = defaultAnn;
scopeTypeFound = true;
- } else if (clazz.isAnnotationPresent(DeploymentType.class))
+ }
+ else if (clazz.isAnnotationPresent(DeploymentType.class))
{
if (deploymentTypeFound)
{
@@ -100,7 +101,8 @@
}
defaultDeploymentType = defaultAnn;
deploymentTypeFound = true;
- } else if (AnnotationUtil.isInterceptorBindingAnnotation(annClazz))
+ }
+ else if (AnnotationUtil.isInterceptorBindingAnnotation(annClazz))
{
Target target = clazz.getAnnotation(Target.class);
ElementType[] type = target.value();
@@ -111,7 +113,8 @@
}
interceptorBindingTypes.add(XMLUtil.getXMLDefinedAnnotationMember(child, annClazz, errorMessage));
- } else if (clazz.equals(Named.class))
+ }
+ else if (clazz.equals(Named.class))
{
defaultName = defaultAnn;
Named name = (Named) defaultName;
@@ -119,7 +122,8 @@
{
throw new WebBeansConfigurationException(errorMessage + "@StereoType annotation can not define @Named annotation with value");
}
- } else if (AnnotationUtil.isBindingAnnotation(annClazz))
+ }
+ else if (AnnotationUtil.isBindingAnnotation(annClazz))
{
throw new WebBeansConfigurationException(errorMessage + "@StereoType annotation can not define @BindingType annotation");
}
@@ -144,7 +148,8 @@
throw new WebBeansConfigurationException(errorMessage + "Inherited StereoType with class name : " + clazz.getName() + " must have compatible @Target annotation with Stereotype class name : " + outerStereoClass.getName());
}
}
- } else if (innerValue.equals(ElementType.TYPE))
+ }
+ else if (innerValue.equals(ElementType.TYPE))
{
for (ElementType outerValue : outerValues)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/el/WebBeansELResolver.java Fri Jan 9 13:15:26 2009
@@ -81,7 +81,8 @@
}
- } finally
+ }
+ finally
{
if (isResolution)
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/BeanObserverImpl.java Fri Jan 9 13:15:26 2009
@@ -83,7 +83,8 @@
if (ifExist)
{
object = context.get(baseComponent, false);
- } else
+ }
+ else
{
object = context.get(baseComponent, true);
}
@@ -100,18 +101,22 @@
{
observerMethod.invoke(object, args);
- } catch (IllegalArgumentException e)
+ }
+ catch (IllegalArgumentException e)
{
throw e;
- } catch (IllegalAccessException e)
+ }
+ catch (IllegalAccessException e)
{
throw new RuntimeException(e);
- } catch (InvocationTargetException e)
+ }
+ catch (InvocationTargetException e)
{
throw new RuntimeException(e);
- } finally
+ }
+ finally
{
if (isActiveSet)
{
@@ -121,7 +126,8 @@
}
- } finally
+ }
+ finally
{
if (isActiveSet)
{
@@ -150,7 +156,8 @@
{
annot = new Annotation[1];
annot[0] = new CurrentLiteral();
- } else
+ }
+ else
{
for (Annotation observersAnnot : annot)
{
@@ -174,7 +181,8 @@
args = pt.getActualTypeArguments();
clazz = (Class<?>) pt.getRawType();
- } else
+ }
+ else
{
clazz = (Class<?>) type;
}
@@ -184,7 +192,8 @@
if (bindingTypes.length > 0)
{
list.add(manager.getInstance(InjectionResolver.getInstance().implResolveByType(clazz, args, bindingTypes).iterator().next()));
- } else
+ }
+ else
{
list.add(null);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventUtil.java Fri Jan 9 13:15:26 2009
@@ -61,16 +61,20 @@
if (AnnotationUtil.isMethodParameterAnnotationExist(observerMethod, AfterTransactionCompletion.class))
{
return TransactionalObserverType.AFTER_TRANSACTION_COMPLETION;
- } else if (AnnotationUtil.isMethodParameterAnnotationExist(observerMethod, AfterTransactionSuccess.class))
+ }
+ else if (AnnotationUtil.isMethodParameterAnnotationExist(observerMethod, AfterTransactionSuccess.class))
{
return TransactionalObserverType.AFTER_TRANSACTION_SUCCESS;
- } else if (AnnotationUtil.isMethodParameterAnnotationExist(observerMethod, AfterTransactionFailure.class))
+ }
+ else if (AnnotationUtil.isMethodParameterAnnotationExist(observerMethod, AfterTransactionFailure.class))
{
return TransactionalObserverType.AFTER_TRANSACTION_FAILURE;
- } else if (AnnotationUtil.isMethodParameterAnnotationExist(observerMethod, BeforeTransactionCompletion.class))
+ }
+ else if (AnnotationUtil.isMethodParameterAnnotationExist(observerMethod, BeforeTransactionCompletion.class))
{
return TransactionalObserverType.BEFORE_TRANSACTION_COMPLETION;
- } else
+ }
+ else
{
return TransactionalObserverType.NONE;
}
@@ -104,7 +108,8 @@
{
ClassUtil.checkParametrizedType((ParameterizedType) type);
eventType = (Class<?>) ((ParameterizedType) type).getRawType();
- } else
+ }
+ else
{
eventType = (Class<?>) type;
}
@@ -139,7 +144,8 @@
if (!ClassUtil.isParametrizedType(fieldType))
{
throw new WebBeansConfigurationException("@Observable field/method-parameter in " + errorMessage + " with field : " + fieldName + " must be ParametrizedType with actual type argument");
- } else
+ }
+ else
{
ParameterizedType pType = (ParameterizedType) fieldType;
Class<?> clazz = (Class<?>) pType.getRawType();
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java Fri Jan 9 13:15:26 2009
@@ -212,30 +212,37 @@
if (type.equals(TransactionalObserverType.AFTER_TRANSACTION_COMPLETION))
{
transNotifier.addAfterCompletionObserver(observer);
- } else if (type.equals(TransactionalObserverType.AFTER_TRANSACTION_SUCCESS))
+ }
+ else if (type.equals(TransactionalObserverType.AFTER_TRANSACTION_SUCCESS))
{
transNotifier.addAfterCompletionSuccessObserver(observer);
- } else if (type.equals(TransactionalObserverType.AFTER_TRANSACTION_FAILURE))
+ }
+ else if (type.equals(TransactionalObserverType.AFTER_TRANSACTION_FAILURE))
{
transNotifier.addAfterCompletionFailureObserver(observer);
- } else if (type.equals(TransactionalObserverType.BEFORE_TRANSACTION_COMPLETION))
+ }
+ else if (type.equals(TransactionalObserverType.BEFORE_TRANSACTION_COMPLETION))
{
transNotifier.addBeforeCompletionObserver(observer);
}
- } else
+ }
+ else
{
observer.notify(event);
}
- } else
+ }
+ else
{
observer.notify(event);
}
- } else
+ }
+ else
{
observer.notify(event);
}
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
if (Exception.class.isAssignableFrom(e.getClass()))
{
@@ -290,17 +297,20 @@
{
notifier.notifyAfterCompletionSuccess();
- } else if (status == Status.STATUS_ROLLEDBACK)
+ }
+ else if (status == Status.STATUS_ROLLEDBACK)
{
notifier.notifyAfterCompletionFailure();
}
}
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
logger.error("Exception is occured in the transational observer ", e);
- } finally
+ }
+ finally
{
this.transactionSet.clear();
}
@@ -318,7 +328,8 @@
notifier.notifyBeforeCompletion();
}
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
logger.error("Exception is occured in the transational observer ", e);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverImpl.java Fri Jan 9 13:15:26 2009
@@ -77,7 +77,8 @@
{
ok = false;
break;
- } else
+ }
+ else
{
if (!AnnotationUtil.isAnnotationMemberExist(annot.annotationType(), annot, getAnnotation(annot.annotationType())))
{
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -127,7 +127,8 @@
{
if (other.event.getClass() != null)
return false;
- } else if (!event.getClass().equals(other.event.getClass()))
+ }
+ else if (!event.getClass().equals(other.event.getClass()))
return false;
return true;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/AbstractInjectable.java Fri Jan 9 13:15:26 2009
@@ -93,12 +93,14 @@
{
return injectForDependent(component);
- } else
+ }
+ else
{
return injectForComponent(component);
}
- } finally
+ }
+ finally
{
if (isSetOnThis)
{
@@ -141,7 +143,8 @@
if (type instanceof ParameterizedType)
{
clazz = (Class<?>) ((ParameterizedType) type).getRawType();
- } else if (type instanceof Class)
+ }
+ else if (type instanceof Class)
{
clazz = (Class<?>) type;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/InjectableConstructor.java Fri Jan 9 13:15:26 2009
@@ -87,7 +87,8 @@
args = pt.getActualTypeArguments();
clazz = (Class<?>) pt.getRawType();
- } else
+ }
+ else
{
clazz = (Class<?>) type;
}
@@ -107,7 +108,8 @@
instance = con.newInstance(list.toArray());
}
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new WebBeansException(e);
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -79,7 +79,8 @@
args = pt.getActualTypeArguments();
clazz = (Class<?>) pt.getRawType();
- } else
+ }
+ else
{
clazz = (Class<?>) type;
}
@@ -91,7 +92,8 @@
field.set(instance, inject(clazz, args, annots));
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new WebBeansException(e);
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -81,7 +81,8 @@
args = pt.getActualTypeArguments();
clazz = (Class<?>) pt.getRawType();
- } else
+ }
+ else
{
clazz = (Class<?>) type;
}
@@ -103,7 +104,8 @@
return (T) m.invoke(instance, list.toArray());
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new WebBeansException(e);
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -77,7 +77,8 @@
// }
}
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
e.printStackTrace();
throw new WebBeansException(e);
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -50,7 +50,8 @@
field.set(instance, inject(this.injectionPointModel.getInjectionClassType(), this.injectionPointModel.getActualTypeArguments(), anns));
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new WebBeansException(e);
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -63,7 +63,8 @@
return (T) m.invoke(instance, list.toArray());
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
// no-op
e.printStackTrace();
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -174,13 +174,15 @@
{
if (other.bindingTypes != null)
return false;
- } else if (!bindingTypes.equals(other.bindingTypes))
+ }
+ else if (!bindingTypes.equals(other.bindingTypes))
return false;
if (injectionClassType == null)
{
if (other.injectionClassType != null)
return false;
- } else if (!injectionClassType.equals(other.injectionClassType))
+ }
+ else if (!injectionClassType.equals(other.injectionClassType))
return false;
if (parametrized != other.parametrized)
return false;
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorComparator.java Fri Jan 9 13:15:26 2009
@@ -30,7 +30,8 @@
if (o1.equals(o2))
{
return 0;
- } else
+ }
+ else
{
Class<?> o1Clazz = src.getClazz();
Class<?> o2Clazz = target.getClazz();
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -30,7 +30,8 @@
if (o1.equals(o2))
{
return 0;
- } else
+ }
+ else
{
WebBeansInterceptor interceptorFirst = (WebBeansInterceptor) o1.getWebBeansInterceptor();
WebBeansInterceptor interceptorSecond = (WebBeansInterceptor) o2.getWebBeansInterceptor();
@@ -44,10 +45,12 @@
{
return 1;
- } else if (interceptorSecond == null)
+ }
+ else if (interceptorSecond == null)
{
return -1;
- } else
+ }
+ else
{
Class<?> o1Clazz = interceptorFirst.getClazz();
Class<?> o2Clazz = interceptorSecond.getClazz();
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -74,10 +74,12 @@
if (annotation.equals(AroundInvoke.class))
{
setAroundInvoke(m);
- } else if (annotation.equals(PostConstruct.class))
+ }
+ else if (annotation.equals(PostConstruct.class))
{
setPostConstruct(m);
- } else if (annotation.equals(PreDestroy.class))
+ }
+ else if (annotation.equals(PreDestroy.class))
{
setPreDestroy(m);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorHandler.java Fri Jan 9 13:15:26 2009
@@ -58,10 +58,12 @@
if (this.calledMethod == null)
{
this.calledMethod = method;
- } else if (this.calledMethod.equals(method))
+ }
+ else if (this.calledMethod.equals(method))
{
this.isSameDecMethod = true;
- } else
+ }
+ else
{
this.calledMethod = method;
this.isSameDecMethod = false;
@@ -117,19 +119,23 @@
}
}
- } catch (SecurityException e)
+ }
+ catch (SecurityException e)
{
logger.error("Method security access violation for method " + method.getName() + " for decorator class : " + decorator.getClass().getName());
throw new WebBeansException(e);
- } catch (NoSuchMethodException e)
+ }
+ catch (NoSuchMethodException e)
{
continue;
- } catch (InvocationTargetException e)
+ }
+ catch (InvocationTargetException e)
{
logger.error("Exception in calling method " + method.getName() + " for decorator class : " + decorator.getClass().getName() + ". Look log for target checked exception.", e.getTargetException());
throw new WebBeansException(e);
- } catch (IllegalAccessException e)
+ }
+ catch (IllegalAccessException e)
{
logger.error("Method illegal access for method " + method.getName() + " for decorator class : " + decorator.getClass().getName());
throw new WebBeansException(e);
@@ -168,14 +174,16 @@
if (!data.isDefinedInMethod() && data.isDefinedInInterceptorClass())
{
it.remove();
- } else if (data.isDefinedInMethod())
+ }
+ else if (data.isDefinedInMethod())
{
if (!data.getAnnotatedMethod().equals(method))
{
it.remove();
}
}
- } else
+ }
+ else
{
if (data.isDefinedInMethod())
{
@@ -185,7 +193,8 @@
}
}
}
- } else
+ }
+ else
{
if (data.isDefinedInMethod())
{
@@ -223,14 +232,16 @@
if (!data.isDefinedInMethod() && data.isDefinedInInterceptorClass() && data.isDefinedWithWebBeansInterceptor())
{
it.remove();
- } else if (data.isDefinedInMethod() && data.isDefinedWithWebBeansInterceptor())
+ }
+ else if (data.isDefinedInMethod() && data.isDefinedWithWebBeansInterceptor())
{
if (!data.getAnnotatedMethod().equals(method))
{
it.remove();
}
}
- } else
+ }
+ else
{
if (data.isDefinedInMethod() && data.isDefinedWithWebBeansInterceptor())
{
@@ -240,7 +251,8 @@
}
}
}
- } else
+ }
+ else
{
if (data.isDefinedInMethod() && data.isDefinedWithWebBeansInterceptor())
{
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorType.java Fri Jan 9 13:15:26 2009
@@ -33,19 +33,24 @@
if (type.equals(InterceptionType.AROUND_INVOKE))
{
return AROUND_INVOKE;
- } else if (type.equals(InterceptionType.POST_CONSTRUCT))
+ }
+ else if (type.equals(InterceptionType.POST_CONSTRUCT))
{
return POST_CONSTRUCT;
- } else if (type.equals(InterceptionType.PRE_DESTROY))
+ }
+ else if (type.equals(InterceptionType.PRE_DESTROY))
{
return PRE_DESTROY;
- } else if (type.equals(InterceptionType.PRE_PASSIVATE))
+ }
+ else if (type.equals(InterceptionType.PRE_PASSIVATE))
{
return PRE_PASSIVATE;
- } else if (type.equals(InterceptionType.POST_ACTIVATE))
+ }
+ else if (type.equals(InterceptionType.POST_ACTIVATE))
{
return POST_ACTIVATE;
- } else
+ }
+ else
{
throw new WebBeansException("Undefined interceptor type!");
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InterceptorUtil.java Fri Jan 9 13:15:26 2009
@@ -84,19 +84,24 @@
if (type.equals(InterceptionType.AROUND_INVOKE))
{
return AroundInvoke.class;
- } else if (type.equals(InterceptionType.POST_ACTIVATE))
+ }
+ else if (type.equals(InterceptionType.POST_ACTIVATE))
{
return PostActivate.class;
- } else if (type.equals(InterceptionType.POST_CONSTRUCT))
+ }
+ else if (type.equals(InterceptionType.POST_CONSTRUCT))
{
return PostConstruct.class;
- } else if (type.equals(InterceptionType.PRE_DESTROY))
+ }
+ else if (type.equals(InterceptionType.PRE_DESTROY))
{
return PreDestroy.class;
- } else if (type.equals(InterceptionType.PRE_PASSIVATE))
+ }
+ else if (type.equals(InterceptionType.PRE_PASSIVATE))
{
return PrePassivate.class;
- } else
+ }
+ else
{
throw new WebBeansException("Undefined interceotion type");
}
@@ -208,7 +213,8 @@
if (AnnotationUtil.getInterceptorBindingMetaAnnotations(anns).length > 0)
{
hasClassInterceptors = true;
- } else
+ }
+ else
{
Annotation[] stereoTypes = AnnotationUtil.getStereotypeMetaAnnotations(clazz.getAnnotations());
for (Annotation stero : stereoTypes)
@@ -231,7 +237,8 @@
if (hasClassInterceptors)
{
throw new WebBeansConfigurationException("Simple web bean class : " + clazz.getName() + " can not define non-static, non-private final methods. Because it is annotated with at least one @InterceptorBindintType");
- } else
+ }
+ else
{
if (AnnotationUtil.isInterceptorBindingMetaAnnotationExist(method.getDeclaredAnnotations()))
{
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -121,12 +121,14 @@
if (type.equals(InterceptorType.AROUND_INVOKE))
{
return proceedAroundInvokes(this.interceptorDatas);
- } else
+ }
+ else
{
return proceedCommonAnnots(this.interceptorDatas, this.type);
}
- } catch (Exception e)
+ }
+ catch (Exception e)
{
this.target = null; // destroy target instance
@@ -160,7 +162,8 @@
currentMethod++;
result = method.invoke(t, new Object[] { this });
- } else
+ }
+ else
{
result = this.method.invoke(target, parameters);
}
@@ -183,7 +186,8 @@
if (type.equals(InterceptorType.POST_CONSTRUCT))
{
method = intc.getPostConstruct();
- } else if (type.equals(InterceptorType.PRE_DESTROY))
+ }
+ else if (type.equals(InterceptorType.PRE_DESTROY))
{
method = intc.getPreDestroy();
}
@@ -200,7 +204,8 @@
{
t = target;
result = method.invoke(t, new Object[] {});
- } else
+ }
+ else
{
result = method.invoke(t, new Object[] { this });
}
@@ -225,7 +230,8 @@
{
throw new IllegalArgumentException("Parameters is null");
}
- } else
+ }
+ else
{
List<Class<?>> src = new ArrayList<Class<?>>();
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -126,11 +126,13 @@
if (AnnotationUtil.isAnnotationMemberExist(bindingType, annots.get(i), target))
{
result = true;
- } else
+ }
+ else
{
return false;
}
- } else
+ }
+ else
{
return false;
}
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=733153&r1=733152&r2=733153&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 Fri Jan 9 13:15:26 2009
@@ -156,13 +156,15 @@
{
if (other.id != null)
return false;
- } else if (!id.equals(other.id))
+ }
+ else if (!id.equals(other.id))
return false;
if (sessionId == null)
{
if (other.sessionId != null)
return false;
- } else if (!sessionId.equals(other.sessionId))
+ }
+ else if (!sessionId.equals(other.sessionId))
return false;
return true;
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/jsf/WebBeansPhaseListener.java Fri Jan 9 13:15:26 2009
@@ -54,7 +54,8 @@
ContextFactory.initConversationContext(null);
- } else
+ }
+ else
{
logger.info("Propogation of the conversation with id : " + cid + " for view : " + JSFUtil.getViewId());
conversation = (ConversationImpl) conversationManager.getConversation(cid);
@@ -66,12 +67,14 @@
conversation = (ConversationImpl) conversationManager.createNewConversation(JSFUtil.getViewId());
ContextFactory.initConversationContext(null);
- } else
+ }
+ else
{
ContextFactory.initConversationContext(conversationManager.getConversationContext(conversation));
}
}
- } else
+ }
+ else
{
logger.info("Postback JSF Request for view id : " + JSFUtil.getViewId());
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/lifecycle/WebBeansLifeCycle.java Fri Jan 9 13:15:26 2009
@@ -133,7 +133,8 @@
applicationCtx.addELResolver(new WebBeansELResolver());
}
- } catch (MalformedURLException e)
+ }
+ catch (MalformedURLException e)
{
logger.error(e);
throw new WebBeansException(e);
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/proxy/JavassistProxyFactory.java Fri Jan 9 13:15:26 2009
@@ -50,7 +50,8 @@
if (type.isInterface())
{
interfaceList.add(type);
- } else if ((superClass == null) || (superClass.isAssignableFrom(type) && type != Object.class))
+ }
+ else if ((superClass == null) || (superClass.isAssignableFrom(type) && type != Object.class))
{
superClass = type;
}
@@ -73,7 +74,8 @@
result = fact.createClass().newInstance();
- } catch (Throwable e)
+ }
+ catch (Throwable e)
{
throw new WebBeansException(e);
}
@@ -94,7 +96,8 @@
result = (WebBeansAnnotation) pf.create(new Class[] { Class.class }, new Object[] { annotationType });
- } catch (Exception e)
+ }
+ catch (Exception e)
{
throw new WebBeansException(e);
}
Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/transaction/TransactionUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/transaction/TransactionUtil.java?rev=733153&r1=733152&r2=733153&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/transaction/TransactionUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/transaction/TransactionUtil.java Fri Jan 9 13:15:26 2009
@@ -39,7 +39,8 @@
{
transactionManager = (TransactionManager) JNDIUtil.getInitialContext().lookup("java:/TransactionManager");
- } catch (NamingException e)
+ }
+ catch (NamingException e)
{
logger.error("Unable to get TransactionManager", e);
throw new WebBeansException(e);