[seam-commits] Seam SVN: r12410 - in modules/faces/trunk/impl/src: main/java/org/jboss/seam/faces/context/conversation and 5 other directories.

Author: nickarls Date: 2010-04-07 02:27:27 -0400 (Wed, 07 Apr 2010) New Revision: 12410 Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/MethodBindingMethodExpressionAdapter.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/ImproperlyAnnotatedBean.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java Log: qualifier/annotation placement conventions Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/MethodBindingMethodExpressionAdapter.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/MethodBindingMethodExpressionAdapter.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/component/MethodBindingMethodExpressionAdapter.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -36,23 +36,21 @@ package org.jboss.seam.faces.component; import java.io.Serializable; +import java.lang.reflect.Method; +import java.util.Arrays; +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.ExpressionFactory; +import javax.el.MethodExpression; +import javax.el.MethodInfo; +import javax.el.ValueExpression; import javax.faces.component.StateHolder; import javax.faces.context.FacesContext; import javax.faces.el.EvaluationException; import javax.faces.el.MethodBinding; import javax.faces.el.MethodNotFoundException; -import javax.el.MethodExpression; -import javax.el.MethodInfo; -import javax.el.ELException; -import javax.el.ELContext; -import javax.el.ExpressionFactory; -import javax.el.ValueExpression; - -import java.util.Arrays; -import java.lang.reflect.Method; - /** * <p> * Wrap a MethodExpression instance and expose it as a MethodBinding Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -23,9 +23,7 @@ * * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> */ -@ConversationBoundary -@Interceptor -public class ConversationBoundaryInterceptor implements Serializable +public @ConversationBoundary @Interceptor class ConversationBoundaryInterceptor implements Serializable { private static final long serialVersionUID = -2729227895205287477L; Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -14,10 +14,7 @@ */ public class NamedConversationAliasProducer { - public @Produces - @Named - @Typed(/* no types - prevents injection */) - Conversation getConversation(final Conversation conversation) + public @Produces @Named @Typed(/* no types - prevents injection */) Conversation getConversation(final Conversation conversation) { return conversation; } Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -28,9 +28,7 @@ */ public class ExternalContextProducer { - public @Produces - @RequestScoped - ExternalContext getExternalContext(final FacesContext context) + public @Produces @RequestScoped ExternalContext getExternalContext(final FacesContext context) { return context.getExternalContext(); } Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -48,9 +48,7 @@ */ public class FacesContextProducer { - public @Produces - @RequestScoped - FacesContext getFacesContext() + public @Produces @RequestScoped FacesContext getFacesContext() { FacesContext ctx = FacesContext.getCurrentInstance(); if (ctx == null) Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -21,9 +21,7 @@ @Inject FacesContext context; - public @Produces - @RequestScoped - NavigationHandler getNavigationHandler() + public @Produces @RequestScoped NavigationHandler getNavigationHandler() { if (context != null) { Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -42,8 +42,7 @@ * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a> * */ -@ApplicationScoped -public class PhaseEventBridge extends BeanManagerAware implements PhaseListener +public @ApplicationScoped class PhaseEventBridge extends BeanManagerAware implements PhaseListener { private static final long serialVersionUID = -6181019551463318453L; Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -32,8 +32,7 @@ * * @author Nicklas Karlsson */ -@ApplicationScoped -public class SystemEventBridge extends BeanManagerAware implements SystemEventListener +public @ApplicationScoped class SystemEventBridge extends BeanManagerAware implements SystemEventListener { public boolean isListenerForSource(final Object source) Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/ImproperlyAnnotatedBean.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/ImproperlyAnnotatedBean.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/ImproperlyAnnotatedBean.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -9,7 +9,6 @@ * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a> * */ -@RequestScoped -public class ImproperlyAnnotatedBean +public @RequestScoped class ImproperlyAnnotatedBean { } Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -13,8 +13,7 @@ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> * */ -@RequestScoped -public class ConversationalBean +public @RequestScoped class ConversationalBean { @Inject Conversation conversation; Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -20,8 +20,7 @@ import org.jboss.seam.faces.event.qualifier.RestoreView; import org.jboss.seam.faces.event.qualifier.UpdateModelValues; -@ApplicationScoped -public class PhaseEventObserver +public @ApplicationScoped class PhaseEventObserver { private Map<String, List<PhaseId>> observations = new HashMap<String, List<PhaseId>>(); Modified: modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java =================================================================== --- modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-07 03:18:58 UTC (rev 12409) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-07 06:27:27 UTC (rev 12410) @@ -9,8 +9,7 @@ import javax.faces.event.PreDestroyApplicationEvent; import javax.faces.event.PreDestroyCustomScopeEvent; -@ApplicationScoped -public class SystemEventObserver +public @ApplicationScoped class SystemEventObserver { public static boolean componentSystemEvent; public static boolean excecptionQueuedEvent;