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/08/14 11:41:40 UTC
[11/37] git commit: WICKET-5303 id for toolbar is now stable to
easier testing
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/05a7eec0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/05a7eec0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/05a7eec0
Branch: refs/heads/5299-ajax-strategy
Commit: 05a7eec0c0310b36af08d32a43aaee50e72ce60b
Parents: a9e2f4e
Author: svenmeier <sv...@meiers.net>
Authored: Tue Aug 6 15:25:02 2013 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Tue Aug 6 15:25:02 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/05a7eec0/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/05a7eec0/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 4eab5a8..a37fd4b 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.