You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2007/04/11 21:14:22 UTC
svn commit: r527614 -
/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
Author: ivaynberg
Date: Wed Apr 11 12:14:21 2007
New Revision: 527614
URL: http://svn.apache.org/viewvc?view=rev&rev=527614
Log:
WICKET-460 allow vanilla html alternatives to wicket namespaced tags such as wicket:extend
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java?view=diff&rev=527614&r1=527613&r2=527614
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java Wed Apr 11 12:14:21 2007
@@ -27,6 +27,7 @@
import org.apache.wicket.markup.WicketTag;
import org.apache.wicket.markup.parser.AbstractMarkupFilter;
import org.apache.wicket.markup.parser.XmlTag;
+import org.apache.wicket.util.string.Strings;
/**
@@ -85,6 +86,18 @@
}
final String namespace = this.markup.getWicketNamespace();
+
+ // convert tags of form <tag wicket:id=":bar"> to <wicket:bar>
+ final String wicketidAttr = namespace + ":id";
+ final String wicketid = xmlTag.getAttributes().getString(wicketidAttr);
+ if (!Strings.isEmpty(wicketid) && ":".equals(wicketid.substring(0, 1)))
+ {
+ xmlTag = xmlTag.mutable();
+ xmlTag.setNamespace(namespace);
+ xmlTag.setName(wicketid.substring(1));
+ xmlTag.getAttributes().remove(wicketidAttr);
+ }
+
// Identify tags with Wicket namespace
ComponentTag tag;