You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by gi...@locus.apache.org on 2000/09/08 20:19:33 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/programming/java Javac.java
giacomo 00/09/08 11:19:32
Modified: src/org/apache/cocoon/components/language/programming/java
Tag: xml-cocoon2 Javac.java
Log:
Fix to correct error parsing.
This patch was submitted by Sebastien Sahuc
Revision Changes Path
No revision
No revision
1.1.2.6 +8 -3 xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Javac.java
Index: Javac.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/programming/java/Attic/Javac.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Javac.java 2000/08/31 15:57:53 1.1.2.5
+++ Javac.java 2000/09/08 18:19:32 1.1.2.6
@@ -16,7 +16,7 @@
* This class wraps the Sun's Javac Compiler.
*
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version $Revision: 1.1.2.5 $ $Date: 2000/08/31 15:57:53 $
+ * @version $Revision: 1.1.2.6 $ $Date: 2000/09/08 18:19:32 $
* @since 2.0
*/
@@ -127,7 +127,7 @@
int startcolumn = pointer.indexOf("^");
int endcolumn = context.indexOf(" ", startcolumn);
if (endcolumn == -1) endcolumn = context.length();*/
-
+
return new CompilerError(error);
}
@@ -177,7 +177,12 @@
if (file.length() == 1) file += ":" + tokens.nextToken();
int line = Integer.parseInt(tokens.nextToken());
- tokens = new StringTokenizer(tokens.nextToken().trim(), "\n");
+ String last = tokens.nextToken();
+ // In case the message contains ':', it should be reassembled
+ while (tokens.hasMoreElements()) {
+ last += tokens.nextToken();
+ }
+ tokens = new StringTokenizer(last.trim(), "\n");
String message = tokens.nextToken();
String context = tokens.nextToken();
String pointer = tokens.nextToken();