You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2007/08/11 10:55:06 UTC
svn commit: r564875 -
/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
Author: jdonnerstag
Date: Sat Aug 11 01:55:05 2007
New Revision: 564875
URL: http://svn.apache.org/viewvc?view=rev&rev=564875
Log:
make sure that automatically created containers have unique ids
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java?view=diff&rev=564875&r1=564874&r2=564875
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java Sat Aug 11 01:55:05 2007
@@ -24,8 +24,8 @@
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
- * Detect <wicket:extend> and <wicket:child> tags,
- * which are silently ignored, because they have already been processed.
+ * Detect <wicket:extend> and <wicket:child> tags, which are
+ * silently ignored, because they have already been processed.
*
* @author Juergen Donnerstag
*/
@@ -58,19 +58,20 @@
if (tag instanceof WicketTag)
{
final WicketTag wicketTag = (WicketTag)tag;
-
+ final String id = wicketTag.getId() + container.getPage().getAutoIndex();
+
// It must be <wicket:extend...>
if (wicketTag.isExtendTag())
{
- container.autoAdd(new TransparentWebMarkupContainer(wicketTag.getId()), markupStream);
- return true;
+ container.autoAdd(new TransparentWebMarkupContainer(id), markupStream);
+ return true;
}
-
+
// It must be <wicket:child...>
if (wicketTag.isChildTag())
{
- container.autoAdd(new TransparentWebMarkupContainer(wicketTag.getId()), markupStream);
- return true;
+ container.autoAdd(new TransparentWebMarkupContainer(id), markupStream);
+ return true;
}
}
// We were not able to handle the componentId
@@ -78,13 +79,13 @@
}
/**
- * This is a WebMarkupContainer, except that it is transparent for
- * it child components.
+ * This is a WebMarkupContainer, except that it is transparent for it child
+ * components.
*/
private static class TransparentWebMarkupContainer extends WebMarkupContainer
{
private static final long serialVersionUID = 1L;
-
+
/**
* @param id
*/