Configuration support for the Spring Faces custom XML namespace.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingPropertyResolver.java index 0ceaa5d7..a8f70c0d 100644 --- a/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingPropertyResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingPropertyResolver.java @@ -21,6 +21,11 @@ import javax.faces.el.EvaluationException; import javax.faces.el.PropertyNotFoundException; import javax.faces.el.PropertyResolver; +/** + * A JSF 1.1 {@link PropertyResolver} that delegates to a wrapped Unified EL resolver chain for property resolution. + * + * @author Jeremy Grelle + */ public abstract class ELDelegatingPropertyResolver extends PropertyResolver { private PropertyResolver nextResolver; diff --git a/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingVariableResolver.java index 1ea87cb7..9594bfbc 100644 --- a/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingVariableResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/expression/ELDelegatingVariableResolver.java @@ -21,6 +21,11 @@ import javax.faces.context.FacesContext; import javax.faces.el.EvaluationException; import javax.faces.el.VariableResolver; +/** + * A JSF 1.1 {@link VariableResolver} that delegates to a wrapped Unified EL resolver chain for variable resolution. + * + * @author Jeremy Grelle + */ public abstract class ELDelegatingVariableResolver extends VariableResolver { private VariableResolver nextResolver; diff --git a/spring-faces/src/main/java/org/springframework/faces/expression/SimpleELContext.java b/spring-faces/src/main/java/org/springframework/faces/expression/SimpleELContext.java index 56ac9fd6..37b1cb64 100644 --- a/spring-faces/src/main/java/org/springframework/faces/expression/SimpleELContext.java +++ b/spring-faces/src/main/java/org/springframework/faces/expression/SimpleELContext.java @@ -20,6 +20,11 @@ import javax.el.ELResolver; import javax.el.FunctionMapper; import javax.el.VariableMapper; +/** + * A minimal {@link ELContext} implementation. + * + * @author Jeremy Grelle + */ class SimpleELContext extends ELContext { private ELResolver resolver; diff --git a/spring-faces/src/main/java/org/springframework/faces/expression/package.html b/spring-faces/src/main/java/org/springframework/faces/expression/package.html new file mode 100644 index 00000000..4bd2e6ab --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/expression/package.html @@ -0,0 +1,5 @@ + + +Support for adapting Unified EL resolvers to the JSF 1.1 API.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java b/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java index 788bb44c..274c1de8 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/OneSelectionTrackingListDataModel.java @@ -29,6 +29,9 @@ import org.springframework.util.Assert; */ public class OneSelectionTrackingListDataModel extends SerializableListDataModel implements SelectionAware { + /** + * The list of currently selected row data objects. + */ private List selections = new ArrayList(); public OneSelectionTrackingListDataModel() { diff --git a/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java b/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java index c785b64f..f809910a 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/SelectionAware.java @@ -26,15 +26,38 @@ import javax.faces.model.DataModel; */ public interface SelectionAware { + /** + * Checks whether the row pointed to by the model's current index is selected. + * @return true if the current row data object is selected + */ public boolean isCurrentRowSelected(); + /** + * Sets whether the row pointed to by the model's current index is selected + * @param rowSelected true to select the current row + */ public void setSelected(boolean rowSelected); + /** + * Sets the list of selected row data objects for the model. + * @param selections the list of selected row data objects + */ public void setSelections(List selections); + /** + * Returns the list of selected row data objects for the model. + * @return the list of selected row data objects + */ public List getSelections(); + /** + * Selects all row data objects in the model. + */ public void selectAll(); + /** + * Selects the given row data object in the model. + * @param rowData the row data object to select. + */ public void select(Object rowData); } diff --git a/spring-faces/src/main/java/org/springframework/faces/model/SerializableListDataModel.java b/spring-faces/src/main/java/org/springframework/faces/model/SerializableListDataModel.java index d58334a4..7b791e7a 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/SerializableListDataModel.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/SerializableListDataModel.java @@ -27,6 +27,8 @@ import org.springframework.util.Assert; /** * A simple List-to-JSF-DataModel adapter that is also serializable. + * + * @author Jeremy Grelle */ public class SerializableListDataModel extends DataModel implements Serializable { diff --git a/spring-faces/src/main/java/org/springframework/faces/model/converter/DataModelConverter.java b/spring-faces/src/main/java/org/springframework/faces/model/converter/DataModelConverter.java index 783fda87..f6b03e9d 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/converter/DataModelConverter.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/converter/DataModelConverter.java @@ -20,9 +20,16 @@ import java.util.List; import javax.faces.model.DataModel; +import org.springframework.binding.convert.Converter; import org.springframework.binding.convert.converters.AbstractConverter; import org.springframework.util.ClassUtils; +/** + * A {@link Converter} implementation that converts an Object, Object array, or {@link List} into a JSF + * {@link DataModel}. + * + * @author Jeremy Grelle + */ public class DataModelConverter extends AbstractConverter { protected Object doConvert(Object source, Class targetClass, Object context) throws Exception { diff --git a/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java b/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java index 0aef23bd..01fdce43 100644 --- a/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java +++ b/spring-faces/src/main/java/org/springframework/faces/model/converter/FacesConversionService.java @@ -21,6 +21,11 @@ import org.springframework.faces.model.OneSelectionTrackingListDataModel; * Convenient {@link ConversionService} implementation for JSF that composes JSF-specific converters with the standard * Web Flow converters. * + *+ * In addition to the standard Web Flow conversion, this service provide conversion from a {@link List} into a + * {@link OneSelectionTrackingListDataModel} using a "dataModel" alias for the type. + *
+ * * @author Jeremy Grelle */ public class FacesConversionService extends DefaultConversionService { diff --git a/spring-faces/src/main/java/org/springframework/faces/model/converter/package.html b/spring-faces/src/main/java/org/springframework/faces/model/converter/package.html new file mode 100644 index 00000000..9a84ade6 --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/model/converter/package.html @@ -0,0 +1,5 @@ + + +Conversion support for JSF-specific data structures.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/model/package.html b/spring-faces/src/main/java/org/springframework/faces/model/package.html new file mode 100644 index 00000000..304bc1de --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/model/package.html @@ -0,0 +1,5 @@ + + +Extended implementations of JSF-specific data structures such as DataModel.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/mvc/package.html b/spring-faces/src/main/java/org/springframework/faces/mvc/package.html new file mode 100644 index 00000000..8c046c54 --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/mvc/package.html @@ -0,0 +1,5 @@ + + +Support for JSF integration with Spring MVC.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/package.html b/spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/package.html new file mode 100644 index 00000000..d7f6d328 --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/mvc/richfaces/package.html @@ -0,0 +1,5 @@ + + +Ajax integration support for the Rich Faces component library.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/support/package.html b/spring-faces/src/main/java/org/springframework/faces/support/package.html new file mode 100644 index 00000000..57363e53 --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/support/package.html @@ -0,0 +1,5 @@ + + +Development and debugging support for working with JSF.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptor.java b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptor.java deleted file mode 100644 index ee3c713d..00000000 --- a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptor.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.faces.ui; - -import javax.faces.component.UICommand; - -public class AjaxEventInterceptor extends UICommand { - -} diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java index 7117491b..59911c38 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/AjaxEventInterceptorRenderer.java @@ -26,7 +26,13 @@ import javax.faces.event.ActionEvent; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -public class AjaxEventInterceptorRenderer extends DojoRenderer { +/** + * {@link Renderer} for the {@code+ * This component is the key to rendering partial subtrees of the JSF component tree. It makes use of JSF 1.2's + * {@link UIComponent#invokeOnComponent(FacesContext, String, ContextCallback)} method to execute the various phases of + * the {@link Lifecycle} on each subtree. + *
+ * * @author Jeremy Grelle */ public class AjaxViewRoot extends DelegatingViewRoot { diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseParentComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseComponentRenderer.java similarity index 89% rename from spring-faces/src/main/java/org/springframework/faces/ui/BaseParentComponentRenderer.java rename to spring-faces/src/main/java/org/springframework/faces/ui/BaseComponentRenderer.java index e12ab244..5ecb09ea 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseParentComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseComponentRenderer.java @@ -23,7 +23,13 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -public abstract class BaseParentComponentRenderer extends BaseHtmlParentTagRenderer { +/** + * Base {@link Renderer} for typical faces components, handling the rendering for common {@link UIComponent} attributes. + * + * @author Jeremy Grelle + * + */ +public abstract class BaseComponentRenderer extends BaseHtmlTagRenderer { private Map attributeCallbacks; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java similarity index 84% rename from spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java rename to spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java index 6ffa1939..429eb92d 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoParentComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseDojoComponentRenderer.java @@ -22,7 +22,14 @@ import javax.faces.context.FacesContext; import org.springframework.faces.ui.resource.ResourceHelper; -public abstract class BaseDojoParentComponentRenderer extends BaseSpringFacesParentComponentRenderer { +/** + * Base {@link Renderer} for components that require the Dojo implementation of Spring JavaScript to be available on the + * client. + * + * @author Jeremy Grelle + * + */ +public abstract class BaseDojoComponentRenderer extends BaseSpringJavascriptComponentRenderer { private String dojoJsResourceUri = "/dojo/dojo.js"; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlParentTagRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlTagRenderer.java similarity index 89% rename from spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlParentTagRenderer.java rename to spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlTagRenderer.java index c4f4a805..9e9dc68b 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlParentTagRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseHtmlTagRenderer.java @@ -27,9 +27,19 @@ import javax.faces.render.Renderer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -abstract class BaseHtmlParentTagRenderer extends Renderer { +/** + * Abstract base {@link Renderer} for a component that renders a standard HTML element. + * + *+ * Uses a callback mechanism for customizing the rendering of tag attributes when logic is required beyond a simple + * pass-through of the component attribute to the HTML attribute of the rendered element. + *
+ * + * @author Jeremy Grelle + */ +abstract class BaseHtmlTagRenderer extends Renderer { - protected Log log = LogFactory.getLog(BaseHtmlParentTagRenderer.class); + protected Log log = LogFactory.getLog(BaseHtmlTagRenderer.class); /** * Default {@link RenderAttributeCallback} that just renders the tag attribute as a pass-through value if the value diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringFacesParentComponentRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java similarity index 83% rename from spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringFacesParentComponentRenderer.java rename to spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java index bceb29e9..a8b9a3bc 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringFacesParentComponentRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptComponentRenderer.java @@ -22,7 +22,13 @@ import javax.faces.context.FacesContext; import org.springframework.faces.ui.resource.ResourceHelper; -public abstract class BaseSpringFacesParentComponentRenderer extends BaseParentComponentRenderer { +/** + * Base {@link Renderer} for components that require the Spring JavaScript library on the client. + * + * @author Jeremy Grelle + * + */ +public abstract class BaseSpringJavascriptComponentRenderer extends BaseComponentRenderer { private String springJsResourceUri = "/spring/Spring.js"; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/SpringFacesRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptDecorationRenderer.java similarity index 93% rename from spring-faces/src/main/java/org/springframework/faces/ui/SpringFacesRenderer.java rename to spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptDecorationRenderer.java index 5befc664..ad63b486 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/SpringFacesRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/BaseSpringJavascriptDecorationRenderer.java @@ -23,7 +23,7 @@ import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; -public class SpringFacesRenderer extends Renderer { +public abstract class BaseSpringJavascriptDecorationRenderer extends Renderer { private String springJsResourceUri = "/spring/Spring.js"; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientCurrencyValidator.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientCurrencyValidator.java index 1ed31e22..36d6f8b6 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientCurrencyValidator.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientCurrencyValidator.java @@ -18,7 +18,14 @@ package org.springframework.faces.ui; import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; -public class DojoClientCurrencyValidator extends DojoAdvisor { +/** + * Component that uses the Dojo implementation of Spring JavaScript to decorate a child input component with client-side + * currency validation behavior. + * + * @author Jeremy Grelle + * + */ +public class DojoClientCurrencyValidator extends DojoDecoration { private static final String DOJO_COMPONENT_TYPE = "dijit.form.CurrencyTextBox"; @@ -27,9 +34,9 @@ public class DojoClientCurrencyValidator extends DojoAdvisor { private static final String[] DOJO_ATTRS; static { - DOJO_ATTRS = new String[DojoAdvisor.DOJO_ATTRS.length + DOJO_ATTRS_INTERNAL.length]; - System.arraycopy(DojoAdvisor.DOJO_ATTRS, 0, DOJO_ATTRS, 0, DojoAdvisor.DOJO_ATTRS.length); - System.arraycopy(DOJO_ATTRS_INTERNAL, 0, DOJO_ATTRS, DojoAdvisor.DOJO_ATTRS.length, DOJO_ATTRS_INTERNAL.length); + DOJO_ATTRS = new String[DojoDecoration.DOJO_ATTRS.length + DOJO_ATTRS_INTERNAL.length]; + System.arraycopy(DojoDecoration.DOJO_ATTRS, 0, DOJO_ATTRS, 0, DojoDecoration.DOJO_ATTRS.length); + System.arraycopy(DOJO_ATTRS_INTERNAL, 0, DOJO_ATTRS, DojoDecoration.DOJO_ATTRS.length, DOJO_ATTRS_INTERNAL.length); } private String currency; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientDateValidator.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientDateValidator.java index ed28ee09..a3bc5c01 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientDateValidator.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientDateValidator.java @@ -15,12 +15,19 @@ */ package org.springframework.faces.ui; -public class DojoClientDateValidator extends DojoAdvisor { +/** + * Component that uses the Dojo implementation of Spring JavaScript to decorate a child input component with client-side + * date validation behavior. + * + * @author Jeremy Grelle + * + */ +public class DojoClientDateValidator extends DojoDecoration { private static final String DOJO_COMPONENT_TYPE = "dijit.form.DateTextBox"; protected String[] getDojoAttributes() { - return DojoAdvisor.DOJO_ATTRS; + return DojoDecoration.DOJO_ATTRS; } public String getDojoComponentType() { diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientNumberValidator.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientNumberValidator.java index 2ed7e12f..68e1700d 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientNumberValidator.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientNumberValidator.java @@ -15,12 +15,19 @@ */ package org.springframework.faces.ui; -public class DojoClientNumberValidator extends DojoAdvisor { +/** + * Component that uses the Dojo implementation of Spring JavaScript to decorate a child input component with client-side + * numeric validation behavior. + * + * @author Jeremy Grelle + * + */ +public class DojoClientNumberValidator extends DojoDecoration { private static final String DOJO_COMPONENT_TYPE = "dijit.form.NumberTextBox"; protected String[] getDojoAttributes() { - return DojoAdvisor.DOJO_ATTRS; + return DojoDecoration.DOJO_ATTRS; } public String getDojoComponentType() { diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientTextValidator.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientTextValidator.java index 5a310192..1c2f1532 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientTextValidator.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoClientTextValidator.java @@ -15,12 +15,19 @@ */ package org.springframework.faces.ui; -public class DojoClientTextValidator extends DojoAdvisor { +/** + * Component that uses the Dojo implementation of Spring JavaScript to decorate a child input component with client-side + * text validation behavior. + * + * @author Jeremy Grelle + * + */ +public class DojoClientTextValidator extends DojoDecoration { private static final String DOJO_COMPONENT_TYPE = "dijit.form.ValidationTextBox"; protected String[] getDojoAttributes() { - return DojoAdvisor.DOJO_ATTRS; + return DojoDecoration.DOJO_ATTRS; } public String getDojoComponentType() { diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisor.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecoration.java similarity index 92% rename from spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisor.java rename to spring-faces/src/main/java/org/springframework/faces/ui/DojoDecoration.java index 4204bfb6..85d0455b 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisor.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecoration.java @@ -15,11 +15,19 @@ */ package org.springframework.faces.ui; +import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; -public abstract class DojoAdvisor extends UIComponentBase { +/** + * Base {@link UIComponent} for a component that uses the Dojo implementation of Spring JavaScript to decorate a child + * component with enhanced client-side behavior. + * + * @author Jeremy Grelle + * + */ +public abstract class DojoDecoration extends UIComponentBase { protected static final String[] DOJO_ATTRS = new String[] { "disabled", "intermediateChanges", "tabIndex", "required", "promptMessage", "invalidMessage", "constraints", "regExp", "regExpGen" }; @@ -161,7 +169,7 @@ public abstract class DojoAdvisor extends UIComponentBase { public String getFamily() { - return "spring.faces.Advisor"; + return "spring.faces.Decoration"; } } diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecorationRenderer.java similarity index 76% rename from spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java rename to spring-faces/src/main/java/org/springframework/faces/ui/DojoDecorationRenderer.java index ae279c0a..f2b707d0 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoAdvisorRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoDecorationRenderer.java @@ -27,12 +27,38 @@ import javax.faces.context.ResponseWriter; import org.springframework.faces.ui.resource.ResourceHelper; import org.springframework.util.StringUtils; -public class DojoAdvisorRenderer extends DojoRenderer { +/** + * Generic renderer for components that use the Dojo implementation of Spring JavaScript to decorate a child component + * with enhanced client-side behavior. + * + * @author Jeremy Grelle + * + */ +public class DojoDecorationRenderer extends BaseSpringJavascriptDecorationRenderer { private static final String SCRIPT_ELEMENT = "script"; + private String dojoJsResourceUri = "/dojo/dojo.js"; + + private String dijitThemePath = "/dijit/themes/"; + + private String dijitTheme = "tundra"; + + private String springDojoJsResourceUri = "/spring/Spring-Dojo.js"; + private ResourceHelper resourceHelper = new ResourceHelper(); + public void encodeBegin(FacesContext context, UIComponent component) throws IOException { + + super.encodeBegin(context, component); + + resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); + + resourceHelper.renderScriptLink(context, dojoJsResourceUri); + + resourceHelper.renderScriptLink(context, springDojoJsResourceUri); + } + public void encodeEnd(FacesContext context, UIComponent component) throws IOException { ResponseWriter writer = context.getResponseWriter(); @@ -42,14 +68,14 @@ public class DojoAdvisorRenderer extends DojoRenderer { UIComponent advisedChild = (UIComponent) component.getChildren().get(0); - resourceHelper.renderDojoInclude(context, ((DojoAdvisor) component).getDojoComponentType()); + resourceHelper.renderDojoInclude(context, ((DojoDecoration) component).getDojoComponentType()); writer.startElement(SCRIPT_ELEMENT, component); writer.writeAttribute("type", "text/javascript", null); StringBuffer script = new StringBuffer(); script.append(" Spring.addDecoration(new Spring.ElementDecoration({ "); script.append(" elementId : '" + advisedChild.getClientId(context) + "', "); - script.append(" widgetType : '" + ((DojoAdvisor) component).getDojoComponentType() + "', "); + script.append(" widgetType : '" + ((DojoDecoration) component).getDojoComponentType() + "', "); script.append(" widgetAttrs : { "); String nodeAttrs = getNodeAttributesAsString(context, advisedChild); @@ -96,7 +122,7 @@ public class DojoAdvisorRenderer extends DojoRenderer { protected String getDojoAttributesAsString(FacesContext context, UIComponent component) { - DojoAdvisor advisor = (DojoAdvisor) component; + DojoDecoration advisor = (DojoDecoration) component; StringBuffer attrs = new StringBuffer(); for (int i = 0; i < advisor.getDojoAttributes().length; i++) { diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java deleted file mode 100644 index 61921938..00000000 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoRenderer.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.faces.ui; - -import java.io.IOException; - -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; - -import org.springframework.faces.ui.resource.ResourceHelper; - -public class DojoRenderer extends SpringFacesRenderer { - - private String dojoJsResourceUri = "/dojo/dojo.js"; - - private String dijitThemePath = "/dijit/themes/"; - - private String dijitTheme = "tundra"; - - private String springDojoJsResourceUri = "/spring/Spring-Dojo.js"; - - private ResourceHelper resourceHelper = new ResourceHelper(); - - public void encodeBegin(FacesContext context, UIComponent component) throws IOException { - - super.encodeBegin(context, component); - - resourceHelper.renderStyleLink(context, dijitThemePath + dijitTheme + "/" + dijitTheme + ".css"); - - resourceHelper.renderScriptLink(context, dojoJsResourceUri); - - resourceHelper.renderScriptLink(context, springDojoJsResourceUri); - } -} diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DojoStyleRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/DojoStyleRenderer.java index a68d8aaf..1d0dd575 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DojoStyleRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DojoStyleRenderer.java @@ -23,6 +23,12 @@ import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; +/** + * {@link Renderer} implementation that renders the CSS resources required by Dojo's widget system. + * + * @author Jeremy Grelle + * + */ public class DojoStyleRenderer extends Renderer { private static final String dijitThemePath = "/dijit/themes/"; diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/DynamicComponent.java b/spring-faces/src/main/java/org/springframework/faces/ui/DynamicComponent.java index c09d8863..fd995a42 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/DynamicComponent.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/DynamicComponent.java @@ -15,8 +15,16 @@ */ package org.springframework.faces.ui; +import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; +/** + * A completely dynamic component that is used to back simple Facelets tags. Relies solely on the use of + * {@link UIComponent#getAttributes()} instead of JavaBean style getters and setters. + * + * @author Jeremy Grelle + * + */ public class DynamicComponent extends UIComponentBase { public String getFamily() { diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/HTML.java b/spring-faces/src/main/java/org/springframework/faces/ui/HTML.java index e386c5f6..8e132df1 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/HTML.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/HTML.java @@ -18,6 +18,11 @@ package org.springframework.faces.ui; import java.util.HashMap; import java.util.Map; +/** + * Helper class that provides common attributes for standard HTML elements. + * + * @author Jeremy Grelle + */ final class HTML { /** diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java index 8216a1fc..7945d5f8 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButtonRenderer.java @@ -32,7 +32,13 @@ import javax.faces.event.ActionEvent; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -public class ProgressiveCommandButtonRenderer extends BaseDojoParentComponentRenderer { +/** + * {@link Renderer} for the {@code+ * This renderer is unique in that it first renders a button that will still work if JavaScript is disabled on the + * client, then progressively enhances the button and transforms it into a link if JavaScript is available. + *
+ * + * @author Jeremy Grelle + * + */ public class ProgressiveCommandLinkRenderer extends ProgressiveCommandButtonRenderer { private static String[] ATTRIBUTES_TO_RENDER; @@ -78,9 +89,10 @@ public class ProgressiveCommandLinkRenderer extends ProgressiveCommandButtonRend // No need to be progressive if this is an AJAX request since it can be assumed JavaScript is enabled if (!JsfUtils.isAsynchronousFlowRequest()) { // Render a plain submit button first if this is not an ajax request - ProgressiveCommandButton button = new ProgressiveCommandButton(); + ProgressiveUICommand button = new ProgressiveUICommand(); button.getAttributes().putAll(component.getAttributes()); BeanUtils.copyProperties(component, button); + button.setRendererType("spring.faces.ProgressiveCommandButtonRenderer"); button.setAjaxEnabled(Boolean.FALSE); button.encodeBegin(context); button.encodeChildren(context); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButton.java b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveUICommand.java similarity index 87% rename from spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButton.java rename to spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveUICommand.java index 96d22df7..2388e0e1 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveCommandButton.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/ProgressiveUICommand.java @@ -16,6 +16,7 @@ package org.springframework.faces.ui; import javax.faces.component.UICommand; +import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.el.ValueBinding; @@ -24,14 +25,18 @@ import org.springframework.webflow.engine.TransitionableState; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContextHolder; -public class ProgressiveCommandButton extends UICommand { +/** + * {@link UIComponent} implementation that backs the {@code+ * This render outputs a specially formatted Javascript or CSS include that requests multiple resources with one HTTP + * request. + *
+ * + * @author Jeremy Grelle + * + * TODO - Make this work with Javacript resources + */ public class ResourceGroupRenderer extends Renderer { private static final ResourceHelper resourceHelper = new ResourceHelper(); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ResourceRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ResourceRenderer.java index 95f744a5..f7313358 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ResourceRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/ResourceRenderer.java @@ -22,8 +22,19 @@ import javax.faces.context.FacesContext; import javax.faces.render.Renderer; import org.springframework.faces.ui.resource.ResourceHelper; +import org.springframework.js.resource.ResourceServlet; import org.springframework.util.Assert; +/** + * {@link Renderer} for the {@code+ * Renders a Javascript or CSS include with a URL properly formatted to map to the {@link ResourceServlet}. + *
+ * + * @author Jeremy Grelle + * + */ public class ResourceRenderer extends Renderer { private static final ResourceHelper resourceHelper = new ResourceHelper(); diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAll.java b/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAll.java deleted file mode 100644 index 8579276d..00000000 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAll.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2004-2008 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.faces.ui; - -import javax.faces.component.UIComponentBase; - -public class ValidateAll extends UIComponentBase { - - public String getFamily() { - return "spring.faces.Advisor"; - } - -} diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java b/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java index 72b960ce..b2b5329f 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/ValidateAllRenderer.java @@ -23,7 +23,13 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -public class ValidateAllRenderer extends SpringFacesRenderer { +/** + * {@link Renderer} for the {@codeSpring Faces component library.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceHelper.java b/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceHelper.java index bc0f9bf9..e40ec32b 100644 --- a/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceHelper.java +++ b/spring-faces/src/main/java/org/springframework/faces/ui/resource/ResourceHelper.java @@ -27,11 +27,13 @@ import java.util.Set; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.springframework.js.resource.ResourceServlet; + /** * Helper used by Spring Faces component renderers to add links to javascript and css resources. The resource links will - * be rendered in the correct format for the requests to be handled by Web Flow and routed to a special "resources" flow - * that is engineered at runtime. The resource paths are cached so that a particular resource link is only rendered once - * per request. + * be rendered in the correct format for the requests to be handled by the Spring JavaScript {@link ResourceServlet}. + * The resource paths are cached so that a particular resource link is only rendered once per request. + * * @author Jeremy Grelle * */ diff --git a/spring-faces/src/main/java/org/springframework/faces/ui/resource/package.html b/spring-faces/src/main/java/org/springframework/faces/ui/resource/package.html new file mode 100644 index 00000000..72046054 --- /dev/null +++ b/spring-faces/src/main/java/org/springframework/faces/ui/resource/package.html @@ -0,0 +1,5 @@ + + +Support for providing JavaScript, CSS, and image resources needed by Spring Faces components.
+ + \ No newline at end of file diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java index 0123d3e9..741b6e2f 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowActionListener.java @@ -43,12 +43,16 @@ import org.springframework.webflow.mvc.view.MessageContextErrors; /** * The default {@link ActionListener} implementation to be used with Web Flow. + * ** This implementation bypasses the JSF {@link NavigationHandler} mechanism to instead let the event be handled directly * by Web Flow. + *
+ * ** Web Flow's model-level validation will be invoked here after an event has been detected if the event is not an * immediate event. + *
* * @author Jeremy Grelle */ diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplicationFactory.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplicationFactory.java index 4932fef7..073665fc 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplicationFactory.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowApplicationFactory.java @@ -17,7 +17,15 @@ package org.springframework.faces.webflow; import javax.faces.application.Application; import javax.faces.application.ApplicationFactory; +import javax.faces.application.StateManager; +/** + * Custom {@link ApplicationFactory} that ensures the FlowViewStateManager is the first {@link StateManager} in the + * chain so that Web Flow may manage JSF component state when a flow is active. + * + * @author Jeremy Grelle + * + */ public class FlowApplicationFactory extends ApplicationFactory { private ApplicationFactory delegate; diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java index d3000a59..199a1f00 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowFacesContext.java @@ -41,7 +41,9 @@ import org.springframework.webflow.execution.RequestContext; /** * Custom {@link FacesContext} implementation that delegates all standard FacesContext messaging functionality to a - * Spring {@link MessageSource} made accessible as part of the current Web Flow request. + * Spring {@link MessageSource} made accessible as part of the current Web Flow request. Additionally, it manages the + * {@code responseComplete} and {@code renderResponse} flags in flash scope so that the execution of the JSF + * {@link Lifecycle} may span multiple requests in the case of the POST+REDIRECT+GET pattern being enabled. * * @author Jeremy Grelle */ diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java index 3b215c90..7f714faa 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowLifecycle.java @@ -34,6 +34,7 @@ import org.apache.commons.logging.LogFactory; ** This Lifecycle does not execute the RESTORE_VIEW phase since view creation and restoration are now handled by the * {@link JsfViewFactory}. + *
* * @author Jeremy Grelle */ diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java index a43f55d4..b7bd93ba 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowPropertyResolver.java @@ -18,13 +18,20 @@ package org.springframework.faces.webflow; import javax.el.CompositeELResolver; import javax.faces.el.PropertyResolver; +import org.springframework.binding.collection.MapAdaptable; import org.springframework.binding.expression.el.MapAdaptableELResolver; +import org.springframework.context.MessageSource; import org.springframework.faces.expression.ELDelegatingPropertyResolver; import org.springframework.webflow.expression.el.FlowResourceELResolver; /** - * For resolving MapAdaptable properties with JSF 1.1 or >. + * Custom property resolver for resolving properties on web flow specific structures with JSF 1.1 or > by delegating to + * web flow's EL resolvers. * + *+ * This resolver handles resolving properties on a {@link MapAdaptable} collection and a flow-local + * {@link MessageSource} + *
* @author Jeremy Grelle */ public class FlowPropertyResolver extends ELDelegatingPropertyResolver { diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java index 66515aeb..39a92e64 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowVariableResolver.java @@ -25,7 +25,8 @@ import org.springframework.webflow.expression.el.RequestContextELResolver; import org.springframework.webflow.expression.el.ScopeSearchingELResolver; /** - * For resolving flow request context variables with JSF 1.1 or >. + * Custom variabe resolver for resolving properties on web flow specific variables with JSF 1.1 or > by delegating to + * web flow's EL resolvers. * * @author Jeremy Grelle */ diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java index 49c99253..20de8ef1 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewStateManager.java @@ -28,6 +28,11 @@ import org.springframework.core.style.ToStringCreator; import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContextHolder; +/** + * Custom {@link StateManager} that manages the JSF component state in web flow's view scope. + * + * @author Jeremy Grelle + */ public class FlowViewStateManager extends StateManager { private static final Log logger = LogFactory.getLog(FlowViewStateManager.class); diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java index d76fd0c5..e4eddaef 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfManagedBeanAwareELExpressionParser.java @@ -36,7 +36,7 @@ import org.springframework.webflow.expression.el.ScopeSearchingELResolver; import org.springframework.webflow.expression.el.SpringBeanWebFlowELResolver; /** - * A JSF-specific ExpressionParser that allows beans managed by either JSF, Spring, or Web Flow referenced in + * A JSF-specific ExpressionParser that allows beans managed by either JSF, Spring, or Web Flow to be referenced in * expressions in the FlowDefinition. * * @author Jeremy Grelle diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java index 98524daf..3e19f78c 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfView.java @@ -75,7 +75,7 @@ public class JsfView implements View { } /** - * This implementation performs the standard duties of the JSF RENDER_RESPONSE phase. + * Performs the standard duties of the JSF RENDER_RESPONSE phase. */ public void render() throws IOException { FacesContext facesContext = FlowFacesContext.newInstance(requestContext, facesLifecycle); @@ -93,6 +93,10 @@ public class JsfView implements View { } } + /** + * Executes postback-processing portions of the standard JSF lifecyle including APPLY_REQUEST_VALUES through + * INVOKE_APPLICATION. + */ public void processUserEvent() { FacesContext facesContext = FlowFacesContext.newInstance(requestContext, facesLifecycle); facesContext.setViewRoot(viewRoot); diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java index 6c9e7e4d..76aef4b9 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/JsfViewFactory.java @@ -45,9 +45,8 @@ import org.springframework.webflow.execution.ViewFactory; /** * JSF-specific {@link ViewFactory} implementation. *- * This factory is responsible for performing the duties of the RESTORE_VIEW phase of the JSF lifecycle. If the current - * request is a post-back, then the rest of the standard JSF lifecyle through INVOKE_APPLICATION will be executed as - * well when an existing {@link JsfView} is found and restored. + * This factory is responsible for performing the duties of the RESTORE_VIEW phase of the JSF lifecycle. + *
* * @author Jeremy Grelle */ @@ -64,6 +63,10 @@ public class JsfViewFactory implements ViewFactory { this.lifecycle = lifecycle; } + /** + * Executes the RESTORE_VIEW phase of the JSF lifecycle at the beginning of a request, and creates the next view to + * be rendered in the case of an executing transition. + */ public View getView(RequestContext context) { FacesContext facesContext = FlowFacesContext.newInstance(context, lifecycle); try { diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/SpringBeanWebFlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/webflow/SpringBeanWebFlowVariableResolver.java index 5a46ce82..3e410b74 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/SpringBeanWebFlowVariableResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/SpringBeanWebFlowVariableResolver.java @@ -26,6 +26,7 @@ import org.springframework.webflow.execution.RequestContextHolder; /** * JSF 1.1 variable resolver for Spring Beans accessible to the flow's local bean factory. + * * @author Jeremy Grelle */ public class SpringBeanWebFlowVariableResolver extends SpringBeanVariableResolver { diff --git a/spring-faces/src/main/resources/META-INF/faces-config.xml b/spring-faces/src/main/resources/META-INF/faces-config.xml index 498a8e41..66f1f4c6 100644 --- a/spring-faces/src/main/resources/META-INF/faces-config.xml +++ b/spring-faces/src/main/resources/META-INF/faces-config.xml @@ -24,17 +24,17 @@