Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-09-17 15:00:33 +02:00
parent 5ca2c56cf0
commit a55261f82d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-webmvc/src/main/java/org/springframework/web/servlet/tags/UrlTag.java
View File

@@ -166,7 +166,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
/**
* Sets the value of the URL.
* Set the value of the URL.
*/
public void setValue(String value) {
if (value.contains(URL_TYPE_ABSOLUTE)) {
@@ -184,7 +184,8 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
}
/**
* Set the context path for the URL. Defaults to the current context
* Set the context path for the URL.
* Defaults to the current context.
*/
public void setContext(String context) {
if (context.startsWith("/")) {
@@ -204,8 +205,8 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
}
/**
* Set the scope to export the URL variable to. This attribute has no
* meaning unless var is also defined.
* Set the scope to export the URL variable to.
* This attribute has no meaning unless {@code var} is also defined.
*/
public void setScope(String scope) {
this.scope = TagUtils.getScope(scope);
@@ -375,7 +376,7 @@ public class UrlTag extends HtmlEscapingAwareTag implements ParamAware {
String value = param.getValue();
try {
uri = uri.replace(template,
(value != null ? UriUtils.encodePathSegment(param.getValue(), encoding) : ""));
(value != null ? UriUtils.encodePathSegment(value, encoding) : ""));
}
catch (UnsupportedCharsetException ex) {
throw new JspException(ex);

6
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/SockJsUrlInfo.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -27,8 +27,8 @@ import org.springframework.web.util.UriComponentsBuilder;
/**
* Container for the base URL of a SockJS endpoint with additional helper methods
* to derive related SockJS URLs as the {@link #getInfoUrl() info} URL and
* {@link #getTransportUrl(TransportType) transport} URLs.
* to derive related SockJS URLs: specifically, the {@link #getInfoUrl() info}
* and {@link #getTransportUrl(TransportType) transport} URLs.
*
* @author Rossen Stoyanchev
* @since 4.1