vgritsenko 01/07/02 13:40:39
Modified: src/org/apache/cocoon/components/language/programming/java
Tag: cocoon_20_branch JavaLanguage.java Jikes.java
Log:
Fix Jikes error reporting
Revision Changes Path
No revision
No revision
1.2.2.1 +2 -1
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java
Index: JavaLanguage.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/JavaLanguage.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- JavaLanguage.java 2001/05/31 17:38:02 1.2
+++ JavaLanguage.java 2001/07/02 20:40:39 1.2.2.1
@@ -34,7 +34,7 @@
* The Java programming language processor
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Ricardo Rocha</a>
- * @version CVS $Revision: 1.2 $ $Date: 2001/05/31 17:38:02 $
+ * @version CVS $Revision: 1.2.2.1 $ $Date: 2001/07/02 20:40:39 $
*/
public class JavaLanguage extends CompiledProgrammingLanguage implements
ThreadSafe, Composable, Disposable {
@@ -192,6 +192,7 @@
int count = errors.size();
for (int i = 0; i < count; i++) {
CompilerError error = (CompilerError) errors.get(i);
+ if (i > 0) message.append("\n");
message.append("Line ");
message.append(error.getStartLine());
message.append(", column ");
1.1.1.1.2.1 +5 -4
xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java
Index: Jikes.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/programming/java/Jikes.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- Jikes.java 2001/05/09 20:49:57 1.1.1.1
+++ Jikes.java 2001/07/02 20:40:39 1.1.1.1.2.1
@@ -25,7 +25,7 @@
* This class wraps IBM's <i>Jikes</i> Java compiler
* NOTE: inspired by the Apache Jasper implementation.
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.1.1.1 $ $Date: 2001/05/09 20:49:57 $
+ * @version $Revision: 1.1.1.1.2.1 $ $Date: 2001/07/02 20:40:39 $
* @since 2.0
*/
@@ -198,6 +198,7 @@
private CompilerError parseError(String error) {
StringTokenizer tokens = new StringTokenizer(error, ":");
String file = tokens.nextToken();
+ if (file.length() == 1) file += ":" + tokens.nextToken();
String message = "";
String type = "";
int startline = 0;
@@ -211,14 +212,14 @@
endline = Integer.parseInt(tokens.nextToken());
endcolumn = Integer.parseInt(tokens.nextToken());
} catch (Exception e) {
- message = "Please make sure you have your JDK's rt.jar file in the
classpath. Jikes needs it to opperate.";
+ message = "Please ensure that you have your JDK's rt.jar listed in your
classpath. Jikes needs it to operate.";
type="error";
getLogger().error(message, e);
}
- if (! "".equals(message)) {
+ if ("".equals(message)) {
type = tokens.nextToken().trim().toLowerCase();
- message = tokens.nextToken().trim();
+ message = tokens.nextToken("\n").substring(1).trim();
}
return new CompilerError(file, type.equals("error"), startline,
startcolumn, endline, endcolumn, message);
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
