You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by wh...@apache.org on 2004/11/24 13:45:07 UTC
cvs commit: ws-axis/c/tools/trace/org/apache/axis/tracetool AddEntryAndExitTrace.java Tracer.java
whitlock 2004/11/24 04:45:07
Modified: c/tools/trace/org/apache/axis/tracetool
AddEntryAndExitTrace.java Tracer.java
Log:
Correct newlines in the generated source code
Revision Changes Path
1.5 +3 -3 ws-axis/c/tools/trace/org/apache/axis/tracetool/AddEntryAndExitTrace.java
Index: AddEntryAndExitTrace.java
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/trace/org/apache/axis/tracetool/AddEntryAndExitTrace.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AddEntryAndExitTrace.java 11 Nov 2004 10:51:35 -0000 1.4
+++ AddEntryAndExitTrace.java 24 Nov 2004 12:45:07 -0000 1.5
@@ -134,7 +134,7 @@
FilePart fp = (FilePart) (it.next());
if (fp.getType() == FilePart.METHOD) {
MethodPart mp = (MethodPart) fp;
- outputFile.write(mp.getOriginalSignature() + "{");
+ outputFile.writeTrace(mp.getOriginalSignature() + "{");
outputFile.traceEntry(mp.getSignature());
BodyPart[] bps = mp.getBodyParts();
@@ -143,7 +143,7 @@
for (int i = 0; i < bps.length-1; i++) if (bps[i].isCatch()) catchCount++;
for (int i = 0; i < bps.length; i++) {
- outputFile.write(bps[i].getCodeFragment());
+ outputFile.writeTrace(bps[i].getCodeFragment());
if (bps[i].isReturn()) {
if (returnCount>1) returnIndex++;
outputFile.traceExit(bps[i].getReturnValue(), returnIndex);
@@ -156,7 +156,7 @@
}
}
} else {
- outputFile.write(fp.toString());
+ outputFile.writeTrace(fp.toString());
}
}
}
1.11 +20 -7 ws-axis/c/tools/trace/org/apache/axis/tracetool/Tracer.java
Index: Tracer.java
===================================================================
RCS file: /home/cvs/ws-axis/c/tools/trace/org/apache/axis/tracetool/Tracer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Tracer.java 22 Nov 2004 16:10:10 -0000 1.10
+++ Tracer.java 24 Nov 2004 12:45:07 -0000 1.11
@@ -65,7 +65,7 @@
for (int i = 1; i < depth; i++)
prefix += "../";
- write(
+ writeTrace(
"#ifdef ENABLE_AXISTRACE\n"
+ "/* TRACE ADDED BY THE AXISCPP TRACE TOOL */\n"
+ "#include \""
@@ -106,7 +106,7 @@
line += getTypeParms(parms[i]);
line += ");\t" + SIGNATURE + "\n";
line += "\t#endif\n";
- write(line);
+ writeTrace(line);
flush();
}
@@ -138,7 +138,7 @@
// now print out the return line itself
line += "\t\treturn;\n";
line += "\t}\n";
- write(line);
+ writeTrace(line);
flush();
}
@@ -188,7 +188,7 @@
line += "\t\t\treturn " + value + ";\n";
line += "\t\t#endif\n";
line += "\t}\n";
- write(line);
+ writeTrace(line);
flush();
}
@@ -209,12 +209,25 @@
+ getTypeParms(value);
line += ");\t" + SIGNATURE + "\n";
line += "\t#endif\n";
- write(line);
+ writeTrace(line);
flush();
}
- public void write(String s) throws IOException {
- super.write(s);
+ /*
+ * This method is careful to get the line separators because other
+ * other methods have been careless assuming that the line separator
+ * is always only \n, whereas it maybe \r\n.
+ */
+ public void writeTrace(String s) throws IOException {
+ if (s.startsWith("\n") || s.startsWith("\r"))
+ super.newLine();
+ StringTokenizer st = new StringTokenizer(s,"\n\r");
+ while (st.hasMoreTokens()) {
+ super.write(st.nextToken());
+ if (st.hasMoreTokens()) super.newLine();
+ }
+ if (s.endsWith("\n") || s.endsWith("\r"))
+ super.newLine();
if (AddEntryAndExitTrace.verbose)
System.out.print(s);
}