aboutsummaryrefslogtreecommitdiffstats
path: root/taskdefs
diff options
context:
space:
mode:
authorAndy Clement <aclement@pivotal.io>2018-02-05 11:00:34 -0800
committerAndy Clement <aclement@pivotal.io>2018-02-05 11:00:34 -0800
commit68ed282a061b875e0a5be4e88d10f76d7d9a0bbf (patch)
treeff63e46e2fd86a4cb274214c9d0a3d2a83b90aed /taskdefs
parentd6378eeec8c1928462f8561d23fafda5012b790c (diff)
downloadaspectj-68ed282a061b875e0a5be4e88d10f76d7d9a0bbf.tar.gz
aspectj-68ed282a061b875e0a5be4e88d10f76d7d9a0bbf.zip
JDT Upgrade for 1.9.0.rc3
Diffstat (limited to 'taskdefs')
-rw-r--r--taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java47
1 files changed, 22 insertions, 25 deletions
diff --git a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
index 48957fabd..e5e726add 100644
--- a/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
+++ b/taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java
@@ -1425,9 +1425,6 @@ public class AjcTask extends MatchingTask {
/**
* Execute in another process using the same JDK and the base directory of the project. XXX correct?
- *
- * @param args
- * @return
*/
protected int execInOtherVM(String[] args) {
try {
@@ -1437,28 +1434,28 @@ public class AjcTask extends MatchingTask {
Project.MSG_WARN);
// replace above two lines with what follows as an aid to debugging when running the unit tests....
- // LogStreamHandler handler = new LogStreamHandler(this,
- // Project.MSG_INFO, Project.MSG_WARN) {
- //
- // ByteArrayOutputStream baos = new ByteArrayOutputStream();
- // /* (non-Javadoc)
- // * @see org.apache.tools.ant.taskdefs.PumpStreamHandler#createProcessOutputPump(java.io.InputStream,
- // java.io.OutputStream)
- // */
- // protected void createProcessErrorPump(InputStream is,
- // OutputStream os) {
- // super.createProcessErrorPump(is, baos);
- // }
- //
- // /* (non-Javadoc)
- // * @see org.apache.tools.ant.taskdefs.LogStreamHandler#stop()
- // */
- // public void stop() {
- // byte[] written = baos.toByteArray();
- // System.err.print(new String(written));
- // super.stop();
- // }
- // };
+// LogStreamHandler handler = new LogStreamHandler(this, Project.MSG_INFO, Project.MSG_WARN) {
+//
+// ByteArrayOutputStream baos = new ByteArrayOutputStream();
+//
+// /*
+// * @see
+// * org.apache.tools.ant.taskdefs.PumpStreamHandler#createProcessOutputPump(java.
+// * io.InputStream, java.io.OutputStream)
+// */
+// protected void createProcessErrorPump(InputStream is, OutputStream os) {
+// super.createProcessErrorPump(is, baos);
+// }
+//
+// /*
+// * @see org.apache.tools.ant.taskdefs.LogStreamHandler#stop()
+// */
+// public void stop() {
+// byte[] written = baos.toByteArray();
+// System.err.print(new String(written));
+// super.stop();
+// }
+// };
Execute exe = new Execute(handler);
exe.setAntRun(project);