You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2008/09/16 21:34:24 UTC
svn commit: r696018 - in /wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java
test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java
Author: dashorst
Date: Tue Sep 16 12:34:23 2008
New Revision: 696018
URL: http://svn.apache.org/viewvc?rev=696018&view=rev
Log:
WICKET-1834
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java?rev=696018&r1=696017&r2=696018&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersister.java Tue Sep 16 12:34:23 2008
@@ -22,6 +22,7 @@
import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -104,11 +105,11 @@
protected String getName(final FormComponent component)
{
String name = component.getPageRelativePath();
- // cookie names cannot contian ':',
+ // cookie names cannot contain ':',
// we replace ':' with '.' but first we have to encode '.' as '..'
- name = name.replace(".", "..");
- name = name.replace(":", ".");
- return name;
+ CharSequence sequence = Strings.replaceAll(name, ".", "..");
+ sequence = Strings.replaceAll(sequence, ":", ".");
+ return sequence.toString();
}
/**
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java?rev=696018&r1=696017&r2=696018&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/form/persistence/CookieValuePersisterTest.java Tue Sep 16 12:34:23 2008
@@ -106,7 +106,7 @@
assertNull(getRequestCookies(cycle));
assertEquals(1, getResponseCookies(cycle).size());
assertEquals("test", ((Cookie)getResponseCookies(cycle).get(0)).getValue());
- assertEquals("form:input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
+ assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
assertEquals("/WicketTester$DummyWebApplication",
((Cookie)getResponseCookies(cycle).get(0)).getPath());
@@ -118,7 +118,7 @@
assertNull(getRequestCookies(cycle));
assertEquals(1, getResponseCookies(cycle).size());
assertEquals("test", ((Cookie)getResponseCookies(cycle).get(0)).getValue());
- assertEquals("form:input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
+ assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(0)).getName());
assertEquals("/WicketTester$DummyWebApplication",
((Cookie)getResponseCookies(cycle).get(0)).getPath());
@@ -153,7 +153,7 @@
persister.clear(textField);
assertEquals(1, getRequestCookies(cycle).length);
assertEquals(2, getResponseCookies(cycle).size());
- assertEquals("form:input", ((Cookie)getResponseCookies(cycle).get(1)).getName());
+ assertEquals("form.input", ((Cookie)getResponseCookies(cycle).get(1)).getName());
assertEquals(0, ((Cookie)getResponseCookies(cycle).get(1)).getMaxAge());
}