Author: hlship
Date: Fri Nov 11 19:02:19 2005
New Revision: 332720
URL: http://svn.apache.org/viewcvs?rev=332720&view=rev
Log:
TAPESTRY-359: Localization directive cuts trailing space
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
jakarta/tapestry/trunk/status.xml
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java?rev=332720&r1=332719&r2=332720&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/parse/TemplateParser.java
Fri Nov 11 19:02:19 2005
@@ -81,7 +81,7 @@
* <p>
* The parser supports <em>invisible localization</em>: The parser
recognizes HTML of the
* form: <code><span key="<i>value</i>"> ... </span></code>
and converts them
- * into a [EMAIL PROTECTED] TokenType#LOCALIZATION}token. You may also
specifify a <code>raw</code>
+ * into a [EMAIL PROTECTED] TokenType#LOCALIZATION} token. You may also
specifify a <code>raw</code>
* attribute ... if the value is <code>true</code>, then the localized
value is sent to the
* client without filtering, which is appropriate if the value has any
markup that should not
* be escaped.
@@ -115,7 +115,7 @@
public static final String LOCALIZATION_KEY_ATTRIBUTE_NAME = "key";
/**
- * Used with [EMAIL PROTECTED] #LOCALIZATION_KEY_ATTRIBUTE_NAME}to
indicate a string that should be
+ * Used with [EMAIL PROTECTED] #LOCALIZATION_KEY_ATTRIBUTE_NAME} to
indicate a string that should be
* rendered "raw" (without escaping HTML). If not specified, defaults to
"false". The value must
* equal "true" (caselessly).
*
@@ -180,7 +180,7 @@
private Resource _resourceLocation;
/**
- * Shared instance of [EMAIL PROTECTED] Location}used by all [EMAIL
PROTECTED] TextToken}instances in the template.
+ * Shared instance of [EMAIL PROTECTED] Location} used by all [EMAIL
PROTECTED] TextToken} instances in the template.
*/
private Location _templateLocation;
@@ -827,9 +827,9 @@
}
else
{
- // Cursor is at the closing carat, advance over it and any
whitespace.
+ // Cursor is at the closing carat, advance over it.
advance();
- advanceOverWhitespace();
+ // TAPESTRY-359: *don't* skip whitespace
}
// End any open block.
Modified:
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?rev=332720&r1=332719&r2=332720&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
(original)
+++
jakarta/tapestry/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
Fri Nov 11 19:02:19 2005
@@ -530,7 +530,7 @@
assertTokenCount(tokens, 3);
assertTextToken(tokens[0], 0, 62);
assertLocalizationToken(tokens[1], "empty.localization", null, 3);
- assertTextToken(tokens[2], 97, 122);
+ assertTextToken(tokens[2], 95, 122);
}
/**
Modified: jakarta/tapestry/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=332720&r1=332719&r2=332720&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Fri Nov 11 19:02:19 2005
@@ -61,6 +61,7 @@
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-734">Rollover component
parameter names are wrong</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-298">Wrong
org.apache.tapestry.specification-path in javadoc</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-302">Palette component
select arrows appear enabled on load</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-359">Localization
directive cuts trailing space</action>
</release>
<release version="4.0-beta-12" date="Oct 30 2005">
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-718">Asset injection
makes assets appear as null inside finishLoad()</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
