diff --git a/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java b/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java index 2e0414fda..60be41194 100644 --- a/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java +++ b/core/src/main/java/org/apache/struts2/jsf/FacesSetupInterceptor.java @@ -59,21 +59,21 @@ import com.opensymphony.xwork2.interceptor.Interceptor; * Example struts.xml configuration: * * 
- *  <interceptor-ref name="jsfSetup">
- *      <param name="actionListener"></param>
- *      <param name="defaultRenderKitId"></param>
- *      <param name="supportedLocale"></param>
- *      <param name="defaultLocale"></param>
- *      <param name="messageBundle"></param>
- *      <param name="navigationHandler">org.apache.struts2.jsf.StrutsNavigationHandler</param>
- *      <param name="propertyResolver"></param>
- *      <param name="stateManager"></param>
- *      <param name="variableResolver">
- *          org.apache.myfaces.el.VariableResolverImpl
- *         ,org.apache.struts2.jsf.StrutsVariableResolver
- *      </param>
- *      <param name="viewHandler;">org.apache.shale.tiles.TilesViewHandler</param>
- *  </interceptor-ref>
+ *   <interceptor-ref name="jsfSetup">
+ *       <param name="actionListener"></param>
+ *       <param name="defaultRenderKitId"></param>
+ *       <param name="supportedLocale"></param>
+ *       <param name="defaultLocale"></param>
+ *       <param name="messageBundle"></param>
+ *       <param name="navigationHandler">org.apache.struts2.jsf.StrutsNavigationHandler</param>
+ *       <param name="propertyResolver"></param>
+ *       <param name="stateManager"></param>
+ *       <param name="variableResolver">
+ *           org.apache.myfaces.el.VariableResolverImpl
+ *          ,org.apache.struts2.jsf.StrutsVariableResolver
+ *       </param>
+ *       <param name="viewHandler;">org.apache.shale.tiles.TilesViewHandler</param>
+ *   </interceptor-ref>
  *
* *

@@ -209,16 +209,16 @@ public class FacesSetupInterceptor extends FacesSupport implements Interceptor { * The action invocation */ public String intercept(ActionInvocation invocation) throws Exception { - if (facesContextFactory != null) - { + if (facesContextFactory != null) { if (isFacesAction(invocation)) { invocation.getInvocationContext().put( FacesInterceptor.FACES_ENABLED, Boolean.TRUE); - FacesContext facesContext = facesContextFactory.getFacesContext( - ServletActionContext.getServletContext(), - ServletActionContext.getRequest(), ServletActionContext + FacesContext facesContext = facesContextFactory + .getFacesContext(ServletActionContext + .getServletContext(), ServletActionContext + .getRequest(), ServletActionContext .getResponse(), lifecycle); setLifecycle(lifecycle); @@ -230,7 +230,8 @@ public class FacesSetupInterceptor extends FacesSupport implements Interceptor { } } } else { - throw new StrutsException("Unable to initialize jsf interceptors probably due missing JSF implementation libraries", + throw new StrutsException( + "Unable to initialize jsf interceptors probably due missing JSF implementation libraries", invocation.getProxy().getConfig()); } return invocation.invoke(); diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 6d3640385..7562f0e08 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -51,6 +51,7 @@ + @@ -156,6 +157,7 @@ + diff --git a/core/src/main/resources/template/simple/checkbox.ftl b/core/src/main/resources/template/simple/checkbox.ftl index 4efca0ec6..0c9d54fe3 100644 --- a/core/src/main/resources/template/simple/checkbox.ftl +++ b/core/src/main/resources/template/simple/checkbox.ftl @@ -26,3 +26,4 @@ <#include "/${parameters.templateDir}/simple/scripting-events.ftl" /> <#include "/${parameters.templateDir}/simple/common-attributes.ftl" /> /> + \ No newline at end of file diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt index 992f1a3f5..0f4b3a4e0 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-1.txt @@ -3,6 +3,7 @@ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt index b34b2168f..a5dfce220 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-2.txt @@ -3,6 +3,7 @@ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt index 322afb2c9..11a5782d3 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-3.txt @@ -10,6 +10,7 @@ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt index e9dc9de40..9b3652877 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-4.txt @@ -6,5 +6,6 @@ + diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt index 6745da3e9..bce8c7b2e 100644 --- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt +++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Checkbox-5.txt @@ -4,5 +4,6 @@ +