You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2005/10/06 11:43:05 UTC
svn commit: r306563 -
/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Author: vgritsenko
Date: Thu Oct 6 02:43:00 2005
New Revision: 306563
URL: http://svn.apache.org/viewcvs?rev=306563&view=rev
Log:
should fix something, thanks to somebody (was sitting on my hd waay too long :)
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java?rev=306563&r1=306562&r2=306563&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java Thu Oct 6 02:43:00 2005
@@ -57,7 +57,6 @@
import org.apache.cocoon.util.jxpath.NamespacesTablePointer;
import org.apache.cocoon.util.location.LocatedRuntimeException;
import org.apache.cocoon.util.location.Location;
-import org.apache.cocoon.util.location.LocationImpl;
import org.apache.cocoon.util.location.LocationUtils;
import org.apache.cocoon.xml.IncludeXMLConsumer;
import org.apache.cocoon.xml.NamespacesTable;
@@ -1115,10 +1114,12 @@
String raw, Attributes attrs)
throws SAXException {
super(location);
+
this.namespaceURI = namespaceURI;
this.localName = localName;
this.raw = raw;
this.qname = "{" + namespaceURI + "}" + localName;
+
StringBuffer buf = new StringBuffer();
int len = attrs.getLength();
for (int i = 0; i < len; i++) {
@@ -1128,6 +1129,7 @@
String type = attrs.getType(i);
String value = attrs.getValue(i);
StringReader in = new StringReader(value);
+
int ch;
buf.setLength(0);
boolean inExpr = false;
@@ -1180,6 +1182,7 @@
} catch (IOException ignored) {
ignored.printStackTrace();
}
+
if (inExpr) {
// unclosed #{} or ${}
String msg = "Unterminated " + (xpath ? "#" : "$") + "{";
@@ -1188,7 +1191,7 @@
if (buf.length() > 0) {
if (substEvents.size() == 0) {
- attributeEvents.add(new CopyAttribute(uri, local, qname, type, value));
+ attributeEvents.add(new CopyAttribute(uri, local, qname, type, buf.toString()));
} else {
substEvents.add(new Literal(buf.toString()));
attributeEvents.add(new SubstituteAttribute(uri, local, qname, type, substEvents));