Updated Branches: refs/heads/wicket-1.5.x 0b8761f5a -> c966ce218
WICKET-5162 InlineEnclosure markup id could collide in the final page markup Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c966ce21 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c966ce21 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c966ce21 Branch: refs/heads/wicket-1.5.x Commit: c966ce2181db0f594d08336e62c7019563588131 Parents: 0b8761f Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Mon Apr 29 10:04:46 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Mon Apr 29 10:04:46 2013 +0200 ---------------------------------------------------------------------- .../markup/html/internal/InlineEnclosure.java | 5 --- .../parser/filter/InlineEnclosureHandler.java | 2 +- .../markup/html/internal/AjaxEnclosureTest.java | 6 ++-- .../InlineEnclosurePageExpectedResult_1.html | 14 +++++----- .../InlineEnclosurePageExpectedResult_2.html | 22 +++++++------- .../InlineEnclosurePanelPageExpectedResult.html | 4 +- ...reWithWicketMessagePage_invisible_expected.html | 2 +- ...sureWithWicketMessagePage_visible_expected.html | 2 +- .../markup/html/internal/TogglePageTest.java | 6 ++-- 9 files changed, 29 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java index c63bb96..cd94aa7 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/InlineEnclosure.java @@ -18,8 +18,6 @@ package org.apache.wicket.markup.html.internal; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.parser.filter.InlineEnclosureHandler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** @@ -39,8 +37,6 @@ public class InlineEnclosure extends Enclosure { private static final long serialVersionUID = 1L; - private static final Logger log = LoggerFactory.getLogger(InlineEnclosure.class); - /** * Construct. * @@ -53,7 +49,6 @@ public class InlineEnclosure extends Enclosure // ensure that the Enclosure is ready for ajax updates setOutputMarkupPlaceholderTag(true); - setMarkupId(getId()); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java index 9166822..78ab3db 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/InlineEnclosureHandler.java @@ -64,7 +64,7 @@ public final class InlineEnclosureHandler extends AbstractMarkupFilter private Stack<ComponentTag> enclosures; /** - * InlinceEnclosures are not removed after render as other auto-components, thus they have to + * InlineEnclosures are not removed after render as other auto-components, thus they have to * have a stable id. */ private int counter; http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java index 7093d6d..f7e30a1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java @@ -32,11 +32,11 @@ import org.junit.Test; */ public class AjaxEnclosureTest extends WicketTestCase { - private final String inlineEnclosureIdPrefix = "InlineEnclosure-"; + private final String inlineEnclosureIdPrefix = "InlineEnclosure_"; private final String inlineEnclosureHiddenPattern = "<div id=\"" + inlineEnclosureIdPrefix + - "0\" style=\"display:none\"></div>"; + "\\w+\" style=\"display:none\"></div>"; private final String inlineEnclosureVisiblePattern = "<div id=\"" + inlineEnclosureIdPrefix + - "0\">"; + "\\w+\">"; /** http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html index f24385e..d142f64 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_1.html @@ -1,9 +1,9 @@ <html> <body> -<span id="InlineEnclosure-0"> <span>Test Label 1</span> </span> +<span id="InlineEnclosure_01"> <span>Test Label 1</span> </span> -<div id="InlineEnclosure-1"> +<div id="InlineEnclosure_12"> <table> <tr> <td><span>Test Label 2</span></td> @@ -11,9 +11,9 @@ </table> </div> -<span id="InlineEnclosure-2" style="display:none"></span> +<span id="InlineEnclosure_23" style="display:none"></span> -<div id="InlineEnclosure-3"> +<div id="InlineEnclosure_34"> <table> <tr> <td><span>Test Label 4</span></td> @@ -36,11 +36,11 @@ </table> </div> -<div id="InlineEnclosure-4"><span> <span>Test Label 8</span> </span></div> +<div id="InlineEnclosure_45"><span> <span>Test Label 8</span> </span></div> -<div id="InlineEnclosure-5"><span>Test Label 9</span></div> +<div id="InlineEnclosure_56"><span>Test Label 9</span></div> -<div id="customInlineEnclosureId"><span>Test Label 10</span> +<div id="customInlineEnclosureId7"><span>Test Label 10</span> </div> http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html index ecb6125..15446f6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePageExpectedResult_2.html @@ -2,8 +2,8 @@ <body> <!-- nested inline enclosures with separate child depths. --> -<div id="InlineEnclosure-0"><span>Test Label 1</span> - <div id="InlineEnclosure-1"> +<div id="InlineEnclosure_01"><span>Test Label 1</span> + <div id="InlineEnclosure_12"> <table> <tr> <td><span>Test Label 2</span></td> @@ -13,15 +13,15 @@ </div> <!-- nested inline enclosures with same child depth. --> -<div id="InlineEnclosure-2"> - <div id="InlineEnclosure-3"> +<div id="InlineEnclosure_23"> + <div id="InlineEnclosure_34"> <span>Test Label 3</span> <span>Test Label 4</span> </div> </div> <!-- enclosure tag nested inside inline enclosure with separate child depths. --> -<div id="InlineEnclosure-4"> <span>Test Label 5</span> +<div id="InlineEnclosure_45"> <span>Test Label 5</span> <table> <tr> @@ -34,7 +34,7 @@ </div> <!-- enclosure tag nested inside inline enclosure with same child depth. --> -<div id="InlineEnclosure-5"> +<div id="InlineEnclosure_56"> <table> <tr> @@ -49,7 +49,7 @@ <!-- inline enclosure nested inside enclosure tag with separate child depths. --> - <div id="InlineEnclosure-6"> <span>Test Label 9</span> + <div id="InlineEnclosure_67"> <span>Test Label 9</span> <table> <tr> <td><span>Test Label 10</span></td> @@ -59,7 +59,7 @@ <!-- inline enclosure nested inside enclosure tag with same child depth. --> -<div id="InlineEnclosure-7"> +<div id="InlineEnclosure_78"> <table> <tr> @@ -74,7 +74,7 @@ <!-- inline enclosure nested inside enclosure tag with same child depth inside a wicket container. --> - <div id="InlineEnclosure-8"> + <div id="InlineEnclosure_89"> <div> <table> <tr> @@ -90,8 +90,8 @@ <!-- nested inline enclosures without explicitly determining children --> -<div id="InlineEnclosure-9"> - <div id="InlineEnclosure-10"> +<div id="InlineEnclosure_9a"> + <div id="InlineEnclosure_10b"> <table> <tr> <td> http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html index e1f3a5f..2ef221a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosurePanelPageExpectedResult.html @@ -1,13 +1,13 @@ <html> <body> - <div id="InlineEnclosure-0"> + <div id="InlineEnclosure_01"> <div> <div> This is a simple test panel. This contains a label and an inline enclosure with a label inside it. <span>Inside InlineEnclosure and Panel: hello world</span> - <div id="InlineEnclosure-0"> + <div id="InlineEnclosure_02"> <span>Inside InlineEnclosure, Panel and another InlineEnclosure: hello again.</span> </div> http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html index 6252a42..43e6cd8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_invisible_expected.html @@ -21,6 +21,6 @@ <title>Wicket 4520</title> </head> <body> - <div id="_message_attr_" style="display:none"></div> + <div id="id__message__attr__1" style="display:none"></div> </body> </html> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html index 62d9d09..ba2d3da 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage_visible_expected.html @@ -21,7 +21,7 @@ <title>Wicket 4520</title> </head> <body> - <div id="_message_attr_" title="Some title"> + <div id="id__message__attr__1" title="Some title"> <div>Inner div <span>A Label</span> </div> http://git-wip-us.apache.org/repos/asf/wicket/blob/c966ce21/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java index 05fb167..cfa5220 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java @@ -136,13 +136,13 @@ public class TogglePageTest extends WicketTestCase */ public void testInlineEnclosureAjaxPage() { - String inlineEnclosureIdPrefix = "InlineEnclosure-"; + String inlineEnclosureIdPrefix = "InlineEnclosure_"; String inlineEnclosureHiddenPattern = "<tr id=\"" + inlineEnclosureIdPrefix + - "0\" style=\"display:none\"></tr>"; + "\\w+\" style=\"display:none\"></tr>"; String inlineEnclosureVisiblePattern = "<tr bgcolor=\"red\" id=\"" + - inlineEnclosureIdPrefix + "0\">"; + inlineEnclosureIdPrefix + "\\w+\">"; { // On
