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/03/03 15:27:28 UTC
svn commit: r514162 - in /incubator/wicket/trunk/wicket/src:
main/java/wicket/util/parse/metapattern/MetaPattern.java
main/java/wicket/util/parse/metapattern/parsers/TagNameParser.java
test/java/wicket/markup/parser/XmlPullParserTest.java
Author: jdonnerstag
Date: Sat Mar 3 06:27:27 2007
New Revision: 514162
URL: http://svn.apache.org/viewvc?view=rev&rev=514162
Log:
wicket-350: support "-" in xml name. E.g. <filter-mapping>
Modified:
incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java
incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/parsers/TagNameParser.java
incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/XmlPullParserTest.java
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java?view=diff&rev=514162&r1=514161&r2=514162
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/MetaPattern.java Sat Mar 3 06:27:27 2007
@@ -65,6 +65,7 @@
+ _SINGLE_QUOTED_STRING + ")";
private static final String _OPTIONAL_STRING = _STRING + "?";
private static final String _VARIABLE_NAME = "[A-Za-z_][A-Za-z0-9_]*";
+ private static final String _VARIABLE_NAME2 = "[A-Za-z_-][A-Za-z0-9_-]*";
private static final String _XML_ATTRIBUTE_NAME = "[A-Za-z_][A-Za-z0-9_-]*";
// Delimiters and punctuation
@@ -191,6 +192,9 @@
/** Constant for a variable name. */
public static final MetaPattern VARIABLE_NAME = new MetaPattern(_VARIABLE_NAME);
+
+ /** Constant for a variable name. */
+ public static final MetaPattern VARIABLE_NAME2 = new MetaPattern(_VARIABLE_NAME2);
/** Constant for a xml attribute name. */
public static final MetaPattern XML_ATTRIBUTE_NAME = new MetaPattern(_XML_ATTRIBUTE_NAME);
Modified: incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/parsers/TagNameParser.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/parsers/TagNameParser.java?view=diff&rev=514162&r1=514161&r2=514162
==============================================================================
--- incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/parsers/TagNameParser.java (original)
+++ incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern/parsers/TagNameParser.java Sat Mar 3 06:27:27 2007
@@ -35,7 +35,7 @@
private static final Group namespaceGroup = new Group(MetaPattern.VARIABLE_NAME);
/** Tag names must comply with variable name guidelines */
- private static final Group nameGroup = new Group(MetaPattern.VARIABLE_NAME);
+ private static final Group nameGroup = new Group(MetaPattern.VARIABLE_NAME2);
/** Pattern for tag names with optional namespace: (namespace:)?name */
private static final MetaPattern pattern = new MetaPattern(new MetaPattern[] {
Modified: incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/XmlPullParserTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/XmlPullParserTest.java?view=diff&rev=514162&r1=514161&r2=514162
==============================================================================
--- incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/XmlPullParserTest.java (original)
+++ incubator/wicket/trunk/wicket/src/test/java/wicket/markup/parser/XmlPullParserTest.java Sat Mar 3 06:27:27 2007
@@ -118,6 +118,10 @@
assertTrue(closeTag.isClose());
assertEquals("ns", closeTag.getNamespace());
assertEquals("tag", closeTag.getName());
+
+ parser.parse("<filter-mapping>");
+ tag = (XmlTag)parser.nextTag();
+ assertEquals("filter-mapping", tag.getName());
}
/**