You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by gl...@apache.org on 2005/07/24 19:07:01 UTC
cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/parse TemplateParser.java
glongman 2005/07/24 10:07:01
Modified: framework/src/java/org/apache/tapestry/parse
TemplateParser.java
Log:
attributeEndEvent() must be called before a possible error. That way Spindle has the required offest information to mark the error.
PR: TAPESTRY-432
Revision Changes Path
1.7 +5 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
Index: TemplateParser.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/TemplateParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TemplateParser.java 24 Jul 2005 12:13:34 -0000 1.6
+++ TemplateParser.java 24 Jul 2005 17:07:01 -0000 1.7
@@ -755,9 +755,10 @@
String attributeValue = new String(_templateData, attributeValueStart,
_cursor - attributeValueStart);
- addAttributeIfUnique(tagName, attributeName, attributeValue);
-
attributeEndEvent(_cursor);
+
+ addAttributeIfUnique(tagName, attributeName, attributeValue);
+
// Advance over the quote.
advance();
@@ -777,9 +778,9 @@
{
String attributeValue = new String(_templateData, attributeValueStart,
_cursor - attributeValueStart);
-
- addAttributeIfUnique(tagName, attributeName, attributeValue);
+
attributeEndEvent(_cursor);
+ addAttributeIfUnique(tagName, attributeName, attributeValue);
state = WAIT_FOR_ATTRIBUTE_NAME;
break;
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org
Re: cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/parse TemplateParser.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
This change is probably not in beta-3, but will be in beta-4.
On 24 Jul 2005 17:07:01 -0000, glongman@apache.org <gl...@apache.org> wrote:
> glongman 2005/07/24 10:07:01
>
> Modified: framework/src/java/org/apache/tapestry/parse
> TemplateParser.java
> Log:
> attributeEndEvent() must be called before a possible error. That way Spindle has the required offest information to mark the error.
>
> PR: TAPESTRY-432
>
> Revision Changes Path
> 1.7 +5 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
>
> Index: TemplateParser.java
> ===================================================================
> RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/TemplateParser.java,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- TemplateParser.java 24 Jul 2005 12:13:34 -0000 1.6
> +++ TemplateParser.java 24 Jul 2005 17:07:01 -0000 1.7
> @@ -755,9 +755,10 @@
> String attributeValue = new String(_templateData, attributeValueStart,
> _cursor - attributeValueStart);
>
> - addAttributeIfUnique(tagName, attributeName, attributeValue);
> -
> attributeEndEvent(_cursor);
> +
> + addAttributeIfUnique(tagName, attributeName, attributeValue);
> +
>
> // Advance over the quote.
> advance();
> @@ -777,9 +778,9 @@
> {
> String attributeValue = new String(_templateData, attributeValueStart,
> _cursor - attributeValueStart);
> -
> - addAttributeIfUnique(tagName, attributeName, attributeValue);
> +
> attributeEndEvent(_cursor);
> + addAttributeIfUnique(tagName, attributeName, attributeValue);
>
> state = WAIT_FOR_ATTRIBUTE_NAME;
> break;
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org
>
>
--
Howard M. Lewis Ship
Independent J2EE / Open-Source Java Consultant
Creator, Jakarta Tapestry
Creator, Jakarta HiveMind
Professional Tapestry training, mentoring, support
and project work. http://howardlewisship.com
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org