Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/validator/CommonsValidator.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/validator/CommonsValidator.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/validator/CommonsValidator.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/validator/CommonsValidator.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2004-2006 The Apache Software Foundation. - * + * * 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. @@ -59,24 +59,24 @@ * a Commons Validator to perform validation, either * client-side or server-side. * </p> - * - * <p>The current implementation is dependent on version 1.3 of commons validator. - * Some new conventions have been adopted for registering a validation rule in - * the validator's XML configuration file. In the action framework, validation - * was suited for declaring rules associated with a form. This worked well since - * generally a single action had the responsibility of handling all the posted - * form data at once.</p> - * - * <p>However, JSF takes a component based approach. Each component has the - * responsibility of managing its posted data and rendering its state. In the - * component based world, it is easier to associated configuration values at + * + * <p>The current implementation is dependent on version 1.3 of commons validator. + * Some new conventions have been adopted for registering a validation rule in + * the validator's XML configuration file. In the action framework, validation + * was suited for declaring rules associated with a form. This worked well since + * generally a single action had the responsibility of handling all the posted + * form data at once.</p> + * + * <p>However, JSF takes a component based approach. Each component has the + * responsibility of managing its posted data and rendering its state. In the + * component based world, it is easier to associated configuration values at * that level versus what works best for struts action.</p> - * - * <p>In an effort to reuse as much of commons validator and provide a method of - * registering new rules, a new convention was adopted for declaring validation + * + * <p>In an effort to reuse as much of commons validator and provide a method of + * registering new rules, a new convention was adopted for declaring validation * rules. - * </p> - * + * </p> + * * <pre> * <global> * <validator name="mask" @@ -85,70 +85,70 @@ * methodParams="java.lang.String,java.lang.String" * msg="errors.invalid" * jsFunctionName="validateMask" - * jsFunction="org.apache.commons.validator.javascript.validateMask" + * jsFunction="org.apache.commons.validator.javascript.validateMask" * depends=""/> * </global> * </pre> - * - * <p>The rules declaration is the same but an added form is required to capture extra - * configuration information. The form is associated with the validation rule using a - * naming convention. The prefix of the form name is "org.apache.shale.validator.XXXX" + * + * <p>The rules declaration is the same but an added form is required to capture extra + * configuration information. The form is associated with the validation rule using a + * naming convention. The prefix of the form name is "org.apache.shale.validator.XXXX" * where "XXXX" is the validation rule name.</p> - * + * * <pre> * <formset> * <form name="org.apache.shale.validator.mask"> * </pre> - * - * - * <p>The form is followed by a field and the property attribute of the form has the - * same value as the rule name.</p> - * + * + * + * <p>The form is followed by a field and the property attribute of the form has the + * same value as the rule name.</p> + * * <pre> * <field property="mask"> * </pre> - * - * <p>Within the field definition, arg's are used to define the parameters in order - * for message substitution and method argument value resolution. There are two reserved - * name values for the arg node used to define messages and parameters.</p> - * + * + * <p>Within the field definition, arg's are used to define the parameters in order + * for message substitution and method argument value resolution. There are two reserved + * name values for the arg node used to define messages and parameters.</p> + * * <pre> * <arg position="0" name="message" key="arg" resource="false"/> * <arg position="1" name="message" key="mask" resource="false"/> * <arg position="2" name="message" key="submittedValue" resource="false"/> - * - * <arg position="0" name="parameter" key="submittedValue" resource="false"/> - * <arg position="1" name="parameter" key="mask" resource="false"/> - * </pre> - * - * <p>The "message" name arguments defines the possible <code>MessageFormat</code> parameter substitution + * + * <arg position="0" name="parameter" key="submittedValue" resource="false"/> + * <arg position="1" name="parameter" key="mask" resource="false"/> + * </pre> + * + * <p>The "message" name arguments defines the possible <code>MessageFormat</code> parameter substitution * where the "position" corresponds to the substitution parameter.</p> - * + * * <pre> * errors.invalid={0} is invalid. * </pre> - * - * <p>The "parameter" arguments define the variable names that hold values for the target validatior method - * identified by the validator rule name. The comma delimited class types in the "methodParms" value list + * + * <p>The "parameter" arguments define the variable names that hold values for the target validatior method + * identified by the validator rule name. The comma delimited class types in the "methodParms" value list * correspond to the parameters by position.</p> - * + * * <pre> * methodParams="java.lang.String,java.lang.String" * </pre> - * - * <p>The var node is also used to explicitly define a JavaScript variable type. If not - * defined, the default is "string". The var-value is ignored because its captured by + * + * <p>The var node is also used to explicitly define a JavaScript variable type. If not + * defined, the default is "string". The var-value is ignored because its captured by * the shale commons validator instance.</p> - * + * * <pre> * <var> * <var-name>mask</var-name> * <var-value></var-value> * <var-jstype>regexp</var-jstype> - * </var> + * </var> * </pre> - * - * + * + * * $Id$ */ @@ -168,40 +168,40 @@ * and their corresponding classes.</p> */ private static Map standardTypes; - + /** * <p>Localized messages for this class.</p> */ private static final Messages messages = new Messages("org.apache.shale.resources.Bundle"); - - + + /** * <p>Log instance for this class.</p> */ private static final Log log = LogFactory.getLog(CommonsValidator.class); - + /** * <p>The name of the parent form used for javascript.</p> */ public String formName = null; - + /** * <p>Returns the parent's form name.</p> */ public String getFormName() { - return formName; + return formName; } - + /** * <p>Sets the validator's owning form name.</p> */ public void setFormName(String formName) { - this.formName = formName; + this.formName = formName; } - + // -------------------------------------------------------- Instance Variables @@ -209,7 +209,7 @@ * <p>Validator type.</p> */ private String type; - + /** * <p>Enable client-side validation?</p> */ @@ -236,13 +236,13 @@ private Map vars = new HashMap(); /** - * Returns a <code>Map</code> of variables that can be passed to a + * <p>Returns a <code>Map</code> of variables that can be passed to a * commons validator method or used to create a parameterized error - * message. Several of the public properties are contained within + * message. Several of the public properties are contained within * the <code>vars</code> collection. These include: arg, min, max, * minlength, maxlength, mask, datePatternStrict.</p> - * - * @return A value paired collection of variables used to invoke a + * + * @return A value paired collection of variables used to invoke a * validator method. */ public Map getVars() { @@ -263,204 +263,204 @@ * * @param newValue The new value for the <code>type</code> property. */ - public void setType(String newValue) {type = newValue;} - + public void setType(String newValue) { type = newValue; } + /** - * <p>The getter method for the <code>type</code> property. This property is + * <p>The getter method for the <code>type</code> property. This property is * passed through to the Commons Validator.</p> */ - public String getType() {return type;} - + public String getType() { return type; } + /** - * <p>The setter method for the <code>client</code> property. This property is + * <p>The setter method for the <code>client</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>client</code> property. */ - public void setClient(Boolean newValue) {client = newValue; } - + public void setClient(Boolean newValue) { client = newValue; } + /** - * <p>The getter method for the <code>client</code> property. This property is + * <p>The getter method for the <code>client</code> property. This property is * passed through to the Commons Validator.</p> */ public Boolean getClient() { return client; } - + /** - * <p>The setter method for the <code>server</code> property. This property is + * <p>The setter method for the <code>server</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>server</code> property. */ - public void setServer(Boolean newValue) {server = newValue; } - + public void setServer(Boolean newValue) {server = newValue; } + /** - * <p>The getter method for the <code>server</code> property. This property is + * <p>The getter method for the <code>server</code> property. This property is * passed through to the Commons Validator.</p> */ public Boolean getServer() { return server; } - + /** - * <p>The setter method for the <code>message</code> property. This property is + * <p>The setter method for the <code>message</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>message</code> property. */ - public void setMessage(String newValue) {message = newValue; } + public void setMessage(String newValue) {message = newValue; } /** - * <p>The getter method for the <code>message</code> property. This property is + * <p>The getter method for the <code>message</code> property. This property is * passed through to the Commons Validator.</p> */ public String getMessage() { return message; } - + private static final String ARG_VARNAME = "arg"; - + /** - * <p>The setter method for the <code>arg</code> property. This property is + * <p>The setter method for the <code>arg</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>arg</code> property. */ - public void setArg(String newValue) { vars.put(ARG_VARNAME, newValue); } - + public void setArg(String newValue) { vars.put(ARG_VARNAME, newValue); } + /** - * <p>The getter method for the <code>arg</code> property. This property is + * <p>The getter method for the <code>arg</code> property. This property is * passed through to the Commons Validator.</p> */ public String getArg() { return (String) vars.get(ARG_VARNAME); } - + private static final String MIN_VARNAME = "min"; /** - * <p>The setter method for the <code>min</code> property. This property is + * <p>The setter method for the <code>min</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>min</code> property. */ - public void setMin(Double newValue) { vars.put(MIN_VARNAME, newValue); } - + public void setMin(Double newValue) { vars.put(MIN_VARNAME, newValue); } + /** - * <p>The getter method for the <code>min</code> property. This property is + * <p>The getter method for the <code>min</code> property. This property is * passed through to the Commons Validator.</p> */ public Double getMin() { return (Double) vars.get(MIN_VARNAME); } - + private static final String MAX_VARNAME = "max"; /** - * <p>The setter method for the <code>max</code> property. This property is + * <p>The setter method for the <code>max</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>max</code> property. */ - public void setMax(Double newValue) { vars.put(MAX_VARNAME, newValue); } - + public void setMax(Double newValue) { vars.put(MAX_VARNAME, newValue); } + /** - * <p>The getter method for the <code>max</code> property. This property is + * <p>The getter method for the <code>max</code> property. This property is * passed through to the Commons Validator.</p> */ public Double getMax() { return (Double) vars.get(MAX_VARNAME); } - - + private static final String MIN_LENGTH_VARNAME = "minlength"; - /** - * <p>The setter method for the <code>minlength</code> property. This property is + + /** + * <p>The setter method for the <code>minlength</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>minlength</code> property. */ - public void setMinLength(Integer newValue) { vars.put(MIN_LENGTH_VARNAME, newValue); } - + public void setMinLength(Integer newValue) { vars.put(MIN_LENGTH_VARNAME, newValue); } + /** - * <p>The getter method for the <code>minLength</code> property. This property is + * <p>The getter method for the <code>minLength</code> property. This property is * passed through to the Commons Validator.</p> */ public Integer getMinLength() { return (Integer) vars.get(MIN_LENGTH_VARNAME); } - + private static final String MAX_LENGTH_VARNAME = "maxlength"; /** - * <p>The setter method for the <code>maxlength</code> property. This property is + * <p>The setter method for the <code>maxlength</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>maxlength</code> property. */ - public void setMaxLength(Integer newValue) { vars.put(MAX_LENGTH_VARNAME, newValue); } - + public void setMaxLength(Integer newValue) { vars.put(MAX_LENGTH_VARNAME, newValue); } + /** - * <p>The getter method for the <code>maxLength</code> property. This property is + * <p>The getter method for the <code>maxLength</code> property. This property is * passed through to the Commons Validator.</p> */ public Integer getMaxLength() { return (Integer) vars.get(MAX_LENGTH_VARNAME); } - + private static final String MASK_VARNAME = "mask"; /** - * <p>The setter method for the <code>mask</code> property. This property is + * <p>The setter method for the <code>mask</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>mask</code> property. */ - public void setMask(String newValue) { vars.put(MASK_VARNAME, newValue); } - + public void setMask(String newValue) { vars.put(MASK_VARNAME, newValue); } + /** - * <p>The getter method for the <code>mask</code> property. This property is + * <p>The getter method for the <code>mask</code> property. This property is * passed through to the Commons Validator.</p> */ public String getMask() { return (String) vars.get(MASK_VARNAME); } - - + + private static final String DATE_PATTERN_STRICT_VARNAME = "datePatternStrict"; /** - * <p>The setter method for the <code>datePatternStrict</code> property. This property is + * <p>The setter method for the <code>datePatternStrict</code> property. This property is * passed through to the Commons Validator.</p> * * @param newValue The new value for the <code>datePatternStrict</code> property. */ - public void setDatePatternStrict(String newValue) { + public void setDatePatternStrict(String newValue) { vars.put(DATE_PATTERN_STRICT_VARNAME, newValue); } /** - * <p>The getter method for the <code>datePatternStrict</code> property. This property is + * <p>The getter method for the <code>datePatternStrict</code> property. This property is * passed through to the Commons Validator.</p> */ public String getDatePatternStrict() { return (String) vars.get(DATE_PATTERN_STRICT_VARNAME); } - + /** * This method lazily configures validator resources by reading either - * the default <code>validalidator-rules.xml</code> file in - * shale-core.jar or the list of resources configured using the init + * the default <code>validalidator-rules.xml</code> file in + * shale-core.jar or the list of resources configured using the init * param <code>org.apache.shale.validator.VALIDATOR_RULES</code>. */ private static ValidatorResources getValidatorResources() { - final String VALIDATOR_RESOURCES_KEY = + final String VALIDATOR_RESOURCES_KEY = "org.apache.shale.validator.resources"; FacesContext context = FacesContext.getCurrentInstance(); ExternalContext external = context.getExternalContext(); Map applicationMap = external.getApplicationMap(); - ValidatorResources validatorResources + ValidatorResources validatorResources = (ValidatorResources) applicationMap.get(VALIDATOR_RESOURCES_KEY); - if (validatorResources == null) { + if (validatorResources == null) { try { String pathnames = external.getInitParameter(Globals.VALIDATOR_RULES); if (pathnames == null || pathnames.length() <= 0) { @@ -500,8 +500,8 @@ return validatorResources; } - - + + private static final String MESSAGE_ARG_NAME = "message"; /**
Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractFacesBean.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractFacesBean.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractFacesBean.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractFacesBean.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2004-2005 The Apache Software Foundation. - * + * * 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. @@ -41,7 +41,7 @@ * $Id$ */ public abstract class AbstractFacesBean { - + // -------------------------------- JavaServer Faces Object Accessor Methods @@ -341,7 +341,7 @@ /** * <p>Return the first (or only) value for the specified request parameter. * If no such request parameter exists for the current requset, return - * <ocde>null</code> instead.</p> + * <code>null</code> instead.</p> * * @param name Name of the request parameter to look for */ Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractRequestBean.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractRequestBean.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractRequestBean.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/AbstractRequestBean.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -34,7 +34,7 @@ * $Id$ */ public abstract class AbstractRequestBean extends AbstractFacesBean { - + // ------------------------------------------------------------- Constructor @@ -42,9 +42,9 @@ /** * <p>Create a new request scope bean.</p> */ - public AbstractRequestBean() { + public AbstractRequestBean() { } - + // ------------------------------------------------------- Lifecycle Methods Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/Constants.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/Constants.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/Constants.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/Constants.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -20,8 +20,8 @@ /** * <p>Manifest constants related to Shale view support.</p> */ -public class Constants { - +public final class Constants { + // ------------------------------------------------------------ Constructors @@ -29,7 +29,7 @@ /** * <p>Private constructor to avoid instantiation.</p> */ - private Constants() {} + private Constants() { } // ------------------------------------------------------ Manifest Constants Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewController.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewController.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewController.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewController.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2004-2005 The Apache Software Foundation. - * + * * 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. @@ -131,7 +131,7 @@ * was set to <code>true</code>, the <code>preprocess()</code> method will * be called after the component tree has been restored by the * <em>Restore View</em> phase. This method will <strong>not</strong> - * be called for a view that will only be rendered.</p> + * be called for a view that will only be rendered.</li> * <li>For a restored view, standard JSF processing and event handling occurs * for the <em>Apply Request Values</em> through <em>Invoke Application</em> * phases of the request processing lifecycle. As a side effect, it is @@ -156,7 +156,7 @@ */ public interface ViewController { - + // -------------------------------------------------------------- Properties @@ -168,8 +168,8 @@ * passed to the <code>setPostBack()</code> method.</p> */ public boolean isPostBack(); - - + + /** * <p>Set a flag indicating whether this request is a "post back" (that is, * the view was restored in order to respond to a submit from the client), Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewControllerMapper.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewControllerMapper.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewControllerMapper.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/ViewControllerMapper.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2004-2005 The Apache Software Foundation. - * + * * 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. @@ -28,7 +28,7 @@ */ public interface ViewControllerMapper { - + /** * <p>Return the name of the managed bean that serves as the backing * bean for the specified <code>view identifier</code>. If no such Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/CallbacksFactory.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/CallbacksFactory.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/CallbacksFactory.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/CallbacksFactory.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -25,8 +25,8 @@ * * @since 1.0.1 */ -public class CallbacksFactory { - +public final class CallbacksFactory { + // ------------------------------------------------------------ Constructors @@ -63,6 +63,7 @@ clazz = cl.loadClass("org.apache.shale.tiger.view.faces.ViewControllerCallbacks2"); } catch (ClassNotFoundException e) { // Deliberate fall through + ; } if (clazz == null) { try { Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerFactory.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -25,8 +25,8 @@ * * @since 1.0.3 */ -public class ExceptionHandlerFactory { - +public final class ExceptionHandlerFactory { + // ------------------------------------------------------------ Constructors Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ExceptionHandlerImpl.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -27,7 +27,7 @@ * <p>Default implementation of the [EMAIL PROTECTED] ExceptionHandler} interface.</p> */ public class ExceptionHandlerImpl implements ExceptionHandler { - + /** * <p>Log the specified exception, and record it in a request scoped @@ -56,7 +56,7 @@ List list = (List) context.getExternalContext().getRequestMap(). get(Constants.EXCEPTIONS_LIST); if (list == null) { - list = new ArrayList(5); + list = new ArrayList(); context.getExternalContext().getRequestMap(). put(Constants.EXCEPTIONS_LIST, list); } Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/LifecycleListener.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/LifecycleListener.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/LifecycleListener.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/LifecycleListener.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -47,7 +47,7 @@ * and shutdown calls (<code>init()</code> and <code>destroy()</code>) for * subclasses of [EMAIL PROTECTED] AbstractApplicationBean}, [EMAIL PROTECTED] AbstractRequestBean}, * and [EMAIL PROTECTED] AbstractSessionBean}.</p> - * + * * <p>It must be registered with the servlet container as a listener, * through an entry in either the <code>/WEB-INF/web.xml</code> resource * or a tag library descriptor included in the web application.</p> @@ -63,9 +63,8 @@ HttpSessionAttributeListener, HttpSessionListener, ServletRequestAttributeListener, - ServletRequestListener - { - + ServletRequestListener { + // ------------------------------------------------------------- Constructor @@ -73,9 +72,9 @@ /** * <p>Create a new lifecycle listener.</p> */ - public LifecycleListener() { + public LifecycleListener() { } - + // ------------------------------------------------------ Manifest Constants @@ -118,7 +117,6 @@ public void contextInitialized(ServletContextEvent event) { // No processing is required - ; } @@ -247,7 +245,6 @@ public void sessionCreated(HttpSessionEvent event) { // No processing is required - ; } @@ -280,6 +277,7 @@ // we can do. In a Servlet 2.4 or later container, this should not // happen, because the event handler is supposed to be called before // invalidation occurs, rather than after. + ; } } @@ -442,7 +440,6 @@ public void requestInitialized(ServletRequestEvent event) { // No processing is required - ; } Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewActionListener.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -29,7 +29,7 @@ * @since 1.0.3 */ public final class ViewActionListener implements ActionListener { - + // ------------------------------------------------------------- Constructor @@ -42,7 +42,7 @@ public ViewActionListener(ActionListener original) { this.original = original; } - + // ------------------------------------------------------ Instance Variables Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewControllerCallbacks.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewControllerCallbacks.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewControllerCallbacks.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/faces/ViewControllerCallbacks.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2006 The Apache Software Foundation. - * + * * 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. @@ -29,7 +29,7 @@ * $Id: ViewPhaseListener.java 367148 2006-01-09 01:01:56Z craigmcc $ */ public class ViewControllerCallbacks { - + // ------------------------------------------------------------ Constructors Modified: struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java URL: http://svn.apache.org/viewvc/struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java?rev=418848&r1=418847&r2=418848&view=diff ============================================================================== --- struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java (original) +++ struts/shale/trunk/shale-core/src/main/java/org/apache/shale/view/impl/DefaultViewControllerMapper.java Mon Jul 3 13:58:36 2006 @@ -1,12 +1,12 @@ /* * Copyright 2004-2005 The Apache Software Foundation. - * + * * 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. @@ -69,7 +69,7 @@ */ public class DefaultViewControllerMapper implements ViewControllerMapper { - + // -------------------------------------------------------- Static Variables @@ -97,9 +97,9 @@ // ---------------------------------------------------------- Public Methods - // Specified by ViewControllerMapper + /** [EMAIL PROTECTED] */ public String mapViewId(String viewId) { - + if (viewId == null) { return null; }
