Repository: struts Updated Branches: refs/heads/master 39cc611d7 -> e28e5f03a
Fixes WW-4529 and few other typos Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e28e5f03 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e28e5f03 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e28e5f03 Branch: refs/heads/master Commit: e28e5f03a6fd56797fb69d9d2422a39c176a6317 Parents: 39cc611 Author: Aleksandr Mashchenko <amashche...@apache.org> Authored: Sat Jun 11 21:17:01 2016 +0300 Committer: Aleksandr Mashchenko <amashche...@apache.org> Committed: Sat Jun 11 21:17:01 2016 +0300 ---------------------------------------------------------------------- .../xwork2/interceptor/StaticParametersInterceptor.java | 2 +- .../opensymphony/xwork2/validator/DelegatingValidatorContext.java | 2 +- .../main/java/org/apache/struts2/components/DoubleListUIBean.java | 2 +- core/src/main/java/org/apache/struts2/components/ListUIBean.java | 2 +- core/src/main/java/org/apache/struts2/components/Set.java | 2 +- .../main/java/org/apache/struts2/factory/StrutsResultFactory.java | 2 +- .../java/org/apache/struts2/views/freemarker/tags/TagModel.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java index 914a2a1..d3e2df2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java +++ b/core/src/main/java/com/opensymphony/xwork2/interceptor/StaticParametersInterceptor.java @@ -205,7 +205,7 @@ public class StaticParametersInterceptor extends AbstractInterceptor { /** * Adds the parameters into context's ParameterMap. - * As default, static parameters will not overwrite existing paramaters from other sources. + * As default, static parameters will not overwrite existing parameters from other sources. * If you want the static parameters as successor over already existing parameters, set overwrite to <tt>true</tt>. * * @param ac The action context http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java index 0f56055..cf6de26 100644 --- a/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java +++ b/core/src/main/java/com/opensymphony/xwork2/validator/DelegatingValidatorContext.java @@ -184,7 +184,7 @@ public class DelegatingValidatorContext implements ValidatorContext { } public static TextProvider makeTextProvider(Object object, LocaleProvider localeProvider) { - // the object argument passed through here will most probably be an ActionSupport decendant which does + // the object argument passed through here will most probably be an ActionSupport descendant which does // implements TextProvider. if (object != null && object instanceof DelegatingValidatorContext) { return ((DelegatingValidatorContext) object).getTextProvider(); http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java index 22e53fa..5383a53 100644 --- a/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/DoubleListUIBean.java @@ -36,7 +36,7 @@ import java.util.Map; * <!-- START SNIPPET: javadoc --> * <p> * Note that the doublelistkey and doublelistvalue attribute will default to "key" and "value" - * respectively only when the doublelist attribute is evaluated to a Map or its decendant. + * respectively only when the doublelist attribute is evaluated to a Map or its descendant. * Other thing else, will result in doublelistkey and doublelistvalue to be null and not used. * </p> * http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/org/apache/struts2/components/ListUIBean.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/ListUIBean.java b/core/src/main/java/org/apache/struts2/components/ListUIBean.java index 94be9d1..75b29f0 100644 --- a/core/src/main/java/org/apache/struts2/components/ListUIBean.java +++ b/core/src/main/java/org/apache/struts2/components/ListUIBean.java @@ -42,7 +42,7 @@ import java.util.Map; * <!-- START SNIPPET: javadoc --> * <p> * Note that the listkey and listvalue attribute will default to "key" and "value" - * respectively only when the list attribute is evaluated to a Map or its decendant. + * respectively only when the list attribute is evaluated to a Map or its descendant. * Everything else will result in listkey and listvalue to be null and not used. * </p> * <!-- END SNIPPET: javadoc --> http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/org/apache/struts2/components/Set.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/components/Set.java b/core/src/main/java/org/apache/struts2/components/Set.java index 1b3c168..7e1ca02 100644 --- a/core/src/main/java/org/apache/struts2/components/Set.java +++ b/core/src/main/java/org/apache/struts2/components/Set.java @@ -42,7 +42,7 @@ import com.opensymphony.xwork2.util.ValueStack; * <li>application - the value will be set in application scope according to servlet spec. using the name as its key</li> * <li>session - the value will be set in session scope according to servlet spec. using the name as key </li> * <li>request - the value will be set in request scope according to servlet spec. using the name as key </li> - * <li>page - the value will be set in page scope according to servlet sepc. using the name as key</li> + * <li>page - the value will be set in page scope according to servlet spec. using the name as key</li> * <li>action - the value will be set in the request scope and Struts' action context using the name as key</li> * </ul> * http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java index 9005554..6088b02 100644 --- a/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsResultFactory.java @@ -13,7 +13,7 @@ import com.opensymphony.xwork2.result.ParamNameAwareResult; import java.util.Map; /** - * Default implementation which uses {@link com.opensymphony.xwork2.result.ParamNameAwareResult} to accept or throwaway parameters + * Default implementation which uses {@link com.opensymphony.xwork2.result.ParamNameAwareResult} to accept or throw away parameters */ public class StrutsResultFactory implements ResultFactory { http://git-wip-us.apache.org/repos/asf/struts/blob/e28e5f03/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java index ba7e37d..c174edd 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/tags/TagModel.java @@ -78,7 +78,7 @@ public abstract class TagModel implements TemplateTransformModel { Object value = entry.getValue(); if (value != null) { - // the value should ALWAYS be a decendant of TemplateModel + // the value should ALWAYS be a descendant of TemplateModel if (value instanceof TemplateModel) { try { map.put(entry.getKey(), objectWrapper.unwrap((TemplateModel) value));
