From 9739843b0833c2b0dbcc7fa0e88c8727f3bd8aed Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 6 Jan 2002 01:55:30 +0000 Subject: [PATCH] Use adaptors logger rather than getting tasks logger via hackGetLogger git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270560 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/org/apache/tools/ant/taskdefs/compilers/Javac12.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java | 4 +--- .../todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java index 86f78d974..1989fcc02 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/Javac12.java @@ -34,7 +34,7 @@ public class Javac12 extends DefaultCompilerAdapter getLogger().debug( "Using classic compiler" ); Commandline cmd = setupJavacCommand( true ); - OutputStream logstr = new LogOutputStream( m_attributes.hackGetLogger(), true ); + OutputStream logstr = new LogOutputStream( getLogger(), true ); try { // Create an instance of the compiler, redirecting output to diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java index a0f0586e3..ada898dac 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/rmic/SunRmic.java @@ -31,9 +31,7 @@ public class SunRmic extends DefaultRmicAdapter // Create an instance of the rmic, redirecting output to // the project log - LogOutputStream logstr = - new LogOutputStream( getRmic().hackGetLogger(), true ); - + final LogOutputStream logstr = new LogOutputStream( getLogger(), true ); try { Class c = Class.forName( "sun.rmi.rmic.Main" ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java index 86f78d974..1989fcc02 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/compilers/Javac12.java @@ -34,7 +34,7 @@ public class Javac12 extends DefaultCompilerAdapter getLogger().debug( "Using classic compiler" ); Commandline cmd = setupJavacCommand( true ); - OutputStream logstr = new LogOutputStream( m_attributes.hackGetLogger(), true ); + OutputStream logstr = new LogOutputStream( getLogger(), true ); try { // Create an instance of the compiler, redirecting output to diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java index a0f0586e3..ada898dac 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/rmic/SunRmic.java @@ -31,9 +31,7 @@ public class SunRmic extends DefaultRmicAdapter // Create an instance of the rmic, redirecting output to // the project log - LogOutputStream logstr = - new LogOutputStream( getRmic().hackGetLogger(), true ); - + final LogOutputStream logstr = new LogOutputStream( getLogger(), true ); try { Class c = Class.forName( "sun.rmi.rmic.Main" );