You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/13 14:05:50 UTC
[2/2] git commit: WICKET-4904 Use a behavior that modifies
AbstractLink's markup when disabled
WICKET-4904 Use a behavior that modifies AbstractLink's markup when disabled
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ec4d4053
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ec4d4053
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ec4d4053
Branch: refs/heads/master
Commit: ec4d40539354d9332aef886458f276df790cc500
Parents: e229cc5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 13 15:05:21 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 13 15:05:21 2013 +0300
----------------------------------------------------------------------
.../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, 233 insertions(+), 214 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..6dee00f 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,11 +111,6 @@ 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/ec4d4053/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..dd6890b 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,10 +156,6 @@ public abstract class AjaxSubmitLink extends AbstractSubmitLink
tag.put("href", "#");
}
}
- else
- {
- disableLink(tag);
- }
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..6f1cfed 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,19 +155,12 @@ public class SubmitLink extends AbstractSubmitLink
protected void onComponentTag(ComponentTag tag)
{
super.onComponentTag(tag);
- // If we're disabled
- if (!isLinkEnabled())
- {
- disableLink(tag);
- }
- else
+
+ if (tag.getName().equalsIgnoreCase("a"))
{
- if (tag.getName().equalsIgnoreCase("a"))
- {
- tag.put("href", "#");
- }
- tag.put("onclick", getTriggerJavaScript());
+ tag.put("href", "#");
}
+ tag.put("onclick", getTriggerJavaScript());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..12e02df 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,6 +17,7 @@
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;
@@ -147,7 +148,7 @@ public abstract class AbstractLink extends WebMarkupContainer
*
* @return whether the link should be rendered as enabled
*/
- protected boolean isLinkEnabled()
+ public boolean isLinkEnabled()
{
return isEnabledInHierarchy();
}
@@ -164,12 +165,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,41 +178,23 @@ 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());
- }
}
- /**
- * 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 void disableLink(final ComponentTag tag)
+ @Override
+ protected void onInitialize()
{
- // 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");
+ super.onInitialize();
- // Remove any href from the old link
- tag.remove("href");
+ add(getDisablingBehavior());
+ }
- 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");
- }
+ /**
+ * @return A behavior that will modify this link's markup
+ * if it is disabled.
+ */
+ protected Behavior getDisablingBehavior()
+ {
+ return new DisableLinkBehavior();
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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
new file mode 100644
index 0000000..11114f1
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/DisableLinkBehavior.java
@@ -0,0 +1,97 @@
+/*
+ * 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/ec4d4053/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..44574f5 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,11 +153,7 @@ public class ExternalLink extends AbstractLink
{
super.onComponentTag(tag);
- if (isLinkEnabled() == false)
- {
- disableLink(tag);
- }
- else if (getDefaultModel() != null)
+ if (isLinkEnabled() && getDefaultModel() != null)
{
Object hrefValue = getDefaultModelObject();
if (hrefValue != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..b1dbb55 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,69 +352,61 @@ public abstract class Link<T> extends AbstractLink implements ILinkListener, IGe
// Default handling for tag
super.onComponentTag(tag);
- // If we're disabled
- if (!isLinkEnabled())
- {
- disableLink(tag);
- }
- else
- {
- // Set href to link to this link's linkClicked method
- CharSequence url = getURL();
+ // Set href to link to this link's linkClicked method
+ CharSequence url = getURL();
- // append any anchor
- url = appendAnchor(tag, url);
+ // 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);
+ // 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());
- }
+ // 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"))
+ }
+ else if (tag.getName().equalsIgnoreCase("script") ||
+ tag.getName().equalsIgnoreCase("style"))
+ {
+ tag.put("src", url);
+ }
+ else
+ {
+ // generate a popup script by asking popup settings for one
+ if (popupSettings != null)
{
- tag.put("src", url);
+ popupSettings.setTarget("'" + url + "'");
+ String popupScript = popupSettings.getPopupJavaScript();
+ tag.put("onclick", popupScript);
}
else
{
- // 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");
- }
+ // 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/ec4d4053/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 894702f..8a093c4 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.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.1-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 db50c86..21bf0e5 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.0-link","e":"click","c":"link1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.1-link","e":"click","c":"link1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 2e94ea0..337bd28 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.0-test";
+Wicket.Ajax.baseUrl="wicket/page?0-1.IBehaviorListener.1-test";
/*]^]^>*/
</script>
-</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
+</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
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 d4733e7..bad07c0 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.0-test","e":"click","c":"test1"});;
+Wicket.Ajax.ajax({"pd":true,"u":"../page?0-1.IBehaviorListener.1-test","e":"click","c":"test1"});;
test1();;
test2();;
;});
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 583dab3..6a830c1 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.0-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 e76f875..951cbb8 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,7 +21,6 @@ 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;
@@ -55,28 +54,12 @@ public class AjaxLinkTest extends WicketTestCase
tester.assertRenderedPage(AjaxLinkPageToNormalPage.class);
Page page = tester.getLastRenderedPage();
Component ajaxLink = page.get("ajaxLink");
- AbstractAjaxBehavior behavior = (AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
+ AbstractAjaxBehavior behavior = ajaxLink.getBehaviors(AbstractAjaxBehavior.class).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
*/
@@ -87,7 +70,7 @@ public class AjaxLinkTest extends WicketTestCase
Page page = tester.getLastRenderedPage();
Component ajaxLink = page.get("pageLayout:pageLayout_body:ajaxLink");
- AbstractAjaxBehavior behavior = (AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
+ AbstractAjaxBehavior behavior = ajaxLink.getBehaviors(AbstractAjaxBehavior.class).get(0);
executeBehavior(behavior, "AjaxPage2-1_ExpectedResult.html");
}
@@ -113,7 +96,7 @@ public class AjaxLinkTest extends WicketTestCase
Page page = tester.getLastRenderedPage();
Component ajaxLink = page.get("border:border_body:ajaxLink");
- AbstractAjaxBehavior behavior = (AbstractAjaxBehavior)ajaxLink.getBehaviors().get(0);
+ AbstractAjaxBehavior behavior = ajaxLink.getBehaviors(AbstractAjaxBehavior.class).get(0);
executeBehavior(behavior, "AjaxLinkWithBorderPage-1ExpectedResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 68e0e20..9e817c5 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.0-border-border_body-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-border-border_body-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 2ae4ac2..57fb101 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.0-pageLayout-pageLayout_body-ajaxLink","e":"click","c":"ajaxLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-pageLayout-pageLayout_body-ajaxLink","e":"click","c":"ajaxLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 da82cff..1e89274 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,16 +20,12 @@ 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/ec4d4053/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..de59cf0 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>
+ <em><span>My Page</span></em>
<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/ec4d4053/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..8b901e0 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>
+ <em><span>Page A</span></em>
<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>
+ <em><span>Page A</span></em>
</wicket:link>
Page A
</wicket:extend></wicket:child>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..ff54390 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>
+ <em><span>Page B</span></em>
</wicket:link>
START<br>
<wicket:child><wicket:extend>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 f99e524..141f3bc 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.1-html","e":"click","c":"html1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.2-html","e":"click","c":"html1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 fdb0817..14029b2 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.0-hideable-hideLink","e":"click","c":"hideLink1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-hideable-hideLink","e":"click","c":"hideLink1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..956e879 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>
+<em><span wicket:id="prev">Prev</span></em><a wicket:id="nextNext" href="../page?0-1.ILinkListener-nextNext">NextNext</a>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..82a9222 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
</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/ec4d4053/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..aaa7aec 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>
+ <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em>
</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/ec4d4053/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..f22f175 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
</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/ec4d4053/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..64cc566 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>
+ <em><span wicket:id="pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></span></em>
</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>
+ <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>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..b199061 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
</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/ec4d4053/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..990448a 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>
+ <em><span wicket:id="pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></span></em>
</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/ec4d4053/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..89c8fa6 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>
+ <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em>
</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/ec4d4053/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..d62b4c9 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
</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/ec4d4053/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..aff4290 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></span></em>
</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/ec4d4053/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..19da0b3 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>
+ <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">3-4</span></span></em>
</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/ec4d4053/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..c0b755f 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></span></em>
</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/ec4d4053/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..35ed222 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>
+ <em><span wicket:id="pageLink" title="Go to page 7"><span wicket:id="pageNumber">13-14</span></span></em>
</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>
+ <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>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..5246d88 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1-2</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1-2</span></span></em>
</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/ec4d4053/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..5920da8 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>
+ <em><span wicket:id="pageLink" title="Go to page 4"><span wicket:id="pageNumber">7-8</span></span></em>
</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/ec4d4053/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..cbb154b 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>
+ <em><span wicket:id="pageLink" title="Go to page 3"><span wicket:id="pageNumber">5-6</span></span></em>
</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/ec4d4053/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..6f406a7 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
</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/ec4d4053/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..6bf77c3 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>
+ <em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em>
</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/ec4d4053/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..e743b29 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
</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/ec4d4053/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..8bce927 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>
+ <em><span wicket:id="pageLink" title="Go to page 7"><span wicket:id="pageNumber">7</span></span></em>
</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>
+ <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>
</wicket:panel></span>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..2e6989c 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>
+ <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="navigation" class="goto">
- <span wicket:id="pageLink" title="Go to page 1"><em><span wicket:id="pageNumber">1</span></em></span>
+ <em><span wicket:id="pageLink" title="Go to page 1"><span wicket:id="pageNumber">1</span></span></em>
</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/ec4d4053/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..437ace9 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>
+ <em><span wicket:id="pageLink" title="Go to page 4"><span wicket:id="pageNumber">4</span></span></em>
</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/ec4d4053/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..e2325b5 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>
+ <em><span wicket:id="pageLink" title="Go to page 3"><span wicket:id="pageNumber">3</span></span></em>
</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/ec4d4053/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 4875048..f3a9c4f 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<String>();
+ List<String> list = new ArrayList<>();
list.add("one");
list.add("two");
list.add("three");
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..230ba4a 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"><em><span wicket:id="pageLink" title="Go to page 2"><span wicket:id="pageNumber">2</span></span></em></li></ul>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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..5df58a0 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("em").addExpectedChild(new Tag(
+ "span").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/ec4d4053/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 d722d6c..27643f3 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.0-provider-ajaxRefresh","e":"click","c":"ajaxRefresh1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-provider-ajaxRefresh","e":"click","c":"ajaxRefresh1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 4b55aca..dc110c8 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.0-add","e":"click","c":"add1"});;
+Wicket.Ajax.ajax({"u":"../page?0-1.IBehaviorListener.1-add","e":"click","c":"add1"});;
;});
/*]]>*/
</script>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ec4d4053/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 1ad587c..b0270d9 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 = (AbstractAjaxBehavior)toggle.getBehaviors().get(0);
+ AbstractAjaxBehavior toggleBehavior = toggle.getBehaviors(AbstractAjaxBehavior.class).get(0);
// check for correct rendering
tester.assertInvisible("ajaxLabel:editor");
@@ -106,12 +106,6 @@ 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.*"));
}
/**