From e4792aaf33ce95422a8b64a48f1ae422ef032cb5 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Mon, 16 Aug 2010 21:24:21 +0000 Subject: [PATCH] polishing --- .../web/servlet/support/RequestContext.java | 8 +------- .../web/servlet/tags/HtmlEscapingAwareTag.java | 7 +++---- .../java/org/springframework/web/util/UrlPathHelper.java | 2 -- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java index a607751851..4ff1764f77 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/support/RequestContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -415,9 +415,6 @@ public class RequestContext { *

Note this implementation will correctly resolve to the URI of any * originating root request in the presence of a forwarded request. However, this * can only work when the Servlet 2.4 'forward' request attributes are present. - * For use in a Servlet 2.3 environment, you can rely on - * {@link org.springframework.web.servlet.view.InternalResourceView} - * to add these prior to dispatching the request. *

Delegates to the UrlPathHelper for decoding. * @see #getQueryString * @see org.springframework.web.util.UrlPathHelper#getOriginatingRequestUri @@ -434,9 +431,6 @@ public class RequestContext { *

Note this implementation will correctly resolve to the query string of any * originating root request in the presence of a forwarded request. However, this * can only work when the Servlet 2.4 'forward' request attributes are present. - * For use in a Servlet 2.3 environment, you can rely on - * {@link org.springframework.web.servlet.view.InternalResourceView} - * to add these prior to dispatching the request. *

Delegates to the UrlPathHelper for decoding. * @see #getRequestUri * @see org.springframework.web.util.UrlPathHelper#getOriginatingQueryString diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java index 571ff4c566..c18c59fd34 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/HtmlEscapingAwareTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2007 the original author or authors. + * Copyright 2002-2010 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ import org.springframework.web.util.ExpressionEvaluationUtils; *

Provides a "htmlEscape" property for explicitly specifying whether to * apply HTML escaping. If not set, a page-level default (e.g. from the * HtmlEscapeTag) or an application-wide default (the "defaultHtmlEscape" - * context-param in web.xml) is used. + * context-param in web.xml) is used. * * @author Juergen Hoeller * @since 1.1 @@ -46,8 +46,7 @@ public abstract class HtmlEscapingAwareTag extends RequestContextAwareTag { * @see HtmlEscapeTag#setDefaultHtmlEscape */ public void setHtmlEscape(String htmlEscape) throws JspException { - this.htmlEscape = - new Boolean(ExpressionEvaluationUtils.evaluateBoolean("htmlEscape", htmlEscape, pageContext)); + this.htmlEscape = ExpressionEvaluationUtils.evaluateBoolean("htmlEscape", htmlEscape, pageContext); } /** diff --git a/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java b/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java index c4949ae9e8..a8cabafae9 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java +++ b/org.springframework.web/src/main/java/org/springframework/web/util/UrlPathHelper.java @@ -283,8 +283,6 @@ public class UrlPathHelper { /** * Return the query string part of the given request's URL. If this is a forwarded request, * correctly resolves to the query string of the original request. - *

Relies on the Servlet 2.4 'forward' attributes. These attributes may be set by - * other components when running in a Servlet 2.3 environment. * @param request current HTTP request * @return the query string */ -- GitLab