Updated Branches: refs/heads/wicket-6.x 6eaa945b3 -> a0868b017
WICKET-5303 id for toolbar is now stable to easier testing Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a0868b01 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a0868b01 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a0868b01 Branch: refs/heads/wicket-6.x Commit: a0868b0179183ba31dafcd0b3b198a6dff2279c2 Parents: 6eaa945 Author: svenmeier <s...@meiers.net> Authored: Tue Aug 6 15:25:13 2013 +0200 Committer: svenmeier <s...@meiers.net> Committed: Tue Aug 6 15:25:13 2013 +0200 ---------------------------------------------------------------------- .../markup/html/repeater/data/table/AbstractToolbar.java | 5 +---- .../markup/html/repeater/data/table/DataTable.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a0868b01/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java index 5bc737d..2003d34 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/AbstractToolbar.java @@ -31,9 +31,6 @@ public abstract class AbstractToolbar extends Panel { private static final long serialVersionUID = 1L; - /** Counter used for generating unique component ids. */ - private static long counter = 0; - private final DataTable<?, ?> table; /** @@ -46,7 +43,7 @@ public abstract class AbstractToolbar extends Panel */ public AbstractToolbar(final IModel<?> model, final DataTable<?, ?> table) { - super(String.valueOf(counter++).intern(), model); + super(table.newToolbarId(), model); this.table = table; } http://git-wip-us.apache.org/repos/asf/wicket/blob/a0868b01/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java index 6c77f65..496f083 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTable.java @@ -113,6 +113,8 @@ public class DataTable<T, S> extends Panel implements IPageableItems private final Caption caption; + private long toolbarIdCounter; + /** * Constructor * @@ -437,6 +439,15 @@ public class DataTable<T, S> extends Panel implements IPageableItems } /** + * @see AbstractToolbar + */ + String newToolbarId() + { + toolbarIdCounter++; + return String.valueOf(toolbarIdCounter).intern(); + } + + /** * This class acts as a repeater that will contain the toolbar. It makes sure that the table row * group (e.g. thead) tags are only visible when they contain rows in accordance with the HTML * specification.
