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 16:05:37 UTC
svn commit: r514166 - in
/incubator/wicket/trunk/wicket/src/main/java/wicket/util/parse/metapattern:
MetaPattern.java parsers/TagNameParser.java
Author: jdonnerstag
Date: Sat Mar 3 07:05:36 2007
New Revision: 514166
URL: http://svn.apache.org/viewvc?view=rev&rev=514166
Log:
aligned with jbq's naming suggestion which is better
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
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=514166&r1=514165&r2=514166
==============================================================================
--- 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 07:05:36 2007
@@ -65,8 +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_-]*";
+ private static final String _XML_NAME = "[A-Za-z_][A-Za-z0-9_-]*";
// Delimiters and punctuation
/** Constant for whitespace. */
@@ -194,10 +193,10 @@
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);
+ public static final MetaPattern XML_ELEMENT_NAME = new MetaPattern(_XML_NAME);
/** Constant for a xml attribute name. */
- public static final MetaPattern XML_ATTRIBUTE_NAME = new MetaPattern(_XML_ATTRIBUTE_NAME);
+ public static final MetaPattern XML_ATTRIBUTE_NAME = new MetaPattern(_XML_NAME);
/** Constant for perl interpolation. */
public static final MetaPattern PERL_INTERPOLATION = new MetaPattern("$\\{" + _VARIABLE_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=514166&r1=514165&r2=514166
==============================================================================
--- 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 07:05:36 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_NAME2);
+ private static final Group nameGroup = new Group(MetaPattern.XML_ELEMENT_NAME);
/** Pattern for tag names with optional namespace: (namespace:)?name */
private static final MetaPattern pattern = new MetaPattern(new MetaPattern[] {