You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2013/06/13 21:13:19 UTC
[1/5] git commit: Revert "WICKET-4904 Use a behavior that modifies
AbstractLink's markup when disabled"
Updated Branches:
refs/heads/master ff795be43 -> d8789519d
Revert "WICKET-4904 Use a behavior that modifies AbstractLink's markup when disabled"
This reverts commit ff795be431da6526342d0afe17d099dadacd8a62.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3f9a2403
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3f9a2403
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3f9a2403
Branch: refs/heads/master
Commit: 3f9a240392f521d440149550a64bbc3429f50434
Parents: ff795be
Author: svenmeier <sv...@meiers.net>
Authored: Thu Jun 13 15:28:34 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Jun 13 15:28:34 2013 +0200
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/link/AbstractLinkTest.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3f9a2403/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
index d972e36..a947d10 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
@@ -122,7 +122,9 @@ public class AbstractLinkTest extends WicketTestCase
mockPageWithLink.add(link);
tester.startPage(mockPageWithLink);
- tester.assertContains("<body>\n<a href=\"#\" wicket:id=\"link\" id=\"link\" disabled=\"disabled\">Link</a>\n</body>");
+ TagTester tagTester = tester.getTagById("link");
+ String markup = tagTester.getMarkup();
+ Assert.assertEquals("<a href=\"#\" wicket:id=\"link\" id=\"link\" disabled=\"disabled\">Link</a>", markup);
}
}
[3/5] git commit: Revert "WICKET-4904 Use a behavior that modifies
AbstractLink's markup when disabled"
Posted by sv...@apache.org.
Revert "WICKET-4904 Use a behavior that modifies AbstractLink's markup when disabled"
This reverts commit ec4d40539354d9332aef886458f276df790cc500.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d02b4490
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d02b4490
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d02b4490
Branch: refs/heads/master
Commit: d02b44902c94673d57f275e442c41a932e9ed9e7
Parents: d9a9656
Author: svenmeier <sv...@meiers.net>
Authored: Thu Jun 13 15:29:27 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Jun 13 15:29:27 2013 +0200
----------------------------------------------------------------------
.../wicket/ajax/markup/html/AjaxLink.java | 5 +
.../ajax/markup/html/form/AjaxSubmitLink.java | 4 +
.../wicket/markup/html/form/SubmitLink.java | 15 ++-
.../wicket/markup/html/link/AbstractLink.java | 51 +++++++---
.../markup/html/link/DisableLinkBehavior.java | 97 --------------------
.../wicket/markup/html/link/ExternalLink.java | 6 +-
.../apache/wicket/markup/html/link/Link.java | 96 ++++++++++---------
.../AjaxHeaderContributionPage2_expected.html | 2 +-
.../AjaxHeaderContributionPage_expected.html | 2 +-
.../ajax/DomReadyOrderPage_ajax_expected.html | 4 +-
.../wicket/ajax/DomReadyOrderPage_expected.html | 2 +-
.../ajaxLink/AjaxLinkPageExpectedResult.html | 2 +-
.../ajax/markup/html/ajaxLink/AjaxLinkTest.java | 23 ++++-
.../AjaxLinkWithBorderPageExpectedResult.html | 2 +-
.../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +-
.../wicket/markup/MarkupInheritanceTest.java | 4 +
.../html/autolink/MyPageExpectedResult.html | 2 +-
.../html/autolink/PageAExpectedResult.html | 4 +-
.../html/autolink/PageBExpectedResult.html | 2 +-
.../html/basic/SimplePageExpectedResult_13.html | 2 +-
.../HideableBorderPage_ExpectedResult.html | 2 +-
...talTableNavigationPage_ExpectedResult_1.html | 2 +-
.../PagedTableNavigatorExpectedResult_1.html | 6 +-
.../PagedTableNavigatorExpectedResult_2.html | 2 +-
.../PagedTableNavigatorExpectedResult_3.html | 6 +-
.../PagedTableNavigatorExpectedResult_4.html | 6 +-
.../PagedTableNavigatorExpectedResult_5.html | 6 +-
.../PagedTableNavigatorExpectedResult_6.html | 2 +-
.../PagedTableNavigatorExpectedResult_7.html | 2 +-
.../PagedTableNavigatorExpectedResult_8.html | 6 +-
...igatorWithLabelProviderExpectedResult_1.html | 6 +-
...igatorWithLabelProviderExpectedResult_2.html | 2 +-
...igatorWithLabelProviderExpectedResult_3.html | 6 +-
...igatorWithLabelProviderExpectedResult_4.html | 6 +-
...igatorWithLabelProviderExpectedResult_5.html | 6 +-
...igatorWithLabelProviderExpectedResult_6.html | 2 +-
...igatorWithLabelProviderExpectedResult_7.html | 2 +-
...ableNavigatorWithMarginExpectedResult_1.html | 6 +-
...ableNavigatorWithMarginExpectedResult_2.html | 2 +-
...ableNavigatorWithMarginExpectedResult_3.html | 6 +-
...ableNavigatorWithMarginExpectedResult_4.html | 6 +-
...ableNavigatorWithMarginExpectedResult_5.html | 6 +-
...ableNavigatorWithMarginExpectedResult_6.html | 2 +-
...ableNavigatorWithMarginExpectedResult_7.html | 2 +-
.../wicket/markup/html/list/PagedTablePage.java | 2 +-
.../html/list/PagedTablePageExpectedResult.html | 2 +-
.../wicket/markup/html/list/PagedTableTest.java | 4 +-
.../panel/InlinePanelPageExpectedResult_7.html | 2 +-
.../panel/InlinePanelPageExpectedResult_8.html | 2 +-
.../ajax/markup/html/AjaxEditableTest.java | 8 +-
50 files changed, 214 insertions(+), 233 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
index 6dee00f..f0970fd 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
@@ -111,6 +111,11 @@ public abstract class AjaxLink<T> extends AbstractLink implements IAjaxLink, IGe
tag.put("href", "#");
}
}
+ else
+ {
+ disableLink(tag);
+ }
+
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
index dd6890b..0a38fe9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
@@ -156,6 +156,10 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
tag.put("href", "#");
}
}
+ else
+ {
+ disableLink(tag);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
index 6f1cfed..fb0c5da 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
@@ -155,12 +155,19 @@ public class SubmitLink extends AbstractSubmitLink
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
-
- if (tag.getName().equalsIgnoreCase("a"))
+ // If we're disabled
+ if (!isLinkEnabled())
+ {
+ disableLink(tag);
+ }
+ else
{
- tag.put("href", "#");
+ if (tag.getName().equalsIgnoreCase("a"))
+ {
+ tag.put("href", "#");
+ }
+ tag.put("onclick", getTriggerJavaScript());
}
- tag.put("onclick", getTriggerJavaScript());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
index 12e02df..86c2c89 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
@@ -17,7 +17,6 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.Application;
-import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -148,7 +147,7 @@ public abstract class AbstractLink extends WebMarkupContainer
*
* @return whether the link should be rendered as enabled
*/
- public boolean isLinkEnabled()
+ protected boolean isLinkEnabled()
{
return isEnabledInHierarchy();
}
@@ -165,6 +164,12 @@ public abstract class AbstractLink extends WebMarkupContainer
@Override
public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
+ // Draw anything before the body?
+ if (!isLinkEnabled() && getBeforeDisabledLink() != null)
+ {
+ getResponse().write(getBeforeDisabledLink());
+ }
+
// Get a copy of the body model from the getBody() method. This method could be overridden.
IModel<?> tmpBodyModel = getBody();
@@ -178,23 +183,41 @@ public abstract class AbstractLink extends WebMarkupContainer
// Render the body of the link
super.onComponentTagBody(markupStream, openTag);
}
- }
-
- @Override
- protected void onInitialize()
- {
- super.onInitialize();
-
- add(getDisablingBehavior());
+ // Draw anything after the body?
+ if (!isLinkEnabled() && getAfterDisabledLink() != null)
+ {
+ getResponse().write(getAfterDisabledLink());
+ }
}
/**
- * @return A behavior that will modify this link's markup
- * if it is disabled.
+ * Alters the tag so that the link renders as disabled.
+ *
+ * This method is meant to be called from {@link #onComponentTag(ComponentTag)} method of the
+ * derived class.
+ *
+ * @param tag
*/
- protected Behavior getDisablingBehavior()
+ protected void disableLink(final ComponentTag tag)
{
- return new DisableLinkBehavior();
+ // if the tag is an anchor proper
+ if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") ||
+ tag.getName().equalsIgnoreCase("area"))
+ {
+ // Change anchor link to span tag
+ tag.setName("span");
+
+ // Remove any href from the old link
+ tag.remove("href");
+
+ tag.remove("onclick");
+ }
+ // if the tag is a button or input
+ else if ("button".equalsIgnoreCase(tag.getName()) ||
+ "input".equalsIgnoreCase(tag.getName()))
+ {
+ tag.put("disabled", "disabled");
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisableLinkBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisableLinkBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisableLinkBehavior.java
deleted file mode 100644
index 11114f1..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisableLinkBehavior.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.wicket.markup.html.link;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.ComponentTag;
-
-/**
- * A behavior that uses AbstractLink#getBeforeDisabledLink and AbstractLink#getAfterDisabledLink
- * to make Link disabled in the markup.
- *
- * @see org.apache.wicket.markup.html.link.AbstractLink#getDisablingBehavior()
- */
-public class DisableLinkBehavior extends Behavior
-{
- @Override
- public void beforeRender(Component component)
- {
- super.beforeRender(component);
-
- if (component instanceof AbstractLink)
- {
- AbstractLink link = (AbstractLink) component;
-
- // Draw anything before the body?
- if (!link.isLinkEnabled() && link.getBeforeDisabledLink() != null)
- {
- link.getResponse().write(link.getBeforeDisabledLink());
- }
- }
- }
-
- @Override
- public void onComponentTag(Component component, ComponentTag tag)
- {
- super.onComponentTag(component, tag);
-
- if (component instanceof AbstractLink)
- {
- AbstractLink link = (AbstractLink) component;
-
- if (link.isLinkEnabled() == false)
- {
- // if the tag is an anchor proper
- if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") ||
- tag.getName().equalsIgnoreCase("area"))
- {
- // Change anchor link to span tag
- tag.setName("span");
-
- // Remove any href from the old link
- tag.remove("href");
-
- tag.remove("onclick");
- }
- // if the tag is a button or input
- else if ("button".equalsIgnoreCase(tag.getName()) ||
- "input".equalsIgnoreCase(tag.getName()))
- {
- tag.put("disabled", "disabled");
- }
- }
- }
- }
-
- @Override
- public void afterRender(Component component)
- {
- super.afterRender(component);
-
- if (component instanceof AbstractLink)
- {
- AbstractLink link = (AbstractLink) component;
-
- // Draw anything after the body?
- if (!link.isLinkEnabled() && link.getAfterDisabledLink() != null)
- {
- link.getResponse().write(link.getAfterDisabledLink());
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
index 44574f5..6e733c3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
@@ -153,7 +153,11 @@ public class ExternalLink extends AbstractLink
{
super.onComponentTag(tag);
- if (isLinkEnabled() && getDefaultModel() != null)
+ if (isLinkEnabled() == false)
+ {
+ disableLink(tag);
+ }
+ else if (getDefaultModel() != null)
{
Object hrefValue = getDefaultModelObject();
if (hrefValue != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
index b1dbb55..0758782 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
@@ -352,61 +352,69 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe
// Default handling for tag
super.onComponentTag(tag);
- // Set href to link to this link's linkClicked method
- CharSequence url = getURL();
-
- // append any anchor
- url = appendAnchor(tag, url);
-
- // if the tag is an anchor proper
- if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") ||
- tag.getName().equalsIgnoreCase("area"))
+ // If we're disabled
+ if (!isLinkEnabled())
{
- // generate the href attribute
- tag.put("href", url);
-
- // Add any popup script
- if (popupSettings != null)
- {
- // NOTE: don't encode to HTML as that is not valid
- // JavaScript
- tag.put("onclick", popupSettings.getPopupJavaScript());
- }
- }
- else if (tag.getName().equalsIgnoreCase("script") ||
- tag.getName().equalsIgnoreCase("style"))
- {
- tag.put("src", url);
+ disableLink(tag);
}
else
{
- // generate a popup script by asking popup settings for one
- if (popupSettings != null)
+ // Set href to link to this link's linkClicked method
+ CharSequence url = getURL();
+
+ // append any anchor
+ url = appendAnchor(tag, url);
+
+ // if the tag is an anchor proper
+ if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") ||
+ tag.getName().equalsIgnoreCase("area"))
+ {
+ // generate the href attribute
+ tag.put("href", url);
+
+ // Add any popup script
+ if (popupSettings != null)
+ {
+ // NOTE: don't encode to HTML as that is not valid
+ // JavaScript
+ tag.put("onclick", popupSettings.getPopupJavaScript());
+ }
+ }
+ else if (tag.getName().equalsIgnoreCase("script") ||
+ tag.getName().equalsIgnoreCase("style"))
{
- popupSettings.setTarget("'" + url + "'");
- String popupScript = popupSettings.getPopupJavaScript();
- tag.put("onclick", popupScript);
+ tag.put("src", url);
}
else
{
- // or generate an onclick JS handler directly
- // in firefox when the element is quickly clicked 3 times a second request is
- // generated during page load. This check ensures that the click is ignored
- tag.put(
- "onclick",
- "var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; " +
- "if (win == window) { window.location.href='" +
- url +
- "'; } ;return false");
+ // generate a popup script by asking popup settings for one
+ if (popupSettings != null)
+ {
+ popupSettings.setTarget("'" + url + "'");
+ String popupScript = popupSettings.getPopupJavaScript();
+ tag.put("onclick", popupScript);
+ }
+ else
+ {
+ // or generate an onclick JS handler directly
+ // in firefox when the element is quickly clicked 3 times a second request is
+ // generated during page load. This check ensures that the click is ignored
+ tag.put(
+ "onclick",
+ "var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; " +
+ "if (win == window) { window.location.href='" +
+ url +
+ "'; } ;return false");
+ }
}
- }
- // If the subclass specified javascript, use that
- final CharSequence onClickJavaScript = getOnClickScript(url);
- if (onClickJavaScript != null)
- {
- tag.put("onclick", onClickJavaScript);
+ // If the subclass specified javascript, use that
+ final CharSequence onClickJavaScript = getOnClickScript(url);
+ if (onClickJavaScript != null)
+ {
+ tag.put("onclick", onClickJavaScript);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
index 8a093c4..894702f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage2_expected.html
@@ -24,7 +24,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContri
Wicket.Event.add(window, "domready", function(event) {
domReady();;
domReadyB();;
-Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.1-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
index 21bf0e5..db50c86 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionPage_expected.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.AjaxHeaderContri
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
domReady();;
-Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.1-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.0-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
index 337bd28..2e94ea0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_ajax_expected.html
@@ -9,7 +9,7 @@ Wicket.Ajax.DebugWindow.enabled=true;
</script>
<script type="text/javascript" id="wicket-ajax-base-url">
/*<![CDATA[*/
-Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.1-test";
+Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.0-test";
/*]^]^>*/
</script>
-</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"pd":true,"u":"./page?0-1.IBehaviorListener.1-test","e":"click","c":"test1"});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
+</head>]]></header-contribution><evaluate><![CDATA[(function(){Wicket.Ajax.ajax({"pd":true,"u":"./page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});})();(function(){test1();})();(function(){test2();})();]]></evaluate></ajax-response>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
index bad07c0..d4733e7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage_expected.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.DomReadyOrderPag
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.1-test","e":"click","c":"test1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.0-test","e":"click","c":"test1"});;
test1();;
test2();;
;});
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
index 6a830c1..583dab3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
index 951cbb8..e76f875 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java
@@ -21,6 +21,7 @@ import org.apache.wicket.Page;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.util.tester.TagTester;
+import org.junit.Ignore;
import org.junit.Test;
@@ -54,12 +55,28 @@ public class AjaxLinkTest extends WicketTestCase
tester.assertRenderedPage(AjaxLinkPageToNormalPage.class);
Page page = tester.getLastRenderedPage();
Component ajaxLink = page.get("ajaxLink");
- AbstractAjaxBehavior behavior = ajaxLink.getBehaviors(AbstractAjaxBehavior.class).get(0);
+ AbstractAjaxBehavior behavior = (AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
tester.executeBehavior(behavior);
tester.assertRenderedPage(NormalPage.class);
}
/**
+ * Test that the onclick on ajax link has "return !wcall;" at the end. This ensures that
+ * execution is not turned over to the href attribute, which would then append # to the url.
+ */
+ @Test
+ @Ignore
+ // TODO Wicket.next - re-enable
+ public void javaScriptEndsWithReturn()
+ {
+ tester.startPage(AjaxLinkPage.class);
+
+ TagTester ajaxLink = tester.getTagByWicketId("ajaxLink");
+
+ assertTrue(ajaxLink.getAttributeEndsWith("onclick", "return !wcall;"));
+ }
+
+ /**
*
* @throws Exception
*/
@@ -70,7 +87,7 @@ public class AjaxLinkTest extends WicketTestCase
Page page = tester.getLastRenderedPage();
Component ajaxLink = page.get("pageLayout:pageLayout_body:ajaxLink");
- AbstractAjaxBehavior behavior = ajaxLink.getBehaviors(AbstractAjaxBehavior.class).get(0);
+ AbstractAjaxBehavior behavior = (AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
executeBehavior(behavior, "AjaxPage2-1_ExpectedResult.html");
}
@@ -96,7 +113,7 @@ public class AjaxLinkTest extends WicketTestCase
Page page = tester.getLastRenderedPage();
Component ajaxLink = page.get("border:border_body:ajaxLink");
- AbstractAjaxBehavior behavior = ajaxLink.getBehaviors(AbstractAjaxBehavior.class).get(0);
+ AbstractAjaxBehavior behavior = (AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
executeBehavior(behavior, "AjaxLinkWithBorderPage-1ExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
index 9e817c5..68e0e20 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkWithBorderPageExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-border-border_body-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-border-border_body-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
index 57fb101..2ae4ac2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxPage2_ExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.ajax.markup.html.ajax
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-pageLayout-pageLayout_body-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-pageLayout-pageLayout_body-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
index 1e89274..da82cff 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java
@@ -20,12 +20,16 @@ import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*/
public class MarkupInheritanceTest extends WicketTestCase
{
+ private static final Logger log = LoggerFactory.getLogger(MarkupInheritanceTest.class);
+
/**
* TEST FOR WICKET-1507
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
index de59cf0..97c05cd 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
@@ -2,7 +2,7 @@
<html>
<body>
<wicket:link>
- <em><span>My Page</span></em>
+ <span><em>My Page</em></span>
<a href="./org.apache.wicket.markup.html.autolink.PageA">Page A</a>
<a href="./org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
</wicket:link>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
index 8b901e0..056b1ad 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
@@ -3,13 +3,13 @@
<body>
<wicket:link>
<a href="./org.apache.wicket.markup.html.autolink.MyPage">My Page</a>
- <em><span>Page A</span></em>
+ <span><em>Page A</em></span>
<a href="./org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
</wicket:link>
START<br>
<wicket:child><wicket:extend>
<wicket:link>
- <em><span>Page A</span></em>
+ <span><em>Page A</em></span>
</wicket:link>
Page A
</wicket:extend></wicket:child>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
index ff54390..24ab7da 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
@@ -2,7 +2,7 @@
<html>
<body>
<wicket:link>
- <em><span>Page B</span></em>
+ <span><em>Page B</em></span>
</wicket:link>
START<br>
<wicket:child><wicket:extend>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
index 141f3bc..f99e524 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_13.html
@@ -20,7 +20,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.basic.Sim
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.2-html","e":"click","c":"html1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-html","e":"click","c":"html1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
index 14029b2..fdb0817 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/HideableBorderPage_ExpectedResult.html
@@ -16,7 +16,7 @@ Wicket.Ajax.baseUrl="wicket/bookmarkable/org.apache.wicket.markup.html.border.Hi
<script type="text/javascript" >
/*<![CDATA[*/
Wicket.Event.add(window, "domready", function(event) {
-Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-hideable-hideLink","e":"click","c":"hideLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-hideable-hideLink","e":"click","c":"hideLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 956e879..2005ebe 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>
-<em><span wicket:id="prev">Prev</span></em><a wicket:id="nextNext" href="../page?0-1.ILinkListener-nextNext">NextNext</a>
+<span wicket:id="prev"><em>Prev</em></span><a wicket:id="nextNext" href="../page?0-1.ILinkListener-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 82a9222..6b2d50f 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 aaa7aec..f14b6f8 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 f22f175..bfdafd6 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 64cc566..5bf540d 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
@@ -27,10 +27,10 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span>
</span>
- <em><span wicket:id="next" class="next" title="Go to next page">></span></em>
- <em><span wicket:id="last" class="last" title="Go to last page">>></span></em>
+ <span wicket:id="next" class="next" title="Go to next page"><em>></em></span>
+ <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 b199061..7c3ca69 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 990448a..15e9544 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
@@ -25,7 +25,7 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">3</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 89c8fa6..d59bc46 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 d62b4c9..7dd02be 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-8.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 aff4290..dcc15d8 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 19da0b3..542d92c 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">3-4</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 c0b755f..8806fbf 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 35ed222..5026117 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
@@ -33,10 +33,10 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">13-14</span></em></span>
</span>
- <em><span wicket:id="next" class="next" title="Go to next page">></span></em>
- <em><span wicket:id="last" class="last" title="Go to last page">>></span></em>
+ <span wicket:id="next" class="next" title="Go to next page"><em>></em></span>
+ <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 5246d88..f726765 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 5920da8..7380a8c 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
@@ -27,7 +27,7 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">7-8</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 cbb154b..075d95b 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
@@ -25,7 +25,7 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">5-6</span></em></span>
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 6f406a7..739599c 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 6bf77c3..242d716 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 e743b29..efbf626 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 8bce927..49be322 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
@@ -29,10 +29,10 @@
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 7"><span wicket:id="pageNumber">7</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">7</span></em></span>
</span>
- <em><span wicket:id="next" class="next" title="Go to next page">></span></em>
- <em><span wicket:id="last" class="last" title="Go to last page">>></span></em>
+ <span wicket:id="next" class="next" title="Go to next page"><em>></em></span>
+ <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 2e6989c..6ae349d 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <em><span wicket:id="first" class="first" title="Go to first page"><<</span></em>
- <em><span wicket:id="prev" class="prev" title="Go to previous page"><</span></em>
+ <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
+ <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
<span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 437ace9..c3e01a3 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
@@ -25,7 +25,7 @@
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 e2325b5..38a4bb6 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
@@ -25,7 +25,7 @@
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <em><span wicket:id="pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></span></em>
+ <span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">3</span></em></span>
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
index f3a9c4f..4875048 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTablePage.java
@@ -37,7 +37,7 @@ public class PagedTablePage extends WebPage
public PagedTablePage()
{
super();
- List<String> list = new ArrayList<>();
+ List<String> list = new ArrayList<String>();
list.add("one");
list.add("two");
list.add("three");
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 230ba4a..63766e5 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="../page?1-2.ILinkListener-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em></li></ul>
+<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="../page?1-2.ILinkListener-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span></li></ul>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
index 5df58a0..1a91392 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
@@ -80,8 +80,8 @@ public class PagedTableTest extends WicketTestCase
body.addExpectedChild(ulTable);
Tag ulNav = new Tag("ul");
- ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("em").addExpectedChild(new Tag(
- "span").addExpectedChild(new Tag("span").addExpectedChild(new TextContent("1"))))));
+ ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span").addExpectedChild(new Tag(
+ "em").addExpectedChild(new Tag("span").addExpectedChild(new TextContent("1"))))));
ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("a").addExpectedChild(new Tag(
"span").addExpectedChild(new TextContent("2")))));
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 27643f3..d722d6c 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":"../page?0-1.IBehaviorListener.1-provider-ajaxRefresh","e":"click","c":"ajaxRefresh1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-provider-ajaxRefresh","e":"click","c":"ajaxRefresh1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/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 dc110c8..4b55aca 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":"../page?0-1.IBehaviorListener.1-add","e":"click","c":"add1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.0-add","e":"click","c":"add1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/d02b4490/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
index b0270d9..1ad587c 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
@@ -91,7 +91,7 @@ public class AjaxEditableTest extends WicketTestCase
AjaxEditableLabel<String> ajaxLabel = (AjaxEditableLabel<String>)page.get("ajaxLabel");
AjaxLink<Void> toggle = (AjaxLink<Void>)page.get("toggle");
- AbstractAjaxBehavior toggleBehavior = toggle.getBehaviors(AbstractAjaxBehavior.class).get(0);
+ AbstractAjaxBehavior toggleBehavior = (AbstractAjaxBehavior)toggle.getBehaviors().get(0);
// check for correct rendering
tester.assertInvisible("ajaxLabel:editor");
@@ -106,6 +106,12 @@ public class AjaxEditableTest extends WicketTestCase
// enable ajaxLabel
tester.executeBehavior(toggleBehavior);
+
+ // check for the *presence* of the ajax onclick call
+
+ // TODO Wicket.next - re-enable
+// markup = tester.getTagById(ajaxLabel.getMarkupId()).getMarkup();
+// assertTrue(markup.matches(".*onclick=\"var wcall=Wicket.Ajax.get.*"));
}
/**
[2/5] git commit: Revert "WICKET-4904 Use a behavior that modifies
AbstractLink's markup when disabled"
Posted by sv...@apache.org.
Revert "WICKET-4904 Use a behavior that modifies AbstractLink's markup when disabled"
This reverts commit dd7481341ae3c7c8fb4402b537cf77473293ee33.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d9a96561
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d9a96561
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d9a96561
Branch: refs/heads/master
Commit: d9a9656196d08339614e9b0b43205bddc3b08729
Parents: 3f9a240
Author: svenmeier <sv...@meiers.net>
Authored: Thu Jun 13 15:29:01 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Jun 13 15:29:01 2013 +0200
----------------------------------------------------------------------
.../markup/html/link/AbstractLinkTest.java | 42 --------------------
1 file changed, 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d9a96561/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
index a947d10..cda714f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
@@ -18,11 +18,8 @@ package org.apache.wicket.markup.html.link;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.wicket.Component;
import org.apache.wicket.MockPageWithLink;
import org.apache.wicket.WicketTestCase;
-import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.TagTester;
@@ -88,43 +85,4 @@ public class AbstractLinkTest extends WicketTestCase
tagTester = tester.getTagById("link");
Assert.assertEquals("1", tagTester.getValue());
}
-
- /**
- * https://issues.apache.org/jira/browse/WICKET-4904
- *
- * Use a Behavior that does what Twitter Bootstrap requires
- */
- @Test
- public void useCustomDisablingBehavior()
- {
- MockPageWithLink mockPageWithLink = new MockPageWithLink();
- AbstractLink link = new AbstractLink("link")
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected Behavior getDisablingBehavior()
- {
- return new Behavior()
- {
- @Override
- public void onComponentTag(Component component, ComponentTag tag)
- {
- super.onComponentTag(component, tag);
-
- tag.put("disabled", "disabled");
- }
- };
- }
- };
- link.setMarkupId("link");
- link.setBody(Model.of("Link"));
- mockPageWithLink.add(link);
-
- tester.startPage(mockPageWithLink);
- TagTester tagTester = tester.getTagById("link");
- String markup = tagTester.getMarkup();
- Assert.assertEquals("<a href=\"#\" wicket:id=\"link\" id=\"link\" disabled=\"disabled\">Link</a>", markup);
- }
-
}
[5/5] git commit: restore default timezone after test
Posted by sv...@apache.org.
restore default timezone after test
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d8789519
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d8789519
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d8789519
Branch: refs/heads/master
Commit: d8789519deb9b386ff8703bee056005522a51389
Parents: 690cca0
Author: svenmeier <sv...@meiers.net>
Authored: Thu Jun 13 21:12:20 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Jun 13 21:12:20 2013 +0200
----------------------------------------------------------------------
.../yui/calendar/DateTimeFieldTest.java | 39 +++++++++++++-------
1 file changed, 25 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d8789519/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java
----------------------------------------------------------------------
diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java
index 37dde0d..ea9333e 100644
--- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java
+++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DateTimeFieldTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
/**
* Tests for DateTimeField
*/
-public class DateTimeFieldTest extends WicketTestCase
+public class DateTimeFieldTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5204
@@ -36,25 +36,36 @@ public class DateTimeFieldTest extends WicketTestCase
@Test
public void testTimeZones()
{
- //The server is using UTC as it's default timezone
- DateTimeZone.setDefault(DateTimeZone.forID("UTC"));
+ DateTimeZone defaultTimeZone = DateTimeZone.getDefault();
- final String clientTimezone = "America/Toronto";
+ try
+ {
+ // The server is using UTC as it's default timezone
+ DateTimeZone.setDefault(DateTimeZone.forID("UTC"));
- DateTime jan01_10am = new DateTime(2013, 01, 01, 10, 0, 0 , DateTimeZone.forID(clientTimezone));
+ final String clientTimezone = "America/Toronto";
- DateTimeField dateTimeField = new DateTimeField("foo", Model.of(jan01_10am.toDate()))
- {
- @Override
- protected TimeZone getClientTimeZone()
+ DateTime jan01_10am = new DateTime(2013, 01, 01, 10, 0, 0,
+ DateTimeZone.forID(clientTimezone));
+
+ DateTimeField dateTimeField = new DateTimeField("foo", Model.of(jan01_10am.toDate()))
{
- return TimeZone.getTimeZone(clientTimezone);
- }
- };
+ @Override
+ protected TimeZone getClientTimeZone()
+ {
+ return TimeZone.getTimeZone(clientTimezone);
+ }
+ };
- tester.startComponentInPage(dateTimeField);
+ tester.startComponentInPage(dateTimeField);
- Assert.assertEquals("The hour of day is incorrect!", jan01_10am.getHourOfDay(), dateTimeField.getHours().intValue());
+ Assert.assertEquals("The hour of day is incorrect!", jan01_10am.getHourOfDay(),
+ dateTimeField.getHours().intValue());
+ }
+ finally
+ {
+ DateTimeZone.setDefault(defaultTimeZone);
+ }
}
}
[4/5] git commit: WICKET-4904 behavior can change representation of
disabled links, but core functionality - disabling for buttons,
no href for links - are handled by AbstractLink
Posted by sv...@apache.org.
WICKET-4904 behavior can change representation of disabled links, but
core functionality - disabling for buttons, no href for links - are
handled by AbstractLink
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/690cca0d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/690cca0d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/690cca0d
Branch: refs/heads/master
Commit: 690cca0d50d611bbe1a08015e39fb8795cc6e7c9
Parents: d02b449
Author: svenmeier <sv...@meiers.net>
Authored: Thu Jun 13 21:11:22 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Thu Jun 13 21:11:22 2013 +0200
----------------------------------------------------------------------
.../ajax/markup/html/AjaxFallbackLink.java | 4 +-
.../wicket/ajax/markup/html/AjaxLink.java | 2 +-
.../ajax/markup/html/form/AjaxSubmitLink.java | 4 +-
.../wicket/markup/html/form/SubmitLink.java | 12 +-
.../wicket/markup/html/link/AbstractLink.java | 125 +------------
.../markup/html/link/DisabledLinkBehavior.java | 174 +++++++++++++++++++
.../wicket/markup/html/link/ExternalLink.java | 2 +-
.../apache/wicket/markup/html/link/Link.java | 10 +-
.../apache/wicket/settings/IMarkupSettings.java | 22 ---
.../wicket/settings/def/MarkupSettings.java | 42 -----
.../html/autolink/MyPageExpectedResult.html | 2 +-
.../html/autolink/PageAExpectedResult.html | 4 +-
.../html/autolink/PageBExpectedResult.html | 2 +-
...talTableNavigationPage_ExpectedResult_1.html | 2 +-
.../PagedTableNavigatorExpectedResult_1.html | 6 +-
.../PagedTableNavigatorExpectedResult_2.html | 2 +-
.../PagedTableNavigatorExpectedResult_3.html | 6 +-
.../PagedTableNavigatorExpectedResult_4.html | 6 +-
.../PagedTableNavigatorExpectedResult_5.html | 6 +-
.../PagedTableNavigatorExpectedResult_6.html | 2 +-
.../PagedTableNavigatorExpectedResult_7.html | 2 +-
.../PagedTableNavigatorExpectedResult_8.html | 6 +-
...igatorWithLabelProviderExpectedResult_1.html | 6 +-
...igatorWithLabelProviderExpectedResult_2.html | 2 +-
...igatorWithLabelProviderExpectedResult_3.html | 6 +-
...igatorWithLabelProviderExpectedResult_4.html | 6 +-
...igatorWithLabelProviderExpectedResult_5.html | 6 +-
...igatorWithLabelProviderExpectedResult_6.html | 2 +-
...igatorWithLabelProviderExpectedResult_7.html | 2 +-
...igatorWithLabelProviderExpectedResult_8.html | 4 +-
...ableNavigatorWithMarginExpectedResult_1.html | 6 +-
...ableNavigatorWithMarginExpectedResult_2.html | 2 +-
...ableNavigatorWithMarginExpectedResult_3.html | 6 +-
...ableNavigatorWithMarginExpectedResult_4.html | 6 +-
...ableNavigatorWithMarginExpectedResult_5.html | 6 +-
...ableNavigatorWithMarginExpectedResult_6.html | 2 +-
...ableNavigatorWithMarginExpectedResult_7.html | 2 +-
.../html/list/PagedTablePageExpectedResult.html | 2 +-
.../wicket/markup/html/list/PagedTableTest.java | 4 +-
.../navomatic/NavomaticApplication.java | 11 +-
.../org/apache/wicket/jmx/MarkupSettings.java | 36 ----
.../apache/wicket/jmx/MarkupSettingsMBean.java | 22 ---
42 files changed, 265 insertions(+), 317 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
index 958bb78..318e669 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLink.java
@@ -98,7 +98,7 @@ public abstract class AjaxFallbackLink<T> extends Link<T> implements IAjaxLink
protected void onComponentTag(ComponentTag tag)
{
// only render handler if link is enabled
- if (isLinkEnabled())
+ if (isEnabledInHierarchy())
{
super.onComponentTag(tag);
}
@@ -156,7 +156,7 @@ public abstract class AjaxFallbackLink<T> extends Link<T> implements IAjaxLink
tag.remove("onclick");
String tagName = tag.getName();
- if (isLinkEnabled() &&
+ if (isEnabledInHierarchy() &&
!("a".equalsIgnoreCase(tagName) || "area".equalsIgnoreCase(tagName) || "link".equalsIgnoreCase(tagName)))
{
String msg = String.format(
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
index f0970fd..8568dcf 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
@@ -102,7 +102,7 @@ public abstract class AjaxLink<T> extends AbstractLink implements IAjaxLink, IGe
{
super.onComponentTag(tag);
- if (isLinkEnabled())
+ if (isEnabledInHierarchy())
{
// disable any href attr in markup
if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") ||
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
index 0a38fe9..fd54cee 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
@@ -91,7 +91,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
protected void onComponentTag(ComponentTag tag)
{
// write the onclick handler only if link is enabled
- if (isLinkEnabled())
+ if (isEnabledInHierarchy())
{
super.onComponentTag(tag);
}
@@ -149,7 +149,7 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
{
super.onComponentTag(tag);
- if (isLinkEnabled())
+ if (isEnabledInHierarchy())
{
if (tag.getName().toLowerCase().equals("a"))
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
index fb0c5da..2d4d261 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/SubmitLink.java
@@ -155,12 +155,8 @@ public class SubmitLink extends AbstractSubmitLink
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- // If we're disabled
- if (!isLinkEnabled())
- {
- disableLink(tag);
- }
- else
+
+ if (isEnabledInHierarchy())
{
if (tag.getName().equalsIgnoreCase("a"))
{
@@ -168,6 +164,10 @@ public class SubmitLink extends AbstractSubmitLink
}
tag.put("onclick", getTriggerJavaScript());
}
+ else
+ {
+ disableLink(tag);
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
index 86c2c89..5c928e0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
@@ -16,7 +16,6 @@
*/
package org.apache.wicket.markup.html.link;
-import org.apache.wicket.Application;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -58,101 +57,6 @@ public abstract class AbstractLink extends WebMarkupContainer
}
/**
- * Simple insertion string to allow disabled links to look like <i>Disabled link </i>.
- */
- private String beforeDisabledLink;
-
- /**
- * Simple insertion string to allow disabled links to look like <i>Disabled link </i>.
- */
- private String afterDisabledLink;
-
-
- /**
- * Sets the insertion string to allow disabled links to look like <i>Disabled link </i>.
- *
- * @param afterDisabledLink
- * The insertion string
- * @return this
- */
- public AbstractLink setAfterDisabledLink(final String afterDisabledLink)
- {
- if (afterDisabledLink == null)
- {
- throw new IllegalArgumentException(
- "Value cannot be null. For no text, specify an empty String instead.");
- }
- this.afterDisabledLink = afterDisabledLink;
- return this;
- }
-
- /**
- * Gets the insertion string to allow disabled links to look like <i>Disabled link </i>.
- *
- * @return The insertion string
- */
- public String getAfterDisabledLink()
- {
- return afterDisabledLink;
- }
-
- /**
- * Sets the insertion string to allow disabled links to look like <i>Disabled link </i>.
- *
- * @param beforeDisabledLink
- * The insertion string
- * @return this
- */
- public AbstractLink setBeforeDisabledLink(final String beforeDisabledLink)
- {
- if (beforeDisabledLink == null)
- {
- throw new IllegalArgumentException(
- "Value cannot be null. For no text, specify an empty String instead.");
- }
- this.beforeDisabledLink = beforeDisabledLink;
- return this;
- }
-
- /**
- * @see org.apache.wicket.Component#onBeforeRender()
- */
- @Override
- protected void onBeforeRender()
- {
- super.onBeforeRender();
-
- // Set default for before/after link text
- if (beforeDisabledLink == null)
- {
- final Application app = getApplication();
- beforeDisabledLink = app.getMarkupSettings().getDefaultBeforeDisabledLink();
- afterDisabledLink = app.getMarkupSettings().getDefaultAfterDisabledLink();
- }
- }
-
- /**
- * Gets the insertion string to allow disabled links to look like <i>Disabled link </i>.
- *
- * @return The insertion string
- */
- public String getBeforeDisabledLink()
- {
- return beforeDisabledLink;
- }
-
- /**
- * Helper methods that both checks whether the link is enabled and whether the action ENABLE is
- * allowed.
- *
- * @return whether the link should be rendered as enabled
- */
- protected boolean isLinkEnabled()
- {
- return isEnabledInHierarchy();
- }
-
- /**
* Renders this link's body.
*
* @param markupStream
@@ -164,12 +68,6 @@ public abstract class AbstractLink extends WebMarkupContainer
@Override
public void onComponentTagBody(final MarkupStream markupStream, final ComponentTag openTag)
{
- // Draw anything before the body?
- if (!isLinkEnabled() && getBeforeDisabledLink() != null)
- {
- getResponse().write(getBeforeDisabledLink());
- }
-
// Get a copy of the body model from the getBody() method. This method could be overridden.
IModel<?> tmpBodyModel = getBody();
@@ -183,11 +81,6 @@ public abstract class AbstractLink extends WebMarkupContainer
// Render the body of the link
super.onComponentTagBody(markupStream, openTag);
}
- // Draw anything after the body?
- if (!isLinkEnabled() && getAfterDisabledLink() != null)
- {
- getResponse().write(getAfterDisabledLink());
- }
}
/**
@@ -200,24 +93,18 @@ public abstract class AbstractLink extends WebMarkupContainer
*/
protected void disableLink(final ComponentTag tag)
{
- // if the tag is an anchor proper
- if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") ||
- tag.getName().equalsIgnoreCase("area"))
+ // if the tag is a button or input
+ if ("button".equalsIgnoreCase(tag.getName()) || "input".equalsIgnoreCase(tag.getName()))
+ {
+ tag.put("disabled", "disabled");
+ }
+ else
{
- // Change anchor link to span tag
- tag.setName("span");
-
// Remove any href from the old link
tag.remove("href");
tag.remove("onclick");
}
- // if the tag is a button or input
- else if ("button".equalsIgnoreCase(tag.getName()) ||
- "input".equalsIgnoreCase(tag.getName()))
- {
- tag.put("disabled", "disabled");
- }
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisabledLinkBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisabledLinkBehavior.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisabledLinkBehavior.java
new file mode 100644
index 0000000..66dffd9
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisabledLinkBehavior.java
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.link;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.application.IComponentInstantiationListener;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.ComponentTag;
+
+/**
+ * A behavior to change the representation fo disabled links.
+ * <p>
+ * Markup tags {@code <a>}, {@code <link>} and {@code <area>} are replaced with a {@code <span>}.
+ */
+public final class DisabledLinkBehavior extends Behavior
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Simple insertion string to allow disabled links to look like <i>Disabled link </i>.
+ */
+ private String beforeDisabledLink;
+
+ /**
+ * Simple insertion string to allow disabled links to look like <i>Disabled link </i>.
+ */
+ private String afterDisabledLink;
+
+ /**
+ * Enclose each disabled link in {@code <em></em>}.
+ */
+ public DisabledLinkBehavior()
+ {
+ this("<em>", "</em>");
+ }
+
+ /**
+ * Enclose each disabled link in the given markup.
+ *
+ * @param beforeDisabledLink
+ * markup to write before the link
+ * @param afterDisabledLink
+ * markup to write after the link
+ */
+ public DisabledLinkBehavior(String beforeDisabledLink, String afterDisabledLink)
+ {
+ this.beforeDisabledLink = beforeDisabledLink;
+ this.afterDisabledLink = afterDisabledLink;
+ }
+
+ /**
+ * Sets the insertion string to allow disabled links to look like <i>Disabled link </i>.
+ *
+ * @param afterDisabledLink
+ * The insertion string
+ * @return this
+ */
+ public DisabledLinkBehavior setAfterDisabledLink(final String afterDisabledLink)
+ {
+ if (afterDisabledLink == null)
+ {
+ throw new IllegalArgumentException(
+ "Value cannot be null. For no text, specify an empty String instead.");
+ }
+ this.afterDisabledLink = afterDisabledLink;
+ return this;
+ }
+
+ /**
+ * Gets the insertion string to allow disabled links to look like <i>Disabled link </i>.
+ *
+ * @return The insertion string
+ */
+ public String getAfterDisabledLink()
+ {
+ return afterDisabledLink;
+ }
+
+ /**
+ * Sets the insertion string to allow disabled links to look like <i>Disabled link </i>.
+ *
+ * @param beforeDisabledLink
+ * The insertion string
+ * @return this
+ */
+ public DisabledLinkBehavior setBeforeDisabledLink(final String beforeDisabledLink)
+ {
+ if (beforeDisabledLink == null)
+ {
+ throw new IllegalArgumentException(
+ "Value cannot be null. For no text, specify an empty String instead.");
+ }
+ this.beforeDisabledLink = beforeDisabledLink;
+ return this;
+ }
+
+ /**
+ * Gets the insertion string to allow disabled links to look like <i>Disabled link </i>.
+ *
+ * @return The insertion string
+ */
+ public String getBeforeDisabledLink()
+ {
+ return beforeDisabledLink;
+ }
+
+ @Override
+ public void beforeRender(Component component)
+ {
+ // Draw anything before the body?
+ if (!component.isEnabledInHierarchy() && getBeforeDisabledLink() != null)
+ {
+ component.getResponse().write(getBeforeDisabledLink());
+ }
+ }
+
+ @Override
+ public void onComponentTag(Component component, ComponentTag tag)
+ {
+ if (!component.isEnabledInHierarchy())
+ {
+ // if the tag is an anchor proper
+ if (tag.getName().equalsIgnoreCase("a") || tag.getName().equalsIgnoreCase("link") ||
+ tag.getName().equalsIgnoreCase("area"))
+ {
+ // Change anchor link to span tag
+ tag.setName("span");
+ }
+ }
+ }
+
+ @Override
+ public void afterRender(Component component)
+ {
+ // Draw anything after the body?
+ if (!component.isEnabledInHierarchy() && getAfterDisabledLink() != null)
+ {
+ component.getResponse().write(getAfterDisabledLink());
+ }
+ }
+
+ /**
+ * A listener to instantiations of {@link AbstractLink} to restores the disabled representation
+ * to that before Wicket 7.x.
+ */
+ public static class LinkInstantiationListener implements IComponentInstantiationListener
+ {
+ /**
+ * Adds an {@link DisabledLinkBehavior} to all {@link AbstractLink}s.
+ */
+ @Override
+ public void onInstantiation(Component component)
+ {
+ if (component instanceof AbstractLink)
+ {
+ component.add(new DisabledLinkBehavior());
+ }
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
index 6e733c3..cc106d7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
@@ -153,7 +153,7 @@ public class ExternalLink extends AbstractLink
{
super.onComponentTag(tag);
- if (isLinkEnabled() == false)
+ if (isEnabledInHierarchy() == false)
{
disableLink(tag);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
index 0758782..fb33554 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
@@ -353,11 +353,7 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe
super.onComponentTag(tag);
// If we're disabled
- if (!isLinkEnabled())
- {
- disableLink(tag);
- }
- else
+ if (isEnabledInHierarchy())
{
// Set href to link to this link's linkClicked method
CharSequence url = getURL();
@@ -416,6 +412,10 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe
tag.put("onclick", onClickJavaScript);
}
}
+ else
+ {
+ disableLink(tag);
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/settings/IMarkupSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/IMarkupSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/IMarkupSettings.java
index 3698216..4dbbb24 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/IMarkupSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/IMarkupSettings.java
@@ -48,16 +48,6 @@ public interface IMarkupSettings
boolean getCompressWhitespace();
/**
- * @return Returns the defaultAfterDisabledLink.
- */
- String getDefaultAfterDisabledLink();
-
- /**
- * @return Returns the defaultBeforeDisabledLink.
- */
- String getDefaultBeforeDisabledLink();
-
- /**
* @since 1.1
* @return Returns default encoding of markup files. If null, the operating system provided
* encoding will be used.
@@ -112,18 +102,6 @@ public interface IMarkupSettings
void setCompressWhitespace(final boolean compressWhitespace);
/**
- * @param defaultAfterDisabledLink
- * The defaultAfterDisabledLink to set.
- */
- void setDefaultAfterDisabledLink(String defaultAfterDisabledLink);
-
- /**
- * @param defaultBeforeDisabledLink
- * The defaultBeforeDisabledLink to set.
- */
- void setDefaultBeforeDisabledLink(String defaultBeforeDisabledLink);
-
- /**
* Set default encoding for markup files. If null, the encoding provided by the operating system
* will be used.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java b/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java
index 1b4976f..2ca7ec0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java
+++ b/wicket-core/src/main/java/org/apache/wicket/settings/def/MarkupSettings.java
@@ -38,12 +38,6 @@ public class MarkupSettings implements IMarkupSettings
/** True if multiple tabs/spaces should be compressed to a single space */
private boolean compressWhitespace = false;
- /** Default markup for after a disabled link */
- private String defaultAfterDisabledLink = "</em>";
-
- /** Default markup for before a disabled link */
- private String defaultBeforeDisabledLink = "<em>";
-
/** Default markup encoding. If null, the OS default will be used */
private String defaultMarkupEncoding;
@@ -87,24 +81,6 @@ public class MarkupSettings implements IMarkupSettings
}
/**
- * @see org.apache.wicket.settings.IMarkupSettings#getDefaultAfterDisabledLink()
- */
- @Override
- public String getDefaultAfterDisabledLink()
- {
- return defaultAfterDisabledLink;
- }
-
- /**
- * @see org.apache.wicket.settings.IMarkupSettings#getDefaultBeforeDisabledLink()
- */
- @Override
- public String getDefaultBeforeDisabledLink()
- {
- return defaultBeforeDisabledLink;
- }
-
- /**
* @see org.apache.wicket.settings.IMarkupSettings#getDefaultMarkupEncoding()
*/
@Override
@@ -172,24 +148,6 @@ public class MarkupSettings implements IMarkupSettings
}
/**
- * @see org.apache.wicket.settings.IMarkupSettings#setDefaultAfterDisabledLink(java.lang.String)
- */
- @Override
- public void setDefaultAfterDisabledLink(final String defaultAfterDisabledLink)
- {
- this.defaultAfterDisabledLink = defaultAfterDisabledLink;
- }
-
- /**
- * @see org.apache.wicket.settings.IMarkupSettings#setDefaultBeforeDisabledLink(java.lang.String)
- */
- @Override
- public void setDefaultBeforeDisabledLink(String defaultBeforeDisabledLink)
- {
- this.defaultBeforeDisabledLink = defaultBeforeDisabledLink;
- }
-
- /**
* @see org.apache.wicket.settings.IMarkupSettings#setDefaultMarkupEncoding(java.lang.String)
*/
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
index 97c05cd..c43578c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/MyPageExpectedResult.html
@@ -2,7 +2,7 @@
<html>
<body>
<wicket:link>
- <span><em>My Page</em></span>
+ <a>My Page</a>
<a href="./org.apache.wicket.markup.html.autolink.PageA">Page A</a>
<a href="./org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
</wicket:link>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
index 056b1ad..939857a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageAExpectedResult.html
@@ -3,13 +3,13 @@
<body>
<wicket:link>
<a href="./org.apache.wicket.markup.html.autolink.MyPage">My Page</a>
- <span><em>Page A</em></span>
+ <a>Page A</a>
<a href="./org.apache.wicket.markup.html.autolink.sub.PageB">Page B</a>
</wicket:link>
START<br>
<wicket:child><wicket:extend>
<wicket:link>
- <span><em>Page A</em></span>
+ <a>Page A</a>
</wicket:link>
Page A
</wicket:extend></wicket:child>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
index 24ab7da..91f4360 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/PageBExpectedResult.html
@@ -2,7 +2,7 @@
<html>
<body>
<wicket:link>
- <span><em>Page B</em></span>
+ <a>Page B</a>
</wicket:link>
START<br>
<wicket:child><wicket:extend>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 2005ebe..8a26030 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>
-<span wicket:id="prev"><em>Prev</em></span><a wicket:id="nextNext" href="../page?0-1.ILinkListener-nextNext">NextNext</a>
+<a wicket:id="prev">Prev</a><a wicket:id="nextNext" href="../page?0-1.ILinkListener-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 6b2d50f..d8c0629 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <a wicket:id="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="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 f14b6f8..234f3b1 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
+ <a wicket:id="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="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 bfdafd6..e12f8ce 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <a wicket:id="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="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 5bf540d..fb303b2 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
@@ -27,10 +27,10 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span>
+ <a wicket:id="pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
- <span wicket:id="next" class="next" title="Go to next page"><em>></em></span>
- <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span>
+ <a wicket:id="next" class="next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 7c3ca69..c8af4eb 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <a wicket:id="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="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 15e9544..0a96797 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
@@ -25,7 +25,7 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">3</span></em></span>
+ <a wicket:id="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="../page?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 d59bc46..c4d8681 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
+ <a wicket:id="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="../page?0-7.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 7dd02be..7fa065b 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <a wicket:id="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="../page?0-8.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 dcc15d8..e6c8526 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
+ <a wicket:id="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="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 542d92c..edd0748 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">3-4</span></em></span>
+ <a wicket:id="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="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 8806fbf..714f37c 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
+ <a wicket:id="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="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 5026117..78ebac8 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
@@ -33,10 +33,10 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-5-pageLink" title="Go to page 6"><span wicket:id="pageNumber">11-12</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">13-14</span></em></span>
+ <a wicket:id="pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></a>
</span>
- <span wicket:id="next" class="next" title="Go to next page"><em>></em></span>
- <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span>
+ <a wicket:id="next" class="next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 f726765..ed08c6a 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
+ <a wicket:id="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="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 7380a8c..7828108 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
@@ -27,7 +27,7 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">7-8</span></em></span>
+ <a wicket:id="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="../page?0-6.ILinkListener-navigator-navigation-4-pageLink" title="Go to page 5"><span wicket:id="pageNumber">9-10</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 075d95b..7c38526 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
@@ -25,7 +25,7 @@
</span><span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></a>
</span><span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">5-6</span></em></span>
+ <a wicket:id="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="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></a>
</span><span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 176ba46..88bdb0e 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
@@ -18,9 +18,9 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first"><em><<</em></span> <span wicket:id="prev"><em><</em></span>
+ <a wicket:id="first"><<</a> <a wicket:id="prev"><</a>
<span wicket:id="navigation">
- <span wicket:id="pageLink"><em><span wicket:id="pageNumber">1</span></em></span>
+ <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&interface=ILinkListener" wicket:id="pageLink"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 739599c..670ecdc 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <a wicket:id="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="../page?0-1.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 242d716..9dbdebe 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
@@ -23,7 +23,7 @@
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-2.ILinkListener-navigator-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span>
+ <a wicket:id="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="../page?0-2.ILinkListener-navigator-navigation-2-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 efbf626..edd6078 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <a wicket:id="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="../page?0-3.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 49be322..879deef 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
@@ -29,10 +29,10 @@
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-4.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 6"><span wicket:id="pageNumber">6</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 7"><em><span wicket:id="pageNumber">7</span></em></span>
+ <a wicket:id="pageLink" title="Go to page 7"><span wicket:id="pageNumber">7</span></a>
</span>
- <span wicket:id="next" class="next" title="Go to next page"><em>></em></span>
- <span wicket:id="last" class="last" title="Go to last page"><em>>></em></span>
+ <a wicket:id="next" class="next" title="Go to next page">></a>
+ <a wicket:id="last" class="last" title="Go to last page">>></a>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 6ae349d..fe6ed42 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
@@ -18,10 +18,10 @@
</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>
<span wicket:id="navigator"><wicket:panel>
- <span wicket:id="first" class="first" title="Go to first page"><em><<</em></span>
- <span wicket:id="prev" class="prev" title="Go to previous page"><em><</em></span>
+ <a wicket:id="first" class="first" title="Go to first page"><<</a>
+ <a wicket:id="prev" class="prev" title="Go to previous page"><</a>
<span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <a wicket:id="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="../page?0-5.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 c3e01a3..dba6185 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
@@ -25,7 +25,7 @@
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-6.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 4"><em><span wicket:id="pageNumber">4</span></em></span>
+ <a wicket:id="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="../page?0-6.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 5"><span wicket:id="pageNumber">5</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 38a4bb6..39b7366 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
@@ -25,7 +25,7 @@
</span>, <span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="../page?0-7.ILinkListener-navigator-navigation-1-pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></a>
</span>, <span wicket:id="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 3"><em><span wicket:id="pageNumber">3</span></em></span>
+ <a wicket:id="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="../page?0-7.ILinkListener-navigator-navigation-3-pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></a>
</span>, <span wicket:id="navigation" class="goto">
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/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 63766e5..8839ecc 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="../page?1-2.ILinkListener-navigation-0-pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></a></li><li wicket:id="navigation"><span wicket:id="pageLink" title="Go to page 2"><em><span wicket:id="pageNumber">2</span></em></span></li></ul>
+<ul><li wicket:id="navigation"><a wicket:id="pageLink" href="../page?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" 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/690cca0d/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
index 1a91392..89babc9 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableTest.java
@@ -80,8 +80,8 @@ public class PagedTableTest extends WicketTestCase
body.addExpectedChild(ulTable);
Tag ulNav = new Tag("ul");
- ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("span").addExpectedChild(new Tag(
- "em").addExpectedChild(new Tag("span").addExpectedChild(new TextContent("1"))))));
+ ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("a").addExpectedChild(new Tag(
+ "span").addExpectedChild(new TextContent("1")))));
ulNav.addExpectedChild(new Tag("li").addExpectedChild(new Tag("a").addExpectedChild(new Tag(
"span").addExpectedChild(new TextContent("2")))));
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java
index fb6347b..2656575 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/navomatic/NavomaticApplication.java
@@ -18,6 +18,7 @@ package org.apache.wicket.examples.navomatic;
import org.apache.wicket.Page;
import org.apache.wicket.examples.WicketExampleApplication;
+import org.apache.wicket.markup.html.link.DisabledLinkBehavior;
/**
* Application class.
@@ -33,11 +34,19 @@ public class NavomaticApplication extends WicketExampleApplication
{
}
+ @Override
+ protected void init()
+ {
+ super.init();
+
+ getComponentInstantiationListeners().add(new DisabledLinkBehavior.LinkInstantiationListener());
+ }
+
/**
* @see org.apache.wicket.Application#getHomePage()
*/
@Override
- public Class< ? extends Page> getHomePage()
+ public Class<? extends Page> getHomePage()
{
return Page1.class;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettings.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettings.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettings.java
index 718dbcf..efa6048 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettings.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettings.java
@@ -55,24 +55,6 @@ public class MarkupSettings implements MarkupSettingsMBean
}
/**
- * @see org.apache.wicket.jmx.MarkupSettingsMBean#getDefaultAfterDisabledLink()
- */
- @Override
- public String getDefaultAfterDisabledLink()
- {
- return application.getMarkupSettings().getDefaultAfterDisabledLink();
- }
-
- /**
- * @see org.apache.wicket.jmx.MarkupSettingsMBean#getDefaultBeforeDisabledLink()
- */
- @Override
- public String getDefaultBeforeDisabledLink()
- {
- return application.getMarkupSettings().getDefaultBeforeDisabledLink();
- }
-
- /**
* @see org.apache.wicket.jmx.MarkupSettingsMBean#getDefaultMarkupEncoding()
*/
@Override
@@ -118,24 +100,6 @@ public class MarkupSettings implements MarkupSettingsMBean
}
/**
- * @see org.apache.wicket.jmx.MarkupSettingsMBean#setDefaultAfterDisabledLink(java.lang.String)
- */
- @Override
- public void setDefaultAfterDisabledLink(final String defaultAfterDisabledLink)
- {
- application.getMarkupSettings().setDefaultAfterDisabledLink(defaultAfterDisabledLink);
- }
-
- /**
- * @see org.apache.wicket.jmx.MarkupSettingsMBean#setDefaultBeforeDisabledLink(java.lang.String)
- */
- @Override
- public void setDefaultBeforeDisabledLink(final String defaultBeforeDisabledLink)
- {
- application.getMarkupSettings().setDefaultBeforeDisabledLink(defaultBeforeDisabledLink);
- }
-
- /**
* @see org.apache.wicket.jmx.MarkupSettingsMBean#setDefaultMarkupEncoding(java.lang.String)
*/
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/690cca0d/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
index 5846fef..44646ed 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
@@ -41,16 +41,6 @@ public interface MarkupSettingsMBean
boolean getCompressWhitespace();
/**
- * @return Returns the defaultAfterDisabledLink.
- */
- String getDefaultAfterDisabledLink();
-
- /**
- * @return Returns the defaultBeforeDisabledLink.
- */
- String getDefaultBeforeDisabledLink();
-
- /**
* @since 1.1
* @return Returns default encoding of markup files. If null, the operating system provided
* encoding will be used.
@@ -100,18 +90,6 @@ public interface MarkupSettingsMBean
void setCompressWhitespace(final boolean compressWhitespace);
/**
- * @param defaultAfterDisabledLink
- * The defaultAfterDisabledLink to set.
- */
- void setDefaultAfterDisabledLink(String defaultAfterDisabledLink);
-
- /**
- * @param defaultBeforeDisabledLink
- * The defaultBeforeDisabledLink to set.
- */
- void setDefaultBeforeDisabledLink(String defaultBeforeDisabledLink);
-
- /**
* Set default encoding for markup files. If null, the encoding provided by the operating system
* will be used.
*