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

Author: nickarls Date: 2010-04-09 16:51:42 -0400 (Fri, 09 Apr 2010) New Revision: 12424 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/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/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.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: Coding conventions 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/ConversationBoundaryInterceptor.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -41,7 +41,9 @@ * * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> */ -public @ConversationBoundary @Interceptor class ConversationBoundaryInterceptor implements Serializable +@ConversationBoundary +@Interceptor +public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/context/conversation/NamedConversationAliasProducer.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -35,7 +35,10 @@ */ public class NamedConversationAliasProducer { - public @Produces @Named @Typed(/* no types - prevents injection */) Conversation getConversation(final Conversation conversation) + @Produces + @Named + @Typed(/* no types - prevents injection */) + public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/ExternalContextProducer.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -48,7 +48,9 @@ */ public class ExternalContextProducer { - public @Produces @RequestScoped ExternalContext getExternalContext(final FacesContext context) + @Produces + @RequestScoped + public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/FacesContextProducer.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -53,7 +53,9 @@ */ public class FacesContextProducer { - public @Produces @RequestScoped FacesContext getFacesContext() + @Produces + @RequestScoped + public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/environment/NavigationHandlerProducer.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -41,7 +41,9 @@ @Inject FacesContext context; - public @Produces @RequestScoped NavigationHandler getNavigationHandler() + @Produces + @RequestScoped + public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/PhaseEventBridge.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -63,7 +63,8 @@ * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a> * */ -public @ApplicationScoped class PhaseEventBridge extends BeanManagerAware implements PhaseListener +@ApplicationScoped +public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/event/SystemEventBridge.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -53,7 +53,8 @@ * * @author Nicklas Karlsson */ -public @ApplicationScoped class SystemEventBridge extends BeanManagerAware implements SystemEventListener +@ApplicationScoped +public class SystemEventBridge extends BeanManagerAware implements SystemEventListener { public boolean isListenerForSource(final Object source) @@ -67,5 +68,4 @@ getBeanManager().fireEvent(payload); } - } Modified: modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java =================================================================== --- modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2010-04-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/main/java/org/jboss/seam/faces/international/FacesLocaleResolver.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -44,8 +44,8 @@ return facesContext != null && facesContext.getCurrentPhaseId() != null; } - public @Produces - Locale getLocale() + @Produces + public Locale getLocale() { if (facesContext.getViewRoot() != null) { 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/ImproperlyAnnotatedBean.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.context; import javax.faces.bean.RequestScoped; @@ -27,6 +27,7 @@ * @author <a href="mailto:lincolnbaxter@gmail.com>Lincoln Baxter, III</a> * */ -public @RequestScoped class ImproperlyAnnotatedBean +@RequestScoped +public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/context/conversation/ConversationalBean.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.context.conversation; import javax.enterprise.context.Conversation; @@ -31,7 +31,8 @@ * @author <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a> * */ -public @RequestScoped class ConversationalBean +@RequestScoped +public 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/PhaseEventObserver.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -18,7 +18,7 @@ * License along with this software; if not, write to the Free * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + */ package org.jboss.seam.faces.event; import java.util.ArrayList; @@ -44,9 +44,10 @@ /** * * @author Nicklas Karlsson - * + * */ -public @ApplicationScoped class PhaseEventObserver +@ApplicationScoped +public class PhaseEventObserver { private Map<String, List<PhaseId>> observations = new HashMap<String, List<PhaseId>>(); @@ -167,16 +168,15 @@ { recordObservation("19", e.getPhaseId()); } - + public void observeAllAfterEvents(@Observes @Before final PhaseEvent e) { recordObservation("20", e.getPhaseId()); } - + public void observeAllEvents(@Observes final PhaseEvent e) { recordObservation("21", e.getPhaseId()); } - } 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-09 20:50:59 UTC (rev 12423) +++ modules/faces/trunk/impl/src/test/java/org/jboss/seam/faces/event/SystemEventObserver.java 2010-04-09 20:51:42 UTC (rev 12424) @@ -33,9 +33,10 @@ /** * * @author Nicklas Karlsson - * + * */ -public @ApplicationScoped class SystemEventObserver +@ApplicationScoped +public class SystemEventObserver { public static boolean componentSystemEvent; public static boolean excecptionQueuedEvent; @@ -44,32 +45,32 @@ public static boolean preDestroyApplicationEvent; public static boolean preDestroyCustomScopeEvent; - public void observeComponentSystemEvent(@Observes ComponentSystemEvent e) + public void observeComponentSystemEvent(@Observes ComponentSystemEvent e) { componentSystemEvent = true; } - public void observeExceptionQueuedEvent(@Observes ExceptionQueuedEvent e) + public void observeExceptionQueuedEvent(@Observes ExceptionQueuedEvent e) { excecptionQueuedEvent = true; } - public void observePostConstructApplicationEvent(@Observes PostConstructApplicationEvent e) + public void observePostConstructApplicationEvent(@Observes PostConstructApplicationEvent e) { postConstructApplicationEvent = true; } - - public void observePreDestroyApplicationEvent(@Observes PreDestroyApplicationEvent e) + + public void observePreDestroyApplicationEvent(@Observes PreDestroyApplicationEvent e) { preDestroyApplicationEvent = true; - } - - public void observePostConstructCustomScopeEvent(@Observes PostConstructCustomScopeEvent e) + } + + public void observePostConstructCustomScopeEvent(@Observes PostConstructCustomScopeEvent e) { postConstructCustomScopeEvent = true; } - - public void observePreDestroyCustomScopeEvent(@Observes PreDestroyCustomScopeEvent e) + + public void observePreDestroyCustomScopeEvent(@Observes PreDestroyCustomScopeEvent e) { preDestroyCustomScopeEvent = true; }