http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
index 236b19b..7919591 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationPage_ExpectedResult_1.html
@@ -3,6 +3,6 @@
 <title>Paged Table Page</title>
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">one</span></li><li 
wicket:id="table"><span wicket:id="txt">two</span></li></ul>
-<a wicket:id="prev" disabled="disabled">Prev</a><a wicket:id="nextNext" 
href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev" disabled="disabled">Prev</a><a wicket:id="nextNext" 
href="./org.apache.wicket.markup.html.list.IncrementalTableNavigationPage?0-1.-nextNext">NextNext</a>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
index b99055a..f12d478 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_1.html
@@ -23,14 +23,14 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" 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.PagedTableNavigatorPage?0-1.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.PagedTableNavigatorPage?0-1.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-navigation-2-pageLink"
 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.PagedTableNavigatorPage?0-1.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.PagedTableNavigatorPage?0-1.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-1.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
index f1358e0..7e99d6b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_2.html
@@ -18,19 +18,19 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li 
wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.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.PagedTableNavigatorPage?0-2.-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" disabled="disabled" 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.PagedTableNavigatorPage?0-2.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-navigation-2-pageLink"
 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.PagedTableNavigatorPage?0-2.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.PagedTableNavigatorPage?0-2.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-2.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
index 76ac974..ce5ecc1 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_3.html
@@ -23,14 +23,14 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" 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.PagedTableNavigatorPage?0-3.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.PagedTableNavigatorPage?0-3.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-navigation-2-pageLink"
 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.PagedTableNavigatorPage?0-3.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.PagedTableNavigatorPage?0-3.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-3.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
index f5e83dd..ef21d53 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_4.html
@@ -18,14 +18,14 @@
 </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.PagedTableNavigatorPage?0-4.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.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.PagedTableNavigatorPage?0-4.-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.PagedTableNavigatorPage?0-4.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.PagedTableNavigatorPage?0-4.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-4.-navigator-navigation-2-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>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
index 5586082..f923671 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_5.html
@@ -23,14 +23,14 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" 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.PagedTableNavigatorPage?0-5.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.PagedTableNavigatorPage?0-5.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-navigation-2-pageLink"
 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.PagedTableNavigatorPage?0-5.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.PagedTableNavigatorPage?0-5.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-5.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
index 6f710d2..4dd54c4 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_6.html
@@ -18,19 +18,19 @@
 </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.PagedTableNavigatorPage?0-6.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.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.PagedTableNavigatorPage?0-6.-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.PagedTableNavigatorPage?0-6.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.PagedTableNavigatorPage?0-6.-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.PagedTableNavigatorPage?0-6.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.PagedTableNavigatorPage?0-6.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-6.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
index 2496b88..67c5eda 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_7.html
@@ -18,19 +18,19 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li 
wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?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.PagedTableNavigatorPage?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" disabled="disabled" 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.PagedTableNavigatorPage?0-7.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-navigation-2-pageLink"
 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.PagedTableNavigatorPage?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.PagedTableNavigatorPage?0-7.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-7.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
index c73cd11..16a0713 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorExpectedResult_8.html
@@ -23,18 +23,18 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" 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.PagedTableNavigatorPage?0-8.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.PagedTableNavigatorPage?0-8.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-2-pageLink"
 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.PagedTableNavigatorPage?0-8.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.PagedTableNavigatorPage?0-8.-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.PagedTableNavigatorPage?0-8.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.PagedTableNavigatorPage?0-8.-navigator-navigation-4-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.PagedTableNavigatorPage?0-8.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-navigation-5-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.PagedTableNavigatorPage?0-8.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorPage?0-8.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
index 759e34e..ef2d624 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_1.html
@@ -23,20 +23,20 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
1"><span wicket:id="pageNumber">1-2</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-1.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
index 18bc27f..fe5f497 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_2.html
@@ -18,25 +18,25 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li 
wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
        </span><span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
2"><span wicket:id="pageNumber">3-4</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-2.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
index 54baebd..9b9e17e 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_3.html
@@ -23,20 +23,20 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
1"><span wicket:id="pageNumber">1-2</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-3.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
index 31c674f..c134259 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_4.html
@@ -18,20 +18,20 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li 
wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-4.-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
        </span><span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
7"><span wicket:id="pageNumber">13-14</span></a>
        </span>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
index e3cbb22..17eb825 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_5.html
@@ -23,20 +23,20 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
1"><span wicket:id="pageNumber">1-2</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-5.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
index fc206db..e34cf49 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_6.html
@@ -18,25 +18,25 @@
 </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.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-2-pageLink"
 title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
        </span><span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
4"><span wicket:id="pageNumber">7-8</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-6.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
index bf59680..3002d40 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_7.html
@@ -18,25 +18,25 @@
 </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.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-0-pageLink"
 title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-1-pageLink"
 title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
        </span><span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
3"><span wicket:id="pageNumber">5-6</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-3-pageLink"
 title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-4-pageLink"
 title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-5-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
        </span><span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
+               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-navigation-6-pageLink"
 title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
        </span>
-       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next"  
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithLabelProviderPage?0-7.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
index 88bdb0e..bc32e22 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderExpectedResult_8.html
@@ -22,15 +22,15 @@
     <span wicket:id="navigation">
                  <a wicket:id="pageLink"><span 
wicket:id="pageNumber">1</span></a>
     </span>, <span wicket:id="navigation">
-                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:1:pageLink&amp;interface=ILinkListener"
 wicket:id="pageLink"><span wicket:id="pageNumber">2</span></a>
+                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:1:pageLink&amp;interface=."
 wicket:id="pageLink"><span wicket:id="pageNumber">2</span></a>
     </span>, <span wicket:id="navigation">
-                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:2:pageLink&amp;interface=ILinkListener"
 wicket:id="pageLink"><span wicket:id="pageNumber">3</span></a>
+                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:2:pageLink&amp;interface=."
 wicket:id="pageLink"><span wicket:id="pageNumber">3</span></a>
     </span>, <span wicket:id="navigation">
-                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:3:pageLink&amp;interface=ILinkListener"
 wicket:id="pageLink"><span wicket:id="pageNumber">4</span></a>
+                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:3:pageLink&amp;interface=."
 wicket:id="pageLink"><span wicket:id="pageNumber">4</span></a>
     </span>, <span wicket:id="navigation">
-                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:4:pageLink&amp;interface=ILinkListener"
 wicket:id="pageLink"><span wicket:id="pageNumber">5</span></a>
+                 <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:navigation:4:pageLink&amp;interface=."
 wicket:id="pageLink"><span wicket:id="pageNumber">5</span></a>
     </span>
-    <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:next&amp;interface=ILinkListener"
 wicket:id="next">&gt;</a>&nbsp;<a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:last&amp;interface=ILinkListener"
 wicket:id="last">&gt;&gt;</a>
+    <a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:next&amp;interface=."
 wicket:id="next">&gt;</a>&nbsp;<a 
href="/MockWebApplication/MockWebApplication?path=0:navigator:last&amp;interface=."
 wicket:id="last">&gt;&gt;</a>
   </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
index fdb42c2..0aab7be 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_1.html
@@ -23,16 +23,16 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" 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-1.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-1.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-navigation-2-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-1.-navigator-navigation-2-pageLink"
 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-1.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-1.-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-1.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-1.-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-1.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-1.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
index ea119eb..ef8fc2b 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_2.html
@@ -18,21 +18,21 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">three</span></li><li 
wicket:id="table"><span wicket:id="txt">four</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.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-2.-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" disabled="disabled" 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-2.ILinkListener-navigator-navigation-2-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-2.-navigator-navigation-2-pageLink"
 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-2.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-2.-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-2.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-2.-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-2.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-2.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
index 03da8af..be86a2d 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_3.html
@@ -23,16 +23,16 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" 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-3.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-3.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-navigation-2-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-3.-navigator-navigation-2-pageLink"
 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-3.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-3.-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-3.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-3.-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-3.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-3.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
index 4b819c2..da8b43a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_4.html
@@ -18,16 +18,16 @@
 </head>
 <body><ul><li wicket:id="table"><span wicket:id="txt">thirteen</span></li><li 
wicket:id="table"><span wicket:id="txt">fourteen</span></li></ul>
 <span wicket:id="navigator"><wicket:panel>
-       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-first"
 title="Go to first page">&lt;&lt;</a>
-       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-prev"
 title="Go to previous page">&lt;</a>
+       <a wicket:id="first" class="first" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-first"
 title="Go to first page">&lt;&lt;</a>
+       <a wicket:id="prev" rel="prev" class="prev" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.-navigator-prev"
 title="Go to previous page">&lt;</a>
        <span wicket:id="navigation" class="goto">
-               <a wicket:id="pageLink" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-4.ILinkListener-navigator-navigation-0-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-4.-navigator-navigation-0-pageLink"
 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-4.ILinkListener-navigator-navigation-1-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-4.-navigator-navigation-1-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-4.ILinkListener-navigator-navigation-2-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-4.-navigator-navigation-2-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-4.ILinkListener-navigator-navigation-3-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-4.-navigator-navigation-3-pageLink"
 title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
        </span>, <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" title="Go to page 
7"><span wicket:id="pageNumber">7</span></a>
        </span>

http://git-wip-us.apache.org/repos/asf/wicket/blob/c353fc84/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
----------------------------------------------------------------------
diff --git 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
index 7ea8567..b54a64a 100644
--- 
a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
+++ 
b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginExpectedResult_5.html
@@ -23,16 +23,16 @@
        <span wicket:id="navigation" class="goto">
                <a wicket:id="pageLink" disabled="disabled" 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-5.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-5.-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" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-navigation-2-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-5.-navigator-navigation-2-pageLink"
 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-5.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-5.-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-5.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-5.-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-5.ILinkListener-navigator-next"
 title="Go to next page">&gt;</a>
-       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.ILinkListener-navigator-last"
 title="Go to last page">&gt;&gt;</a>
+       <a wicket:id="next" rel="next" class="next" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-next"
 title="Go to next page">&gt;</a>
+       <a wicket:id="last" class="last" 
href="./org.apache.wicket.markup.html.list.PagedTableNavigatorWithMarginPage?0-5.-navigator-last"
 title="Go to last page">&gt;&gt;</a>
 </wicket:panel></span>
 </body>
 </html>

Reply via email to