Author: jdonnerstag
Date: Sun Nov 18 01:02:30 2007
New Revision: 596067
URL: http://svn.apache.org/viewvc?rev=596067&view=rev
Log:
allow to assign a wicket:id to wicket:enclosure
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java?rev=596067&r1=596066&r2=596067&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java
Sun Nov 18 01:02:30 2007
@@ -42,13 +42,22 @@
* org.apache.wicket.markup.MarkupStream,
org.apache.wicket.markup.ComponentTag)
*/
public boolean resolve(final MarkupContainer container, final
MarkupStream markupStream,
- final ComponentTag tag)
+ final ComponentTag tag)
{
if ((tag instanceof WicketTag) &&
((WicketTag)tag).isEnclosureTag())
{
- String id = "enclosure-" +
container.getPage().getAutoIndex();
- final Enclosure enclosure = new Enclosure(id, tag
-
.getString(EnclosureHandler.CHILD_ATTRIBUTE));
+ CharSequence wicketId = tag.getString("wicket:id");
+ String id = null;
+ if (wicketId != null)
+ {
+ id = wicketId.toString();
+ }
+ if (id == null)
+ {
+ id = "enclosure-" +
container.getPage().getAutoIndex();
+ }
+ final Enclosure enclosure = new Enclosure(id,
+
tag.getString(EnclosureHandler.CHILD_ATTRIBUTE));
container.autoAdd(enclosure, markupStream);
// Yes, we handled the tag
