You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2015/07/01 18:43:00 UTC
wicket git commit: removed side effects on tag id from
MarkupInheritanceResolver#resolve
Repository: wicket
Updated Branches:
refs/heads/master dff8215e5 -> cfa36fbea
removed side effects on tag id from MarkupInheritanceResolver#resolve
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cfa36fbe
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cfa36fbe
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cfa36fbe
Branch: refs/heads/master
Commit: cfa36fbea6210aee1a70fdc79d9b78d7851c5a7a
Parents: dff8215
Author: Andrea Del Bene <“adelbene@apache.org”>
Authored: Wed Jul 1 18:42:38 2015 +0200
Committer: Andrea Del Bene <“adelbene@apache.org”>
Committed: Wed Jul 1 18:42:38 2015 +0200
----------------------------------------------------------------------
.../apache/wicket/markup/parser/filter/WicketTagIdentifier.java | 2 +-
.../apache/wicket/markup/resolver/MarkupInheritanceResolver.java | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/cfa36fbe/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
index d3d9ce8..c39faea 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
@@ -110,7 +110,7 @@ public final class WicketTagIdentifier extends AbstractMarkupFilter
if (Strings.isEmpty(wicketIdValue))
{
// Make it a Wicket component. Otherwise it would be RawMarkup
- tag.setId(namespace + "_" + tag.getName());
+ tag.setId(namespace + "_" + tag.getName() + getRequestUniqueId());
tag.setModified(true);
if (tag.isClose() == false)
http://git-wip-us.apache.org/repos/asf/wicket/blob/cfa36fbe/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
index dee46f7..fe39acc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
@@ -55,8 +55,7 @@ public class MarkupInheritanceResolver implements IComponentResolver
// It must be <wicket:extend...>
if (wicketTag.isExtendTag() || wicketTag.isChildTag())
{
- String id = wicketTag.getId() + container.getPage().getAutoIndex();
- wicketTag.setId(id);
+ String id = wicketTag.getId();
return new TransparentWebMarkupContainer(id);
}
}