You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/13 16:37:36 UTC
svn commit: r676333 - in
/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra:
connectionManager/ conversation/ conversation/jsf/
conversation/jsf/components/facelets/ conversation/spring/
frameworkAdapter/basic/ frameworkAdapter/js...
Author: skitching
Date: Sun Jul 13 07:37:34 2008
New Revision: 676333
URL: http://svn.apache.org/viewvc?rev=676333&view=rev
Log:
Apply same code style fixes already applied to core12 release branch.
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/DisconnectableConnectionFactory.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/AccessScopeManager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/facelets/ConverterTagHandler.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AbstractSpringOrchestraScope.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/OrchestraAdvisorBeanPostProcessor.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapterFilter.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapterFilter.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/springBasic/SpringBasicFrameworkAdapterFilter.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/FrameworkAdapterRequestHandler.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/jsf/RequestParameterFacesContextFactory.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/CompositeViewControllerNameMapper.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/DisconnectableConnectionFactory.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/DisconnectableConnectionFactory.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/DisconnectableConnectionFactory.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/connectionManager/DisconnectableConnectionFactory.java Sun Jul 13 07:37:34 2008
@@ -95,7 +95,8 @@
}
catch (SQLException e)
{
- LogFactory.getLog(DisconnectableConnectionFactory.class).warn(e.getLocalizedMessage(), e);
+ LogFactory.getLog(DisconnectableConnectionFactory.class)
+ .warn(e.getLocalizedMessage(), e);
}
}
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/AccessScopeManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/AccessScopeManager.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/AccessScopeManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/AccessScopeManager.java Sun Jul 13 07:37:34 2008
@@ -75,7 +75,8 @@
//
// This is a little dodgy as settings made through the new AccessScopeManage
// bean will will now be silently ignored.
- FlashScopeManagerConfiguration cfg = (FlashScopeManagerConfiguration) fa.getBean(FlashScopeManagerConfiguration.class.getName());
+ FlashScopeManagerConfiguration cfg = (FlashScopeManagerConfiguration) fa.getBean(
+ FlashScopeManagerConfiguration.class.getName());
if (cfg != null)
{
manager = new AccessScopeManager();
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java Sun Jul 13 07:37:34 2008
@@ -366,7 +366,8 @@
{
touch();
- Conversation[] convs = (Conversation[]) conversations.values().toArray(new Conversation[conversations.size()]);
+ Conversation[] convs = (Conversation[]) conversations.values().toArray(
+ new Conversation[conversations.size()]);
return Arrays.asList(convs).iterator();
}
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationManager.java Sun Jul 13 07:37:34 2008
@@ -109,7 +109,8 @@
}
}
- ConversationManager conversationManager = (ConversationManager) frameworkAdapter.getSessionAttribute(CONVERSATION_MANAGER_KEY);
+ ConversationManager conversationManager = (ConversationManager) frameworkAdapter.getSessionAttribute(
+ CONVERSATION_MANAGER_KEY);
if (conversationManager == null && create)
{
// TODO: do not call new directly here, as it makes it impossible to configure
@@ -141,8 +142,10 @@
{
if (fa.containsRequestParameterAttribute(CONVERSATION_CONTEXT_PARAM))
{
- String urlConversationContextId = fa.getRequestParameterAttribute(CONVERSATION_CONTEXT_PARAM).toString();
- conversationContextId = new Long(Long.parseLong(urlConversationContextId, Character.MAX_RADIX));
+ String urlConversationContextId = fa.getRequestParameterAttribute(
+ CONVERSATION_CONTEXT_PARAM).toString();
+ conversationContextId = new Long(
+ Long.parseLong(urlConversationContextId, Character.MAX_RADIX));
}
}
return conversationContextId;
@@ -248,7 +251,8 @@
{
synchronized (this)
{
- ConversationContext conversationContext = (ConversationContext) conversationContexts.get(conversationContextId);
+ ConversationContext conversationContext = (ConversationContext) conversationContexts.get(
+ conversationContextId);
if (conversationContext == null)
{
conversationContext = new ConversationContext(null, conversationContextId.longValue());
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/_JsfConversationUtils.java Sun Jul 13 07:37:34 2008
@@ -64,7 +64,8 @@
/**
* Find a child start or end conversation component for the given conversation name
*/
- public static AbstractConversationComponent findEndConversationComponent(UIComponent component, String conversationName)
+ public static AbstractConversationComponent findEndConversationComponent(
+ UIComponent component, String conversationName)
{
Iterator iterComponents = component.getFacetsAndChildren();
while (iterComponents.hasNext())
@@ -96,7 +97,8 @@
/**
* end and restart a conversation
*/
- public static void endAndRestartConversation(FacesContext context, String conversationName, Boolean restart, MethodBinding restartAction)
+ public static void endAndRestartConversation(FacesContext context,
+ String conversationName, Boolean restart, MethodBinding restartAction)
{
ConversationManager conversationManager = ConversationManager.getInstance();
Conversation conversation = conversationManager.getConversation(conversationName);
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/facelets/ConverterTagHandler.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/facelets/ConverterTagHandler.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/facelets/ConverterTagHandler.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/facelets/ConverterTagHandler.java Sun Jul 13 07:37:34 2008
@@ -47,7 +47,8 @@
useWrapper = getAttribute("useWrapper"); // NON-NLS
}
- public void apply(FaceletContext faceletContext, UIComponent parent) throws IOException, FacesException, FaceletException, ELException
+ public void apply(FaceletContext faceletContext, UIComponent parent)
+ throws IOException, FacesException, FaceletException, ELException
{
if (parent.getParent() == null)
{
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AbstractSpringOrchestraScope.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AbstractSpringOrchestraScope.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AbstractSpringOrchestraScope.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/AbstractSpringOrchestraScope.java Sun Jul 13 07:37:34 2008
@@ -65,7 +65,8 @@
Scope, BeanFactoryAware, ApplicationContextAware
{
private final Log log = LogFactory.getLog(AbstractSpringOrchestraScope.class);
- private static final String POST_PROCESSOR_BEAN_NAME = AbstractSpringOrchestraScope.class.getName() + "_BeanPostProcessor";
+ private static final String POST_PROCESSOR_BEAN_NAME =
+ AbstractSpringOrchestraScope.class.getName() + "_BeanPostProcessor";
private ConfigurableApplicationContext applicationContext;
private Advice[] advices;
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/BeanDefinitionConversationNameAttrDecorator.java Sun Jul 13 07:37:34 2008
@@ -43,7 +43,8 @@
* A unique key used to store the orchestra conversationName within the attributes map
* of a spring bean definition.
*/
- public final static String CONVERSATION_NAME_ATTRIBUTE = "org.apache.myfaces.orchestra.spring.conversationName"; // NON-NLS
+ public final static String CONVERSATION_NAME_ATTRIBUTE =
+ "org.apache.myfaces.orchestra.spring.conversationName"; // NON-NLS
public BeanDefinitionHolder decorate(
Node node,
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/OrchestraAdvisorBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/OrchestraAdvisorBeanPostProcessor.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/OrchestraAdvisorBeanPostProcessor.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/OrchestraAdvisorBeanPostProcessor.java Sun Jul 13 07:37:34 2008
@@ -189,7 +189,9 @@
// ok, this is not an orchestra-scoped bean
if (log.isDebugEnabled())
{
- log.debug("scope associated with bean " + beanName + " is not orchestra:" + scopeObj.getClass().getName());
+ log.debug(
+ "scope associated with bean " + beanName +
+ " is not orchestra:" + scopeObj.getClass().getName());
}
return null;
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/PersistenceContextConversationInterceptor.java Sun Jul 13 07:37:34 2008
@@ -45,8 +45,10 @@
*/
public class PersistenceContextConversationInterceptor implements MethodInterceptor
{
- private final static String PERSISTENCE_CONTEXT_CONV_ATTRIBUTE = PersistenceContextConversationInterceptor.class.getName() + ".PERSISTENCE_CONTEXT";
- public final static String REQUEST_ATTRIBUTE = PersistenceContextConversationInterceptor.class.getName() + ".USED_PERSISTENCE_CONTEXTS";
+ private final static String PERSISTENCE_CONTEXT_CONV_ATTRIBUTE =
+ PersistenceContextConversationInterceptor.class.getName() + ".PERSISTENCE_CONTEXT";
+ public final static String REQUEST_ATTRIBUTE =
+ PersistenceContextConversationInterceptor.class.getName() + ".USED_PERSISTENCE_CONTEXTS";
private PersistenceContextFactory persistenceContextFactory;
@@ -66,7 +68,8 @@
Conversation conversation = Conversation.getCurrentInstance();
if (conversation != null)
{
- PersistenceContextCloser persistenceContextCloser = (PersistenceContextCloser) conversation.getAttribute(PERSISTENCE_CONTEXT_CONV_ATTRIBUTE);
+ PersistenceContextCloser persistenceContextCloser = (PersistenceContextCloser)
+ conversation.getAttribute(PERSISTENCE_CONTEXT_CONV_ATTRIBUTE);
if (persistenceContextCloser != null)
{
persistenceContext = persistenceContextCloser.getPersistenceContext();
@@ -76,7 +79,9 @@
{
persistenceContext = persistenceContextFactory.create();
- conversation.setAttribute(PERSISTENCE_CONTEXT_CONV_ATTRIBUTE, new PersistenceContextCloser(persistenceContext));
+ conversation.setAttribute(
+ PERSISTENCE_CONTEXT_CONV_ATTRIBUTE,
+ new PersistenceContextCloser(persistenceContext));
}
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringConversationScope.java Sun Jul 13 07:37:34 2008
@@ -53,7 +53,8 @@
* </bean>
*
*
- * <bean id="persistentContextConversationInterceptor" class="org.apache.myfaces.orchestra.conversation.spring.PersistenceContextConversationInterceptor">
+ * <bean id="persistentContextConversationInterceptor"
+ * class="org.apache.myfaces.orchestra.conversation.spring.PersistenceContextConversationInterceptor">
* <property name="persistenceContextFactory" ref="yourPersistentContextFactory" />
* </bean>
* </pre>
@@ -188,7 +189,8 @@
{
super.notifyAccessConversation(conversation);
- ConversationAccessLifetimeAspect aspect = (ConversationAccessLifetimeAspect) conversation.getAspect(ConversationAccessLifetimeAspect.class);
+ ConversationAccessLifetimeAspect aspect = (ConversationAccessLifetimeAspect)
+ conversation.getAspect(ConversationAccessLifetimeAspect.class);
if (aspect != null)
{
aspect.markAsAccessed();
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapterFilter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapterFilter.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapterFilter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/basic/BasicFrameworkAdapterFilter.java Sun Jul 13 07:37:34 2008
@@ -57,7 +57,8 @@
adapter = new BasicFrameworkAdapter(filterConfig.getServletContext(), conversationMessager);
}
- public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain filterChain) throws IOException, ServletException
+ public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain filterChain)
+ throws IOException, ServletException
{
log.debug("doFilter");
try
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapterFilter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapterFilter.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapterFilter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/jsf/JsfFrameworkAdapterFilter.java Sun Jul 13 07:37:34 2008
@@ -65,7 +65,8 @@
adapter = new JsfFrameworkAdapter(conversationMessager);
}
- public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain filterChain) throws IOException, ServletException
+ public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain filterChain)
+ throws IOException, ServletException
{
log.debug("doFilter");
try
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/springBasic/SpringBasicFrameworkAdapterFilter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/springBasic/SpringBasicFrameworkAdapterFilter.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/springBasic/SpringBasicFrameworkAdapterFilter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/frameworkAdapter/springBasic/SpringBasicFrameworkAdapterFilter.java Sun Jul 13 07:37:34 2008
@@ -45,7 +45,8 @@
* beanname defined in the dependency-injection framework, or an absolute
* classname of a type implementing ConversationMessager.
* <p>
- * This filter access the Spring framework to lookup the bean in its {@link org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter#getBean} method
+ * This filter access the Spring framework to lookup the bean in its
+ * {@link org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter#getBean} method
*/
public class SpringBasicFrameworkAdapterFilter implements Filter
{
@@ -61,7 +62,8 @@
adapter = new SpringBasicFrameworkAdapter(filterConfig.getServletContext(), conversationMessager);
}
- public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain filterChain) throws IOException, ServletException
+ public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain filterChain)
+ throws IOException, ServletException
{
log.debug("doFilter");
try
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/FrameworkAdapterRequestHandler.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/FrameworkAdapterRequestHandler.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/FrameworkAdapterRequestHandler.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/FrameworkAdapterRequestHandler.java Sun Jul 13 07:37:34 2008
@@ -35,7 +35,8 @@
*/
class FrameworkAdapterRequestHandler implements RequestHandler
{
- private final static String CONVERSATION_MESSAGER_CLASS = "org.apache.myfaces.orchestra.CONVERSATION_MESSAGER"; // NON-NLS
+ private final static String CONVERSATION_MESSAGER_CLASS =
+ "org.apache.myfaces.orchestra.CONVERSATION_MESSAGER"; // NON-NLS
private final Log log = LogFactory.getLog(FrameworkAdapterRequestHandler.class);
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterProviderManager.java Sun Jul 13 07:37:34 2008
@@ -195,8 +195,10 @@
{
FrameworkAdapter fa = FrameworkAdapter.getCurrentInstance();
- return Boolean.TRUE.equals(fa.getRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED))
- || Boolean.TRUE.equals(fa.getRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_RESPONSE_WRAPPED));
+ return Boolean.TRUE.equals(
+ fa.getRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED))
+ || Boolean.TRUE.equals(
+ fa.getRequestAttribute(RequestParameterServletFilter.REQUEST_PARAM_RESPONSE_WRAPPED));
}
protected List getProviders()
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterResponseWrapper.java Sun Jul 13 07:37:34 2008
@@ -22,7 +22,8 @@
import javax.servlet.http.HttpServletResponseWrapper;
/**
- * This wrapper intercepts encodeURL and pass it to the {@link RequestParameterProviderManager} which attaches the url parameters
+ * This wrapper intercepts encodeURL and pass it to the {@link RequestParameterProviderManager}
+ * which attaches the url parameters
*/
public class RequestParameterResponseWrapper extends HttpServletResponseWrapper
{
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/RequestParameterServletFilter.java Sun Jul 13 07:37:34 2008
@@ -35,8 +35,10 @@
*/
public class RequestParameterServletFilter implements Filter
{
- public final static String REQUEST_PARAM_FILTER_CALLED = RequestParameterServletFilter.class.getName() + ".CALLED";
- public final static String REQUEST_PARAM_RESPONSE_WRAPPED = RequestParameterServletFilter.class.getName() + ".WRAPPED";
+ public final static String REQUEST_PARAM_FILTER_CALLED =
+ RequestParameterServletFilter.class.getName() + ".CALLED";
+ public final static String REQUEST_PARAM_RESPONSE_WRAPPED =
+ RequestParameterServletFilter.class.getName() + ".WRAPPED";
public RequestParameterServletFilter()
{
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/jsf/RequestParameterFacesContextFactory.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/jsf/RequestParameterFacesContextFactory.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/jsf/RequestParameterFacesContextFactory.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/requestParameterProvider/jsf/RequestParameterFacesContextFactory.java Sun Jul 13 07:37:34 2008
@@ -55,18 +55,22 @@
* to that FacesContext instance is a modified one that tweaks every url that is
* processed by the ServletResponse.encodeUrl method.
*/
- public FacesContext getFacesContext(Object context, Object request, Object response, Lifecycle lifecycle) throws FacesException
+ public FacesContext getFacesContext(Object context, Object request, Object response, Lifecycle lifecycle)
+ throws FacesException
{
if (response instanceof HttpServletResponse)
{
HttpServletRequest httpServletRequest = (HttpServletRequest) request;
- // Wrap this request only if something else (eg a RequestParameterServletFilter) has not already wrapped it.
- if (!Boolean.TRUE.equals(httpServletRequest.getAttribute(RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED)))
+ // Wrap this request only if something else (eg a RequestParameterServletFilter)
+ // has not already wrapped it.
+ if (!Boolean.TRUE.equals(httpServletRequest.getAttribute(
+ RequestParameterServletFilter.REQUEST_PARAM_FILTER_CALLED)))
{
- // No servlet filter has wrapped the response, so do it now for the response referenced by this FacesContext.
- // Note that this wrapper will therefore apply to all output generated via the FacesContext, but not to
- // anything that might be written by filters etc.
+ // No servlet filter has wrapped the response, so do it now for the response
+ // referenced by this FacesContext. Note that this wrapper will therefore
+ // apply to all output generated via the FacesContext, but not to anything
+ // that might be written by filters etc.
response = new RequestParameterResponseWrapper((HttpServletResponse) response);
// We now need to reassure the RequestParameterProviderManager that the response has indeed been
@@ -79,7 +83,8 @@
// Therefore we have two separate flags; RequestParameterProviderManager checks whether either
// REQUEST_PARAM_FILTER_CALLED or REQUEST_PARAM_RESPONSE_WRAPPED has been set.
- httpServletRequest.setAttribute(RequestParameterServletFilter.REQUEST_PARAM_RESPONSE_WRAPPED, Boolean.TRUE);
+ httpServletRequest.setAttribute(
+ RequestParameterServletFilter.REQUEST_PARAM_RESPONSE_WRAPPED, Boolean.TRUE);
}
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/CompositeViewControllerNameMapper.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/CompositeViewControllerNameMapper.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/CompositeViewControllerNameMapper.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/CompositeViewControllerNameMapper.java Sun Jul 13 07:37:34 2008
@@ -33,7 +33,10 @@
public CompositeViewControllerNameMapper(ViewControllerNameMapper[] viewControllerNameMappers)
{
this.viewControllerNameMappers = new ViewControllerNameMapper[viewControllerNameMappers.length];
- System.arraycopy(viewControllerNameMappers, 0, this.viewControllerNameMappers, 0, viewControllerNameMappers.length);
+ System.arraycopy(
+ viewControllerNameMappers, 0,
+ this.viewControllerNameMappers, 0,
+ viewControllerNameMappers.length);
}
public String mapViewId(String viewId)
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java Sun Jul 13 07:37:34 2008
@@ -205,11 +205,14 @@
protected ViewControllerPhaseListenerState getState(FacesContext facesContext)
{
- ViewControllerPhaseListenerState state = (ViewControllerPhaseListenerState) facesContext.getExternalContext().getRequestMap().get(ViewControllerPhaseListenerState.class.getName());
+ ViewControllerPhaseListenerState state = (ViewControllerPhaseListenerState)
+ facesContext.getExternalContext().getRequestMap()
+ .get(ViewControllerPhaseListenerState.class.getName());
if (state == null)
{
state = new ViewControllerPhaseListenerState();
- facesContext.getExternalContext().getRequestMap().put(ViewControllerPhaseListenerState.class.getName(), state);
+ facesContext.getExternalContext().getRequestMap().put(
+ ViewControllerPhaseListenerState.class.getName(), state);
}
return state;
}
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java Sun Jul 13 07:37:34 2008
@@ -54,7 +54,9 @@
static ViewControllerManager getViewControllerManager(FacesContext context)
{
- ViewControllerManager manager = (ViewControllerManager) context.getApplication().getVariableResolver().resolveVariable(context, ViewControllerManager.VIEW_CONTROLLER_MANAGER_NAME);
+ ViewControllerManager manager = (ViewControllerManager) context.getApplication()
+ .getVariableResolver().resolveVariable(
+ context, ViewControllerManager.VIEW_CONTROLLER_MANAGER_NAME);
if (manager != null)
{
return manager;
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java?rev=676333&r1=676332&r2=676333&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/spring/SpringViewControllerScope.java Sun Jul 13 07:37:34 2008
@@ -71,7 +71,9 @@
public Conversation createConversation(ConversationContext context, String conversationName)
{
- throw new IllegalStateException("the viewController scope is not supposed to start a conversation on its own. conversation to start: " + conversationName);
+ throw new IllegalStateException(
+ "The viewController scope is not supposed to start a conversation on its own. " +
+ "Conversation to start: " + conversationName);
}
protected void assertSameScope(String beanName, Conversation conversation)