You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/01/02 17:24:18 UTC
svn commit: r1054424 - in /wicket/trunk/wicket-core/src:
main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java
test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
Author: mgrigorov
Date: Sun Jan 2 16:24:17 2011
New Revision: 1054424
URL: http://svn.apache.org/viewvc?rev=1054424&view=rev
Log:
WICKET-3297 UrlAttributes are encoded incorrectly when style is null but variation is not
Properly encode 'variation' in UrlInfo when there is no style specified.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java?rev=1054424&r1=1054423&r2=1054424&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/mapper/AbstractResourceReferenceMapper.java Sun Jan 2 16:24:17 2011
@@ -47,14 +47,22 @@ public abstract class AbstractResourceRe
{
res.append(attributes.getLocale().toString());
}
- if (!Strings.isEmpty(attributes.getStyle()))
+ boolean styleEmpty = Strings.isEmpty(attributes.getStyle());
+ if (!styleEmpty)
{
- res.append("-");
+ res.append('-');
res.append(attributes.getStyle());
}
if (!Strings.isEmpty(attributes.getVariation()))
{
- res.append("-");
+ if (styleEmpty)
+ {
+ res.append("--");
+ }
+ else
+ {
+ res.append('-');
+ }
res.append(attributes.getVariation());
}
return res.toString();
Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java?rev=1054424&r1=1054423&r2=1054424&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BasicResourceReferenceMapperTest.java Sun Jan 2 16:24:17 2011
@@ -422,6 +422,18 @@ public class BasicResourceReferenceMappe
url.toString());
}
+ /**
+ * Tests request to url encoding when style is null but variation is not
+ */
+ public void testEncode9()
+ {
+ ResourceReferenceRequestHandler handler = new ResourceReferenceRequestHandler(reference5,
+ null);
+
+ Url url = encoder.mapHandler(handler);
+ assertEquals("wicket/resource/" + CLASS_NAME + "/reference5?en--variation", url.toString());
+ }
+
public void testLastModifiedTimestampIsPartOfUrl()
{
long millis = 12345678L;