Repository: wicket Updated Branches: refs/heads/request_listener_simplification b9ac6df85 -> a6ceb8de1
http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html index 43d794e..8405f4d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_6.html @@ -18,21 +18,21 @@ </head> <body><ul><li wicket:id="table"><span wicket:id="txt">seven</span></li><li wicket:id="table"><span wicket:id="txt">eight</span></li></ul> <span wicket:id="navigator"><wicket:panel> - <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-first" title="Go to first page"><<</a> - <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-prev" title="Go to previous page"><</a> + <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-first" title="Go to first page"><<</a> + <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-prev" title="Go to previous page"><</a> <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-0-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a> </span>, <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a> </span>, <span wicket:id="navigation" class="goto"> <a wicket:id="pageLink" disabled="disabled" title="Go to page 4"><span wicket:id="pageNumber">4</span></a> </span>, <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-3-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a> </span>, <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-navigation-4-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a> </span> - <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-next" title="Go to next page">></a> - <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.ILinkListener-navigator-last" title="Go to last page">>></a> + <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-next" title="Go to next page">></a> + <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-6.-navigator-last" title="Go to last page">>></a> </wicket:panel></span> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html index b00cb03..c7c162b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_7.html @@ -18,21 +18,21 @@ </head> <body><ul><li wicket:id="table"><span wicket:id="txt">five</span></li><li wicket:id="table"><span wicket:id="txt">six</span></li></ul> <span wicket:id="navigator"><wicket:panel> - <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-first" title="Go to first page"><<</a> - <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-prev" title="Go to previous page"><</a> + <a wicket:id="first" class="first" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-first" title="Go to first page"><<</a> + <a wicket:id="prev" rel="prev" class="prev" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-prev" title="Go to previous page"><</a> <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a> </span>, <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a> </span>, <span wicket:id="navigation" class="goto"> <a wicket:id="pageLink" disabled="disabled" title="Go to page 3"><span wicket:id="pageNumber">3</span></a> </span>, <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a> </span>, <span wicket:id="navigation" class="goto"> - <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a> + <a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a> </span> - <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-next" title="Go to next page">></a> - <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.ILinkListener-navigator-last" title="Go to last page">>></a> + <a wicket:id="next" rel="next" class="next" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-next" title="Go to next page">></a> + <a wicket:id="last" class="last" href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-7.-navigator-last" title="Go to last page">>></a> </wicket:panel></span> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html index 5791acd..d9cd315 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePageExpectedResult.html @@ -17,6 +17,6 @@ <title>Paged Table Page</title> </head> <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li></ul> -<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTablePage?1-2.ILinkListener-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a></li></ul> +<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="./org.apache.wicket.markup.html.list.PagedTablePage?1-2.-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><a wicket:id="pageLink" disabled="disabled" title="Go to page 2"><span wicket:id="pageNumber">2</span></a></li></ul> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html index 58873eb..d3eb182 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_7.html @@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.Inl <script type="text/javascript" > /*<![CDATA[*/ Wicket.Event.add(window, "domready", function(event) { -Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.IBehaviorListener.0-provider-ajaxRefresh","c":"ajaxRefresh1","e":"click"});; +Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_7?0-1.0-provider-ajaxRefresh","c":"ajaxRefresh1","e":"click"});; Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND); ;}); /*]]>*/ http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html index 0c259b3..90c3364 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPageExpectedResult_8.html @@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.panel.Inl <script type="text/javascript" > /*<![CDATA[*/ Wicket.Event.add(window, "domready", function(event) { -Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.IBehaviorListener.0-add","c":"add1","e":"click"});; +Wicket.Ajax.ajax({"u":"./org.apache.wicket.markup.html.panel.InlinePanelPage_8?0-1.0-add","c":"add1","e":"click"});; Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND); ;}); /*]]>*/ http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html index 2545175..f384cd4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotVisibleWebPageResult.html @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagNotVisibleWebPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagNotVisibleWebPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> </form> </body> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html index ff8b622..59dfed5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagVisibleWebPageResult.html @@ -1,6 +1,6 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagVisibleWebPage?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> +<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.markup.html.tags.InputTagVisibleWebPage?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div> <input wicket:id="input" type="text" value="" name="input"> </form> </body> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html index dc74ce6..c1c220d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult.html @@ -16,6 +16,6 @@ <title>Mock Page</title> </head> <body> -<a href="?wicket:interface=:0:actionLink::ILinkListener::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">0</span> times</a> +<a href="?wicket:interface=:0:actionLink::.::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">0</span> times</a> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html index a8c8df2..ef74779 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/MockPage_expectedResult2.html @@ -16,6 +16,6 @@ <title>Mock Page</title> </head> <body> -<a href="?wicket:interface=:0:actionLink::ILinkListener::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">1</span> times</a> +<a href="?wicket:interface=:0:actionLink::.::" wicket:id="actionLink">Action link clicked <span wicket:id="linkClickCount">1</span> times</a> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html index b4d82ff..da788e4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result.html @@ -4,7 +4,7 @@ </head> <body> first page<br/> - <a href="?wicket:interface=:0:link::ILinkListener::" wicket:id="link">link to second page</a> + <a href="?wicket:interface=:0:link::.::" wicket:id="link">link to second page</a> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html index cdd5091..ab3ab35 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/firstpage_result2.html @@ -4,7 +4,7 @@ </head> <body> first page<br/> - <a href="?wicket:interface=:2:link::ILinkListener::" wicket:id="link">link to second page</a> + <a href="?wicket:interface=:2:link::.::" wicket:id="link">link to second page</a> </body> </html> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html b/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html index cbadffa..77e54cc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/secondpage_result.html @@ -2,6 +2,6 @@ <body> second page<br/> - <a href="?wicket:interface=:1:link::ILinkListener::" wicket:id="link">link to first page</a> + <a href="?wicket:interface=:1:link::.::" wicket:id="link">link to first page</a> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java index 0a7ce91..431ed3a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java @@ -31,7 +31,7 @@ public class ComponentInfoTest extends Assert @Test public void test1() { - String s = "listener-component-path"; + String s = ".-component-path"; ComponentInfo info = ComponentInfo.parse(s); assertEquals("component:path", info.getComponentPath()); assertNull(info.getBehaviorId()); @@ -56,7 +56,7 @@ public class ComponentInfoTest extends Assert @Test public void test3() { - String s = "listener-"; + String s = ".-"; ComponentInfo info = ComponentInfo.parse(s); // empty component path is allowed - listener invoked on page assertEquals("", info.getComponentPath()); @@ -89,7 +89,7 @@ public class ComponentInfoTest extends Assert @Test public void test6() { - String s = "listener-compo~~nent-path"; + String s = ".-compo~~nent-path"; ComponentInfo info = ComponentInfo.parse(s); assertEquals("compo--nent:path", info.getComponentPath()); assertNull(info.getBehaviorId()); @@ -103,7 +103,7 @@ public class ComponentInfoTest extends Assert @Test public void test7() { - String s = "listener-co~mpo~~nent-path"; + String s = ".-co~mpo~~nent-path"; ComponentInfo info = ComponentInfo.parse(s); assertEquals("co-mpo--nent:path", info.getComponentPath()); assertNull(info.getBehaviorId()); @@ -117,7 +117,7 @@ public class ComponentInfoTest extends Assert @Test public void test8() { - String s = "listener.12-component-path"; + String s = ".12-component-path"; ComponentInfo info = ComponentInfo.parse(s); assertEquals("component:path", info.getComponentPath()); assertEquals((Object)12, info.getBehaviorId()); @@ -131,7 +131,7 @@ public class ComponentInfoTest extends Assert @Test public void test9() { - String s = "4.listener-a-b"; + String s = "4.-a-b"; ComponentInfo info = ComponentInfo.parse(s); assertEquals((Integer)4, info.getRenderCount()); @@ -144,7 +144,7 @@ public class ComponentInfoTest extends Assert @Test public void test10() { - String s = "4.listener.5-a-b"; + String s = "4.5-a-b"; ComponentInfo info = ComponentInfo.parse(s); assertEquals((Integer)4, info.getRenderCount()); assertEquals((Integer)5, info.getBehaviorId()); @@ -159,14 +159,13 @@ public class ComponentInfoTest extends Assert public void encodeDecode() { final Integer renderCount = 1; - final String listenerInterface = "ILinkListener"; final String componentPath = "-nav-container-:-nav:1:link"; final Integer behaviorId = null; ComponentInfo info = new ComponentInfo(renderCount, componentPath, behaviorId); final String encoded = info.toString(); - assertEquals("1.ILinkListener-~nav~container~-~nav-1-link", encoded); + assertEquals("1.-~nav~container~-~nav-1-link", encoded); ComponentInfo decoded = ComponentInfo.parse(encoded); assertEquals(renderCount, decoded.getRenderCount()); http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html index a1fedc7..83e7ae6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_indexed_mount_result.html @@ -1,5 +1,5 @@ <html> <body> -<a href="./testValue2?-1.ILinkListener-link" wicket:id="link">test</a> +<a href="./testValue2?-1.-link" wicket:id="link">test</a> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html index 5424ccb..01be322 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_mount_result.html @@ -1,5 +1,5 @@ <html> <body> -<a href="./stateless?-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a> +<a href="./stateless?-.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html index c641ea0..63b427ac 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPageWithParams_result.html @@ -1,5 +1,5 @@ <html> <body> -<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.ILinkListener-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a> +<a href="./org.apache.wicket.stateless.StatelessComponentPageWithParams?-1.-link&testParam1=testValue1&testParam2=testValue2" wicket:id="link">test</a> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html index 12adc15..ac5f821 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_mount_result.html @@ -1,5 +1,5 @@ <html> <body> -<a href="./stateless?-1.ILinkListener-link" wicket:id="link">test</a> +<a href="./stateless?-1.-link" wicket:id="link">test</a> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html index a94ff07..472458f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessComponentPage_result.html @@ -1,5 +1,5 @@ <html> <body> -<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.ILinkListener-link" wicket:id="link">test</a> +<a href="./org.apache.wicket.stateless.StatelessComponentPage?-1.-link" wicket:id="link">test</a> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html index f02f46a..6360d02 100644 --- a/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/stateless/StatelessPageWithForm_expected.html @@ -1,5 +1,5 @@ <html> <body> -<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?-1.IFormSubmitListener-form&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div></form> +<form wicket:id="form" id="form1" method="post" action="./org.apache.wicket.stateless.StatelessPageWithForm?-1.-form&first=foo&second=bar"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form1_hf_0" id="form1_hf_0" /></div></form> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html index 44bda6d..0a0d806 100644 --- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html +++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html @@ -105,8 +105,8 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND); </script> </head> <body> -<form wicket:id="localeForm" id="localeForm2" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IFormSubmitListener-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div> -<p><select wicket:id="localeSelect" onchange="document.getElementById('localeForm2_hf_0').value='./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IOnChangeListener-localeForm-localeSelect';document.getElementById('localeForm2').submit();" name="localeSelect"> +<form wicket:id="localeForm" id="localeForm2" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="localeForm2_hf_0" id="localeForm2_hf_0" /></div> +<p><select wicket:id="localeSelect" onchange="document.getElementById('localeForm2_hf_0').value='./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm-localeSelect';document.getElementById('localeForm2').submit();" name="localeSelect"> <option value="0">cinese (Cina) (Chinese (China))</option> <option value="1">cinese (Cina) (Chinese (China))</option> <option value="2">cinese (Cina) (Chinese (China))</option> @@ -127,10 +127,10 @@ Wicket.Event.publish(Wicket.Event.Topic.AJAX_HANDLERS_BOUND); <option value="17">italiano (Italia) (Italian (Italy))</option> <option value="18">tedesco (German)</option> <option value="19">tedesco (Germania) (German (Germany))</option> -</select> [<a href="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.ILinkListener-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p> +</select> [<a href="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-localeForm-localeUSLink" wicket:id="localeUSLink">set to english</a>]</p> </form> <p> -<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.IFormSubmitListener-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx/xx/xx" name="dateTextField" id="dateTextField1"/> +<form wicket:id="form" id="form3" method="post" action="./org.apache.wicket.extensions.yui.calendar.DatesPage1?0-1.-form"><div style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input type="hidden" name="form3_hf_0" id="form3_hf_0" /></div><input type="text" wicket:id="dateTextField" value="xx/xx/xx" name="dateTextField" id="dateTextField1"/> <span class="yui-skin-sam"> <span style="display:none;position:absolute;z-index: 99999;" id="dateTextField1Dp"></span><img style="cursor: pointer; border: none;" id="dateTextField1Icon" src="../resource/org.apache.wicket.extensions.yui.calendar.DatePicker/icon1.gif" alt="" title=""/></span> <input type="submit" value="submit" /></form> </p> <p> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html index 128260b..704c4ec 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/spring/annot/web/AnnotPage.html @@ -19,7 +19,7 @@ This approach allows users to quickly and easily inject any component with bean proxies. Components simply have to annotate any fields they wish injected with @SpringBean annotation. Interesting classes:<br/> <ul> - <li>SpringComponentInjector - an implementation of IComponentInstantiationListener that performs the injection</li> + <li>SpringComponentInjector - an implementation of . that performs the injection</li> <li>AnnotPage - contains an annotated field whose value will be initialized with a proxy by the injector</li> </ul> <table wicket:id="contacts" cellspacing="0" cellpadding="2" class="grid"></table> http://git-wip-us.apache.org/repos/asf/wicket/blob/a6ceb8de/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html ---------------------------------------------------------------------- diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html index 2c7d72d..a1a8875 100644 --- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html +++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/package.html @@ -26,7 +26,7 @@ This package contains all the classes to make your wicket components and other p <p> To setup automatic injection of wicket components in your application subclass init() method call: <code> -addComponentInstantiationListener(new SpringComponentInjector(this)); +addComponent.(new SpringComponentInjector(this)); </code> To inject any pojo call <code>InjectorHolder.getInjector().inject(this)</code> in the pojo's constructor. </p>
