From 0abcddef6c1923a276e7ac4fa4124e63a5751870 Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sun, 6 Jan 2002 02:04:42 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270572 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/org/apache/tools/ant/taskdefs/Javac.java   | 13 +++++++++----
 .../todo/org/apache/tools/ant/taskdefs/Javac.java   | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 7cfe1f027..1a67dadbe 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -380,6 +380,11 @@ public class Javac extends MatchingTask
         return compileClasspath;
     }
 
+    protected File getBaseDir()
+    {
+        return getBaseDirectory();
+    }
+
     /**
      * Get the additional implementation specific command line arguments.
      *
@@ -622,7 +627,7 @@ public class Javac extends MatchingTask
     public boolean isForkedJavac()
     {
         return !"false".equals( fork ) ||
-            "extJavac".equals( getProject().getProperty( "build.compiler" ) );
+            "extJavac".equals( getProperty( "build.compiler" ) );
     }
 
     /**
@@ -846,13 +851,13 @@ public class Javac extends MatchingTask
 
     private String determineCompiler()
     {
-        String compiler = getProject().getProperty( "build.compiler" );
+        Object compiler = getProperty( "build.compiler" );
 
         if( !"false".equals( fork ) )
         {
             if( compiler != null )
             {
-                if( isJdkCompiler( compiler ) )
+                if( isJdkCompiler( compiler.toString() ) )
                 {
                     final String message = "Since fork is true, ignoring build.compiler setting.";
                     getLogger().warn( message );
@@ -880,7 +885,7 @@ public class Javac extends MatchingTask
                 compiler = "classic";
             }
         }
-        return compiler;
+        return compiler.toString();
     }
 
     /**
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
index 7cfe1f027..1a67dadbe 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javac.java
@@ -380,6 +380,11 @@ public class Javac extends MatchingTask
         return compileClasspath;
     }
 
+    protected File getBaseDir()
+    {
+        return getBaseDirectory();
+    }
+
     /**
      * Get the additional implementation specific command line arguments.
      *
@@ -622,7 +627,7 @@ public class Javac extends MatchingTask
     public boolean isForkedJavac()
     {
         return !"false".equals( fork ) ||
-            "extJavac".equals( getProject().getProperty( "build.compiler" ) );
+            "extJavac".equals( getProperty( "build.compiler" ) );
     }
 
     /**
@@ -846,13 +851,13 @@ public class Javac extends MatchingTask
 
     private String determineCompiler()
     {
-        String compiler = getProject().getProperty( "build.compiler" );
+        Object compiler = getProperty( "build.compiler" );
 
         if( !"false".equals( fork ) )
         {
             if( compiler != null )
             {
-                if( isJdkCompiler( compiler ) )
+                if( isJdkCompiler( compiler.toString() ) )
                 {
                     final String message = "Since fork is true, ignoring build.compiler setting.";
                     getLogger().warn( message );
@@ -880,7 +885,7 @@ public class Javac extends MatchingTask
                 compiler = "classic";
             }
         }
-        return compiler;
+        return compiler.toString();
     }
 
     /**