Author: svenmeier
Date: Fri Oct 7 08:15:44 2011
New Revision: 1179957
URL: http://svn.apache.org/viewvc?rev=1179957&view=rev
Log:
WICKET-4109 AutocompleteTextField after Submit does not work - PageProvider no
longer pushes PageParameters into previously stored pages.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java?rev=1179957&r1=1179956&r2=1179957&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/request/handler/PageProvider.java
Fri Oct 7 08:15:44 2011
@@ -292,12 +292,6 @@ public class PageProvider implements IPa
(pageClass == null ||
pageClass.equals(storedPageInstance.getClass())))
{
pageInstance = storedPageInstance;
-
- if (pageParameters != null)
- {
-
storedPageInstance.getPageParameters().overwriteWith(pageParameters);
- }
-
}
return storedPageInstance;
}
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java?rev=1179957&r1=1179956&r2=1179957&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/BookmarkableMapperTest.java
Fri Oct 7 08:15:44 2011
@@ -118,13 +118,9 @@ public class BookmarkableMapperTest exte
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
- assertEquals("i1", p.get(0).toString());
- assertEquals("i2", p.get(1).toString());
-
- assertEquals(2, p.getNamedKeys().size());
- assertEquals("b", p.get("a").toString());
- assertEquals("c", p.get("b").toString());
+ assertEquals(0, p.getIndexedCount());
+
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -166,13 +162,9 @@ public class BookmarkableMapperTest exte
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
- assertEquals("i1", p.get(0).toString());
- assertEquals("i2", p.get(1).toString());
-
- assertEquals(2, p.getNamedKeys().size());
- assertEquals("b", p.get("a").toString());
- assertEquals("c", p.get("b").toString());
+ assertEquals(0, p.getIndexedCount());
+
+ assertEquals(0, p.getNamedKeys().size());
}
/**
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java?rev=1179957&r1=1179956&r2=1179957&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/MountedMapperTest.java
Fri Oct 7 08:15:44 2011
@@ -137,13 +137,9 @@ public class MountedMapperTest extends A
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
- assertEquals("i1", p.get(0).toString());
- assertEquals("i2", p.get(1).toString());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
- assertEquals("b", p.get("a").toString());
- assertEquals("c", p.get("b").toString());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -184,13 +180,9 @@ public class MountedMapperTest extends A
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
- assertEquals("i1", p.get(0).toString());
- assertEquals("i2", p.get(1).toString());
+ assertEquals(0, p.getIndexedCount());
- assertEquals(2, p.getNamedKeys().size());
- assertEquals("b", p.get("a").toString());
- assertEquals("c", p.get("b").toString());
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -664,8 +656,8 @@ public class MountedMapperTest extends A
assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
assertEquals("path",
page.getPageParameters().get("param1").toString());
assertEquals("path",
page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
-
page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse("param3 should not be set",
page.getPageParameters().getNamedKeys().contains(
+ "param3"));
}
/** */
@@ -681,8 +673,8 @@ public class MountedMapperTest extends A
assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
assertEquals("p1",
page.getPageParameters().get("param1").toString());
assertEquals("p2",
page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
-
page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse("param3 should not be set",
page.getPageParameters().getNamedKeys().contains(
+ "param3"));
}
/** */
@@ -696,11 +688,11 @@ public class MountedMapperTest extends A
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 1);
- assertFalse("param1 should not be set",
-
page.getPageParameters().getNamedKeys().contains("param1"));
+ assertFalse("param1 should not be set",
page.getPageParameters().getNamedKeys().contains(
+ "param1"));
assertEquals("p2",
page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
-
page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse("param3 should not be set",
page.getPageParameters().getNamedKeys().contains(
+ "param3"));
}
/** */
@@ -714,8 +706,8 @@ public class MountedMapperTest extends A
assertEquals(1, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
- assertFalse("param1 should not be set",
-
page.getPageParameters().getNamedKeys().contains("param1"));
+ assertFalse("param1 should not be set",
page.getPageParameters().getNamedKeys().contains(
+ "param1"));
assertEquals("p2",
page.getPageParameters().get("param2").toString());
assertEquals("p3",
page.getPageParameters().get("param3").toString());
assertEquals("p4", page.getPageParameters().get(0).toString());
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java?rev=1179957&r1=1179956&r2=1179957&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/request/mapper/PackageMapperTest.java
Fri Oct 7 08:15:44 2011
@@ -162,13 +162,9 @@ public class PackageMapperTest extends A
checkPage(page, 15);
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
- assertEquals("i1", p.get(0).toString());
- assertEquals("i2", p.get(1).toString());
-
- assertEquals(2, p.getNamedKeys().size());
- assertEquals("b", p.get("a").toString());
- assertEquals("c", p.get("b").toString());
+ assertEquals(0, p.getIndexedCount());
+
+ assertEquals(0, p.getNamedKeys().size());
}
/**
@@ -209,13 +205,9 @@ public class PackageMapperTest extends A
assertEquals("foo:bar", h.getComponent().getPageRelativePath());
PageParameters p = page.getPageParameters();
- assertEquals(2, p.getIndexedCount());
- assertEquals("i1", p.get(0).toString());
- assertEquals("i2", p.get(1).toString());
-
- assertEquals(2, p.getNamedKeys().size());
- assertEquals("b", p.get("a").toString());
- assertEquals("c", p.get("b").toString());
+ assertEquals(0, p.getIndexedCount());
+
+ assertEquals(0, p.getNamedKeys().size());
}
/**
