You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by co...@apache.org on 2004/02/01 20:32:33 UTC
cvs commit: cocoon-2.1/src/java/org/apache/cocoon/generation JXTemplateGenerator.java
coliver 2004/02/01 11:32:33
Modified: src/java/org/apache/cocoon/generation
JXTemplateGenerator.java
Log:
Fixed typo in error message and added fix for bugzilla 26086
Revision Changes Path
1.35 +11 -13 cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- JXTemplateGenerator.java 31 Jan 2004 15:57:32 -0000 1.34
+++ JXTemplateGenerator.java 1 Feb 2004 19:32:33 -0000 1.35
@@ -382,14 +382,14 @@
};
private static final Iterator NULL_ITER = new Iterator() {
- public boolean hasNext() {
- return true;
- }
- public Object next() {
- return null;
- }
- public void remove() {
- }
+ public boolean hasNext() {
+ return true;
+ }
+ public Object next() {
+ return null;
+ }
+ public void remove() {
+ }
};
private static final Locator NULL_LOCATOR = new LocatorImpl();
@@ -1195,8 +1195,6 @@
int ch;
boolean inExpr = false;
boolean xpath = false;
- // int line = this.location.getLineNumber();
- // int column = this.location.getColumnNumber();
try {
top: while ((ch = in.read()) != -1) {
// column++;
@@ -1223,7 +1221,7 @@
}
} catch (Exception exc) {
throw new SAXParseException(exc.getMessage(),
- location,
+ this.location,
exc);
}
substitutions.add(new Expression(str,
@@ -3823,7 +3821,7 @@
doc.next, doc.endDocument);
} catch (Exception exc) {
throw new SAXParseException(
- "Exception occured in imported template "
+ "Exception occurred in imported template "
+ uri + ": "+ exc.getMessage(),
ev.location, exc);
}