You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ws...@apache.org on 2006/07/12 06:35:48 UTC
svn commit: r421117 - in /struts/struts1/trunk/core/src:
main/java/org/apache/struts/action/
main/java/org/apache/struts/chain/commands/
main/java/org/apache/struts/chain/commands/generic/
main/java/org/apache/struts/chain/commands/servlet/ main/java/o...
Author: wsmoak
Date: Tue Jul 11 21:35:47 2006
New Revision: 421117
URL: http://svn.apache.org/viewvc?rev=421117&view=rev
Log:
STR-2900 Fix Checkstyle errors in struts-core.
Submitted by: Frank Zammetti
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessage.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessages.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ExceptionConfig.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormBeanConfig.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ForwardConfig.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/util/WildcardHelper.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionRedirect.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestActionConfig.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestForwardConfig.java
struts/struts1/trunk/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessage.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessage.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessage.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessage.java Tue Jul 11 21:35:47 2006
@@ -171,6 +171,7 @@
/**
* <p>Returns a String in the format: key[value1, value2, etc].</p>
*
+ * @return String representation of this message
* @see java.lang.Object#toString()
*/
public String toString() {
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessages.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessages.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessages.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionMessages.java Tue Jul 11 21:35:47 2006
@@ -329,6 +329,7 @@
* <p>Returns a String representation of this ActionMessages' property
* name=message list mapping.</p>
*
+ * @return String representation of the messages
* @see Object#toString()
*/
public String toString() {
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/action/ActionRedirect.java Tue Jul 11 21:35:47 2006
@@ -1,344 +1,346 @@
-/*
- * $Id$
- *
- * Copyright 2000-2004 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.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.struts.action;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.struts.config.ForwardConfig;
-import org.apache.struts.util.ResponseUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p> A subclass of {@link ActionForward} which is designed for use in
- * redirecting requests, with support for adding parameters at runtime. <br/>
- * An {@link ForwardConfig} (or subclass) can be passed to the constructor to
- * copy its configuration: </p> <p>
- * <pre>
- * public ActionForward execute(ActionMapping mapping,
- * ActionForm form,
- * HttpServletRequest request,
- * HttpServletResponse response)
- * throws Exception {
- * ActionRedirect redirect =
- * new ActionRedirect(mapping.findForward("doRedirect"));
- * redirect.addParameter("param1","value1");
- * redirect.addParameter("param2","2");
- * redirect.addParameter("param3","3.0");
- * return redirect;
- * }
- * </pre>
- * </p>
- *
- * @version $Rev$ $Date$
- */
-public class ActionRedirect extends ActionForward {
- // ----------------------------------------------------- Manifest constants
-
- /**
- * <p>Default allocation size for string buffers.</p>
- */
- private static final int DEFAULT_BUFFER_SIZE = 256;
-
- // ----------------------------------------------------- Static variables
-
- /**
- * <p>Commons logging instance.</p>
- */
- protected static final Log LOG = LogFactory.getLog(ActionRedirect.class);
-
- // ----------------------------------------------------- Instance variables
-
- /**
- * <p>Holds the redirect parameters. Each entry is either a String or a
- * String[] depending on whether it has one or more entries.</p>
- */
- protected Map parameterValues = null;
-
- /**
- * <p>Holds the anchor value.</p>
- */
- protected String anchorValue = null;
-
- // ----------------------------------------------------- Constructors
-
- /**
- * <p>Construct a new instance with redirect set to true and initialize
- * parameter lists.</p>
- */
- public ActionRedirect() {
- setRedirect(true);
- initializeParameters();
- }
-
- /**
- * <p>Construct a new instance with the specified path and initialize
- * parameter lists.</p>
- *
- * @param path Path for this instance
- */
- public ActionRedirect(String path) {
- super(path);
- setRedirect(true);
- initializeParameters();
- }
-
- /**
- * <p>Construct a new instance with the specified values and initialize
- * parameter lists.</p>
- *
- * @param name Name of this instance
- * @param path Path for this instance
- * @param module Module prefix, if any
- */
- public ActionRedirect(String name, String path, String module) {
- super(name, path, true);
- setModule(module);
- initializeParameters();
- }
-
- /**
- * <p>Construct a new instance with a {@link ForwardConfig} object to copy
- * name, path, and contextRelative values from.</p>
- *
- * @param baseConfig the {@link ForwardConfig} to copy configuration
- * values from
- */
- public ActionRedirect(ForwardConfig baseConfig) {
- setName(baseConfig.getName());
- setPath(baseConfig.getPath());
- setModule(baseConfig.getModule());
- setRedirect(baseConfig.getRedirect());
- initializeParameters();
- }
-
- // ----------------------------------------------------- Private methods
-
- /**
- * <p>Initializes the internal objects used to hold parameter values.</p>
- */
- private void initializeParameters() {
- parameterValues = new HashMap();
- }
-
- // ----------------------------------------------------- Public methods
-
- /**
- * <p>Adds the object's toString() to the list of parameters if it's not
- * null, or an empty string with the given fieldName if it is.</p>
- *
- * @param fieldName the name to use for the parameter
- * @param valueObj the value for this parameter
- */
- public ActionRedirect addParameter(String fieldName, Object valueObj) {
- String value = (valueObj != null) ? valueObj.toString() : "";
-
- if (parameterValues == null) {
- initializeParameters();
- }
-
- //try {
- value = ResponseUtils.encodeURL(value);
-
- //} catch (UnsupportedEncodingException uce) {
- // this shouldn't happen since UTF-8 is the W3C Recommendation
- // String errorMsg = "UTF-8 Character Encoding not supported";
- // LOG.error(errorMsg, uce);
- // throw new RuntimeException(errorMsg, uce);
- // }
- Object currentValue = parameterValues.get(fieldName);
-
- if (currentValue == null) {
- // there's no value for this param yet; add it to the map
- parameterValues.put(fieldName, value);
- } else if (currentValue instanceof String) {
- // there's already a value; let's use an array for these parameters
- String[] newValue = new String[2];
-
- newValue[0] = (String) currentValue;
- newValue[1] = value;
- parameterValues.put(fieldName, newValue);
- } else if (currentValue instanceof String[]) {
- // add the value to the list of existing values
- List newValues =
- new ArrayList(Arrays.asList((Object[]) currentValue));
-
- newValues.add(value);
- parameterValues.put(fieldName,
- newValues.toArray(new String[newValues.size()]));
- }
- return this;
- }
-
- /**
- * <p>Adds an anchor to the path. Technically, the anchor value is
- * just stored for later and will be added to the path in getPath().
- * Note that this is a considerably simpler method than the
- * addParmaeter method because aside from encoding the value, there
- * isn't really anything to do. Passing in null is fine because that
- * is the value that will be checked for later to determine whether
- * to append an anchor to the path or not.</p>
- *
- * @param anchorValue The anchor to append to the path
- */
- public ActionRedirect setAnchor(String anchorValue) {
- this.anchorValue = ResponseUtils.encodeURL(anchorValue);
- return this;
- }
-
- /**
- * <p>Get the original path without the parameters added at runtime.</p>
- *
- * @return the original path as configured.
- */
- public String getOriginalPath() {
- return super.getPath();
- }
-
- /**
- * <p>Get the path for this object, including any parameters that may have
- * been added at runtime.</p>
- *
- * @return The path for this object.
- */
- public String getPath() {
- // get the original path and the parameter string that was formed
- String originalPath = getOriginalPath();
- String parameterString = getParameterString();
- String anchorString = getAnchorString();
-
- StringBuffer result = new StringBuffer(originalPath);
-
- if ((parameterString != null) && (parameterString.length() > 0)) {
- // the parameter separator we're going to use
- String paramSeparator = "?";
-
- // true if we need to use a parameter separator after originalPath
- boolean needsParamSeparator = true;
-
- // does the original path already have a "?"?
- int paramStartIndex = originalPath.indexOf("?");
-
- if (paramStartIndex > 0) {
- // did the path end with "?"?
- needsParamSeparator = (paramStartIndex != (originalPath.length()
- - 1));
-
- if (needsParamSeparator) {
- paramSeparator = "&";
- }
- }
-
- if (needsParamSeparator) {
- result.append(paramSeparator);
- }
-
- result.append(parameterString);
- }
-
- // append anchor string (or blank if none was set)
- result.append(anchorString);
-
-
- return result.toString();
- }
-
- /**
- * <p>Forms the string containing the parameters
- * passed onto this object thru calls to addParameter().</p>
- *
- * @return a string which can be appended to the URLs. The
- * return string includes a leading hash
- * mark (#).
- */
- public String getAnchorString() {
- String retVal = "";
- if (anchorValue != null) {
- retVal = "#" + anchorValue;
- }
- return retVal;
- }
-
- /**
- * <p>Forms the string containing the parameters passed onto this object
- * thru calls to addParameter().</p>
- *
- * @return a string which can be appended to the URLs. The return string
- * does not include a leading question mark (?).
- */
- public String getParameterString() {
- StringBuffer strParam = new StringBuffer(DEFAULT_BUFFER_SIZE);
-
- // loop through all parameters
- Iterator iterator = parameterValues.keySet().iterator();
-
- while (iterator.hasNext()) {
- // get the parameter name
- String paramName = (String) iterator.next();
-
- // get the value for this parameter
- Object value = parameterValues.get(paramName);
-
- if (value instanceof String) {
- // just one value for this param
- strParam.append(paramName).append("=").append(value);
- } else if (value instanceof String[]) {
- // loop through all values for this param
- String[] values = (String[]) value;
-
- for (int i = 0; i < values.length; i++) {
- strParam.append(paramName).append("=").append(values[i]);
-
- if (i < (values.length - 1)) {
- strParam.append("&");
- }
- }
- }
-
- if (iterator.hasNext()) {
- strParam.append("&");
- }
- }
-
- return strParam.toString();
- }
-
- // ----------------------------------------------------- toString()
-
- /**
- * <p>Return a string description of this object.</p>
- *
- * @return a string containing the original path for this object and the
- * parameters it currently holds
- */
- public String toString() {
- StringBuffer result = new StringBuffer(DEFAULT_BUFFER_SIZE);
-
- result.append("ActionRedirect [");
- result.append("originalPath=").append(getOriginalPath()).append(";");
- result.append("parameterString=").append(getParameterString()).append("]");
- result.append("anchorString=").append(getAnchorString()).append("]");
-
- return result.toString();
- }
-}
+/*
+ * $Id$
+ *
+ * Copyright 2000-2004 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.struts.action;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.config.ForwardConfig;
+import org.apache.struts.util.ResponseUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p> A subclass of {@link ActionForward} which is designed for use in
+ * redirecting requests, with support for adding parameters at runtime. <br/>
+ * An {@link ForwardConfig} (or subclass) can be passed to the constructor to
+ * copy its configuration: </p> <p>
+ * <pre>
+ * public ActionForward execute(ActionMapping mapping,
+ * ActionForm form,
+ * HttpServletRequest request,
+ * HttpServletResponse response)
+ * throws Exception {
+ * ActionRedirect redirect =
+ * new ActionRedirect(mapping.findForward("doRedirect"));
+ * redirect.addParameter("param1","value1");
+ * redirect.addParameter("param2","2");
+ * redirect.addParameter("param3","3.0");
+ * return redirect;
+ * }
+ * </pre>
+ * </p>
+ *
+ * @version $Rev$ $Date$
+ */
+public class ActionRedirect extends ActionForward {
+ // ----------------------------------------------------- Manifest constants
+
+ /**
+ * <p>Default allocation size for string buffers.</p>
+ */
+ private static final int DEFAULT_BUFFER_SIZE = 256;
+
+ // ----------------------------------------------------- Static variables
+
+ /**
+ * <p>Commons logging instance.</p>
+ */
+ protected static final Log LOG = LogFactory.getLog(ActionRedirect.class);
+
+ // ----------------------------------------------------- Instance variables
+
+ /**
+ * <p>Holds the redirect parameters. Each entry is either a String or a
+ * String[] depending on whether it has one or more entries.</p>
+ */
+ protected Map parameterValues = null;
+
+ /**
+ * <p>Holds the anchor value.</p>
+ */
+ protected String anchorValue = null;
+
+ // ----------------------------------------------------- Constructors
+
+ /**
+ * <p>Construct a new instance with redirect set to true and initialize
+ * parameter lists.</p>
+ */
+ public ActionRedirect() {
+ setRedirect(true);
+ initializeParameters();
+ }
+
+ /**
+ * <p>Construct a new instance with the specified path and initialize
+ * parameter lists.</p>
+ *
+ * @param path Path for this instance
+ */
+ public ActionRedirect(String path) {
+ super(path);
+ setRedirect(true);
+ initializeParameters();
+ }
+
+ /**
+ * <p>Construct a new instance with the specified values and initialize
+ * parameter lists.</p>
+ *
+ * @param name Name of this instance
+ * @param path Path for this instance
+ * @param module Module prefix, if any
+ */
+ public ActionRedirect(String name, String path, String module) {
+ super(name, path, true);
+ setModule(module);
+ initializeParameters();
+ }
+
+ /**
+ * <p>Construct a new instance with a {@link ForwardConfig} object to copy
+ * name, path, and contextRelative values from.</p>
+ *
+ * @param baseConfig the {@link ForwardConfig} to copy configuration
+ * values from
+ */
+ public ActionRedirect(ForwardConfig baseConfig) {
+ setName(baseConfig.getName());
+ setPath(baseConfig.getPath());
+ setModule(baseConfig.getModule());
+ setRedirect(baseConfig.getRedirect());
+ initializeParameters();
+ }
+
+ // ----------------------------------------------------- Private methods
+
+ /**
+ * <p>Initializes the internal objects used to hold parameter values.</p>
+ */
+ private void initializeParameters() {
+ parameterValues = new HashMap();
+ }
+
+ // ----------------------------------------------------- Public methods
+
+ /**
+ * <p>Adds the object's toString() to the list of parameters if it's not
+ * null, or an empty string with the given fieldName if it is.</p>
+ *
+ * @param fieldName the name to use for the parameter
+ * @param valueObj the value for this parameter
+ * @return The ActionRedirect instance this method is called on
+ */
+ public ActionRedirect addParameter(String fieldName, Object valueObj) {
+ String value = (valueObj != null) ? valueObj.toString() : "";
+
+ if (parameterValues == null) {
+ initializeParameters();
+ }
+
+ //try {
+ value = ResponseUtils.encodeURL(value);
+
+ //} catch (UnsupportedEncodingException uce) {
+ // this shouldn't happen since UTF-8 is the W3C Recommendation
+ // String errorMsg = "UTF-8 Character Encoding not supported";
+ // LOG.error(errorMsg, uce);
+ // throw new RuntimeException(errorMsg, uce);
+ // }
+ Object currentValue = parameterValues.get(fieldName);
+
+ if (currentValue == null) {
+ // there's no value for this param yet; add it to the map
+ parameterValues.put(fieldName, value);
+ } else if (currentValue instanceof String) {
+ // there's already a value; let's use an array for these parameters
+ String[] newValue = new String[2];
+
+ newValue[0] = (String) currentValue;
+ newValue[1] = value;
+ parameterValues.put(fieldName, newValue);
+ } else if (currentValue instanceof String[]) {
+ // add the value to the list of existing values
+ List newValues =
+ new ArrayList(Arrays.asList((Object[]) currentValue));
+
+ newValues.add(value);
+ parameterValues.put(fieldName,
+ newValues.toArray(new String[newValues.size()]));
+ }
+ return this;
+ }
+
+ /**
+ * <p>Adds an anchor to the path. Technically, the anchor value is
+ * just stored for later and will be added to the path in getPath().
+ * Note that this is a considerably simpler method than the
+ * addParmaeter method because aside from encoding the value, there
+ * isn't really anything to do. Passing in null is fine because that
+ * is the value that will be checked for later to determine whether
+ * to append an anchor to the path or not.</p>
+ *
+ * @param anchorValue The anchor to append to the path
+ * @return The ActionRefirect instance this method is called on
+ */
+ public ActionRedirect setAnchor(String anchorValue) {
+ this.anchorValue = ResponseUtils.encodeURL(anchorValue);
+ return this;
+ }
+
+ /**
+ * <p>Get the original path without the parameters added at runtime.</p>
+ *
+ * @return the original path as configured.
+ */
+ public String getOriginalPath() {
+ return super.getPath();
+ }
+
+ /**
+ * <p>Get the path for this object, including any parameters that may have
+ * been added at runtime.</p>
+ *
+ * @return The path for this object.
+ */
+ public String getPath() {
+ // get the original path and the parameter string that was formed
+ String originalPath = getOriginalPath();
+ String parameterString = getParameterString();
+ String anchorString = getAnchorString();
+
+ StringBuffer result = new StringBuffer(originalPath);
+
+ if ((parameterString != null) && (parameterString.length() > 0)) {
+ // the parameter separator we're going to use
+ String paramSeparator = "?";
+
+ // true if we need to use a parameter separator after originalPath
+ boolean needsParamSeparator = true;
+
+ // does the original path already have a "?"?
+ int paramStartIndex = originalPath.indexOf("?");
+
+ if (paramStartIndex > 0) {
+ // did the path end with "?"?
+ needsParamSeparator = (paramStartIndex != (originalPath.length()
+ - 1));
+
+ if (needsParamSeparator) {
+ paramSeparator = "&";
+ }
+ }
+
+ if (needsParamSeparator) {
+ result.append(paramSeparator);
+ }
+
+ result.append(parameterString);
+ }
+
+ // append anchor string (or blank if none was set)
+ result.append(anchorString);
+
+
+ return result.toString();
+ }
+
+ /**
+ * <p>Forms the string containing the parameters
+ * passed onto this object thru calls to addParameter().</p>
+ *
+ * @return a string which can be appended to the URLs. The
+ * return string includes a leading hash
+ * mark (#).
+ */
+ public String getAnchorString() {
+ String retVal = "";
+ if (anchorValue != null) {
+ retVal = "#" + anchorValue;
+ }
+ return retVal;
+ }
+
+ /**
+ * <p>Forms the string containing the parameters passed onto this object
+ * thru calls to addParameter().</p>
+ *
+ * @return a string which can be appended to the URLs. The return string
+ * does not include a leading question mark (?).
+ */
+ public String getParameterString() {
+ StringBuffer strParam = new StringBuffer(DEFAULT_BUFFER_SIZE);
+
+ // loop through all parameters
+ Iterator iterator = parameterValues.keySet().iterator();
+
+ while (iterator.hasNext()) {
+ // get the parameter name
+ String paramName = (String) iterator.next();
+
+ // get the value for this parameter
+ Object value = parameterValues.get(paramName);
+
+ if (value instanceof String) {
+ // just one value for this param
+ strParam.append(paramName).append("=").append(value);
+ } else if (value instanceof String[]) {
+ // loop through all values for this param
+ String[] values = (String[]) value;
+
+ for (int i = 0; i < values.length; i++) {
+ strParam.append(paramName).append("=").append(values[i]);
+
+ if (i < (values.length - 1)) {
+ strParam.append("&");
+ }
+ }
+ }
+
+ if (iterator.hasNext()) {
+ strParam.append("&");
+ }
+ }
+
+ return strParam.toString();
+ }
+
+ // ----------------------------------------------------- toString()
+
+ /**
+ * <p>Return a string description of this object.</p>
+ *
+ * @return a string containing the original path for this object and the
+ * parameters it currently holds
+ */
+ public String toString() {
+ StringBuffer result = new StringBuffer(DEFAULT_BUFFER_SIZE);
+
+ result.append("ActionRedirect [");
+ result.append("originalPath=").append(getOriginalPath()).append(";");
+ result.append("parameterString=").append(getParameterString()).append("]");
+ result.append("anchorString=").append(getAnchorString()).append("]");
+
+ return result.toString();
+ }
+}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java Tue Jul 11 21:35:47 2006
@@ -31,10 +31,10 @@
public class RemoveCachedMessages extends ActionCommandBase {
/**
- * <p>Removes any <code>ActionMessages</code> object stored in the session
- * under <code>Globals.MESSAGE_KEY</code> and <code>Globals.ERROR_KEY</code>
- * if the messages' <code>isAccessed</code> method returns true. This
- * allows messages to be stored in the session, displayed one time, and be
+ * <p>Removes any <code>ActionMessages</code> object stored in the session
+ * under <code>Globals.MESSAGE_KEY</code> and <code>Globals.ERROR_KEY</code>
+ * if the messages' <code>isAccessed</code> method returns true. This
+ * allows messages to be stored in the session, displayed one time, and be
* released here.</p>
*
* @param actionCtx The <code>Context</code> for the current request
@@ -58,7 +58,7 @@
/**
* <p>Removes any <code>ActionMessages</code> object from the specified
- * scope stored under the specified key if the messages'
+ * scope stored under the specified key if the messages'
* <code>isAccessed</code> method returns true.
*
* @param scope The scope to check for messages in.
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java Tue Jul 11 21:35:47 2006
@@ -292,8 +292,8 @@
* @throws NoSuchMethodException On failed instantiation
*/
protected Context getContext(Context context)
- throws ClassNotFoundException, InstantiationException,
- InvocationTargetException, IllegalAccessException,
+ throws ClassNotFoundException, InstantiationException,
+ InvocationTargetException, IllegalAccessException,
NoSuchMethodException {
if (wrapperClassName == null) {
if (LOG.isDebugEnabled()) {
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java Tue Jul 11 21:35:47 2006
@@ -56,7 +56,7 @@
protected void perform(ActionContext context, ForwardConfig forwardConfig)
throws Exception {
ServletActionContext sacontext = (ServletActionContext) context;
- String uri = forwardConfig.getPath();;
+ String uri = forwardConfig.getPath();
if (uri == null) {
ActionServlet servlet = sacontext.getActionServlet();
@@ -123,7 +123,7 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Including " + uri);
}
-
+
rd.include(request, response);
}
}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java Tue Jul 11 21:35:47 2006
@@ -61,7 +61,7 @@
* constructor
*/
public static Object getApplicationInstance(String className)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
return (getApplicationClass(className).newInstance());
}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java Tue Jul 11 21:35:47 2006
@@ -90,7 +90,8 @@
* <p> Return a map whose keys are <code>String</code> request parameter
* names and whose values are <code>String</code> values. </p> <p> For
* parameters which were submitted with more than one value, only one
- * value will be returned, as if one called <code>ServletRequest.getParameter(String)</code>
+ * value will be returned, as if one called
+ * <code>ServletRequest.getParameter(String)</code>
* </p>
*
* @return A map of web request parameters
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ActionConfig.java Tue Jul 11 21:35:47 2006
@@ -734,7 +734,7 @@
* @see #inheritFrom(ActionConfig)
*/
protected void inheritExceptionHandlers(ActionConfig baseConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
@@ -774,7 +774,7 @@
* @see #inheritFrom(ActionConfig)
*/
protected void inheritForwards(ActionConfig baseConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
@@ -972,7 +972,7 @@
* @see #processExtends(ModuleConfig)
*/
public void inheritFrom(ActionConfig config)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ExceptionConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ExceptionConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ExceptionConfig.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ExceptionConfig.java Tue Jul 11 21:35:47 2006
@@ -284,7 +284,7 @@
* @see #processExtends(ModuleConfig, ActionConfig)
*/
public void inheritFrom(ExceptionConfig config)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
@@ -332,7 +332,7 @@
*/
public void processExtends(ModuleConfig moduleConfig,
ActionConfig actionConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormBeanConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormBeanConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormBeanConfig.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormBeanConfig.java Tue Jul 11 21:35:47 2006
@@ -227,7 +227,7 @@
* @see #inheritFrom(FormBeanConfig)
*/
protected void inheritFormProperties(FormBeanConfig config)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
throwIfConfigured();
@@ -481,7 +481,7 @@
* @see #processExtends(ModuleConfig)
*/
public void inheritFrom(FormBeanConfig config)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
throwIfConfigured();
@@ -512,7 +512,7 @@
* @see #inheritFrom(FormBeanConfig)
*/
public void processExtends(ModuleConfig moduleConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java Tue Jul 11 21:35:47 2006
@@ -374,7 +374,7 @@
* values from.
*/
public void inheritFrom(FormPropertyConfig config)
- throws IllegalAccessException, InvocationTargetException,
+ throws IllegalAccessException, InvocationTargetException,
InstantiationException, ClassNotFoundException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ForwardConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ForwardConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ForwardConfig.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/config/ForwardConfig.java Tue Jul 11 21:35:47 2006
@@ -353,7 +353,7 @@
* @see #processExtends(ModuleConfig, ActionConfig)
*/
public void inheritFrom(ForwardConfig config)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
@@ -401,7 +401,7 @@
*/
public void processExtends(ModuleConfig moduleConfig,
ActionConfig actionConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
if (configured) {
throw new IllegalStateException("Configuration is frozen");
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java Tue Jul 11 21:35:47 2006
@@ -142,4 +142,3 @@
}
}
-
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java Tue Jul 11 21:35:47 2006
@@ -394,7 +394,7 @@
if (log.isDebugEnabled()) {
log.debug("request.getCharacterEncoding=[" + encoding + "]");
}
- }
+ }
if (encoding != null) {
try {
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java Tue Jul 11 21:35:47 2006
@@ -265,7 +265,7 @@
log.warn(" Resource "+name+" Not Found.");
}
}
-
+
// Copy the corresponding values into our cache
if (props.size() < 1) {
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/util/RequestUtils.java Tue Jul 11 21:35:47 2006
@@ -133,7 +133,7 @@
* constructor
*/
public static Object applicationInstance(String className)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
return applicationInstance(className, null);
}
@@ -158,7 +158,7 @@
*/
public static Object applicationInstance(String className,
ClassLoader classLoader)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
return (applicationClass(className, classLoader).newInstance());
}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/util/WildcardHelper.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/util/WildcardHelper.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/util/WildcardHelper.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/util/WildcardHelper.java Tue Jul 11 21:35:47 2006
@@ -310,7 +310,8 @@
* @return The offset in d of the part of r matched in d or -1 if that was
* not found.
*/
- protected int indexOfArray(int[] r, int rpos, int rend, char[] d, int dpos) {
+ protected int indexOfArray(int[] r, int rpos, int rend, char[] d,
+ int dpos) {
// Check if pos and len are legal
if (rend < rpos) {
throw new IllegalArgumentException("rend < rpos");
@@ -438,7 +439,8 @@
* @param dpos The starting offset in d for the matching.
* @return true if array d starts from portion of array r.
*/
- protected boolean matchArray(int[] r, int rpos, int rend, char[] d, int dpos) {
+ protected boolean matchArray(int[] r, int rpos, int rend, char[] d,
+ int dpos) {
if ((d.length - dpos) < (rend - rpos)) {
return (false);
}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/FieldChecks.java Tue Jul 11 21:35:47 2006
@@ -227,7 +227,7 @@
String mask =
Resources.getVarValue("mask", field, validator, request, true);
- if (value != null && value.length()>0
+ if (value != null && value.length()>0
&& !GenericValidator.matchRegexp(value, mask)) {
errors.add(field.getKey(),
Resources.getActionMessage(validator, request, va, field));
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java Tue Jul 11 21:35:47 2006
@@ -216,8 +216,8 @@
URL input =
servlet.getServletContext().getResource(validatorRules);
- // If the config isn't in the servlet context, try the class loader
- // which allows the config files to be stored in a jar
+ // If the config isn't in the servlet context, try the class
+ // loader which allows the config files to be stored in a jar
if (input == null) {
input = getClass().getResource(validatorRules);
}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java Tue Jul 11 21:35:47 2006
@@ -89,7 +89,8 @@
if ((leftBracket > -1) && (rightBracket > -1)) {
index =
- Integer.parseInt(key.substring(leftBracket + 1, rightBracket));
+ Integer.parseInt(key.substring(leftBracket + 1,
+ rightBracket));
}
}
Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java (original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java Tue Jul 11 21:35:47 2006
@@ -69,7 +69,7 @@
public Token nextToken() throws TokenStreamException {
Token theRetToken = null;
-tryAgain:
+tryAgain:
for (;;) {
Token _token = null;
int _ttype = Token.INVALID_TYPE;
@@ -244,7 +244,8 @@
}
} catch (CharStreamException cse) {
if (cse instanceof CharStreamIOException) {
- throw new TokenStreamIOException(((CharStreamIOException) cse).io);
+ throw new TokenStreamIOException(
+ ((CharStreamIOException) cse).io);
} else {
throw new TokenStreamException(cse.getMessage());
}
@@ -265,7 +266,7 @@
{
int _cnt15 = 0;
-_loop15:
+_loop15:
do {
switch (LA(1)) {
case ' ': {
@@ -351,7 +352,7 @@
}
matchRange('1', '9');
-_loop20:
+_loop20:
do {
if ((((LA(1) >= '0') && (LA(1) <= '9')))) {
matchRange('0', '9');
@@ -385,7 +386,7 @@
{
int _cnt23 = 0;
-_loop23:
+_loop23:
do {
switch (LA(1)) {
case '0':
@@ -448,7 +449,7 @@
int _saveIndex;
match('0');
-_loop26:
+_loop26:
do {
if ((((LA(1) >= '0') && (LA(1) <= '7')))) {
matchRange('0', '7');
@@ -483,7 +484,7 @@
{
int _cnt30 = 0;
-_loop30:
+_loop30:
do {
if ((_tokenSet_0.member(LA(1)))) {
matchNot('\'');
@@ -511,7 +512,7 @@
{
int _cnt33 = 0;
-_loop33:
+_loop33:
do {
if ((_tokenSet_1.member(LA(1)))) {
matchNot('\"');
@@ -714,7 +715,7 @@
{
int _cnt42 = 0;
-_loop42:
+_loop42:
do {
switch (LA(1)) {
case 'a':
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionRedirect.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionRedirect.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionRedirect.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionRedirect.java Tue Jul 11 21:35:47 2006
@@ -117,7 +117,7 @@
assertHasParameter(ar.parameterValues, "object1", "someString");
assertEquals("Incorrect original path.", forward.getPath(),
ar.getOriginalPath());
- assertTrue("Original had redirect to false", !ar.getRedirect());
+ assertTrue("Original had redirect to false", !ar.getRedirect());
}
/**
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestActionServlet.java Tue Jul 11 21:35:47 2006
@@ -984,7 +984,7 @@
* Set a flag so we know this method was called.
*/
public void processExtends(ModuleConfig moduleConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
processExtendsCalled = true;
}
@@ -1016,7 +1016,7 @@
*/
public void processExtends(ModuleConfig moduleConfig,
ActionConfig actionConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
processExtendsCalled = true;
}
@@ -1052,7 +1052,7 @@
*/
public void processExtends(ModuleConfig moduleConfig,
ActionConfig actionConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
processExtendsCalled = true;
}
@@ -1089,7 +1089,7 @@
* Set a flag so we know this method was called.
*/
public void processExtends(ModuleConfig moduleConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException {
processExtendsCalled = true;
}
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java Tue Jul 11 21:35:47 2006
@@ -48,7 +48,7 @@
"booleanProperty", "booleanSecond", "doubleProperty",
"floatProperty", "intArray", "intIndexed", "intProperty",
"listIndexed", "longProperty", "mappedProperty", "mappedIntProperty",
-
+
// "nullProperty",
"shortProperty", "stringArray", "stringIndexed", "stringProperty",
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java Tue Jul 11 21:35:47 2006
@@ -50,7 +50,7 @@
new FormPropertyConfig("longProperty", "long", "321"),
new FormPropertyConfig("mappedProperty", "java.util.Map", null),
new FormPropertyConfig("mappedIntProperty", "java.util.Map", null),
-
+
// new FormPropertyConfig("nullProperty", "java.lang.String", null),
new FormPropertyConfig("shortProperty", "short", "987"),
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestActionConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestActionConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestActionConfig.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestActionConfig.java Tue Jul 11 21:35:47 2006
@@ -313,7 +313,7 @@
boolean processExtendsCalled = false;
public void processExtends(ModuleConfig moduleConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
super.processExtends(moduleConfig);
processExtendsCalled = true;
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java Tue Jul 11 21:35:47 2006
@@ -328,7 +328,7 @@
boolean processExtendsCalled = false;
public void processExtends(ModuleConfig moduleConfig)
- throws ClassNotFoundException, IllegalAccessException,
+ throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException {
super.processExtends(moduleConfig);
processExtendsCalled = true;
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestForwardConfig.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestForwardConfig.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestForwardConfig.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/config/TestForwardConfig.java Tue Jul 11 21:35:47 2006
@@ -154,7 +154,7 @@
moduleConfig.addForwardConfig(subConfig);
moduleConfig.addForwardConfig(baseConfig);
- // set the baseConfig to extend subConfig
+ // set the baseConfig to extend subConfig
baseConfig.setExtends("subConfig");
boolean result = subConfig.checkCircularInheritance(moduleConfig, null);
@@ -176,7 +176,7 @@
grand.setExtends("subConfig");
moduleConfig.addForwardConfig(grand);
- // set the baseConfig to extend grandConfig
+ // set the baseConfig to extend grandConfig
baseConfig.setExtends("grandConfig");
boolean result = grand.checkCircularInheritance(moduleConfig, null);
Modified: struts/struts1/trunk/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java?rev=421117&r1=421116&r2=421117&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java (original)
+++ struts/struts1/trunk/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java Tue Jul 11 21:35:47 2006
@@ -1,14 +1,14 @@
/*
- * $Id$
+ * $Id$
*
* 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.
@@ -26,9 +26,9 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.RequestUtils;
import org.apache.struts.Globals;
-import org.apache.struts.mock.TestMockBase;
-import org.apache.struts.mock.MockFormBean;
-import org.apache.struts.mock.MockMultipartRequestHandler;
+import org.apache.struts.mock.TestMockBase;
+import org.apache.struts.mock.MockFormBean;
+import org.apache.struts.mock.MockMultipartRequestHandler;
/**
* Unit tests for the RequestUtil's <code>populate</code> method.
@@ -36,7 +36,7 @@
* @version $Rev$
*/
public class TestRequestUtilsPopulate extends TestMockBase {
-
+
/**
* Defines the testcase name for JUnit.
*
@@ -73,8 +73,8 @@
super.tearDown();
}
- /**
- * Ensure that the getMultipartRequestHandler cannot be seen in
+ /**
+ * Ensure that the getMultipartRequestHandler cannot be seen in
* a subclass of ActionForm.
*
* The purpose of this test is to ensure that Bug #38534 is fixed.
@@ -116,6 +116,5 @@
assertEquals("Mapping name has been modified", mockMappingName, mapping.getName());
}
-
-}
+}