From 9ddadd7146b7a8156d27eacc80459cc0b95873c0 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Thu, 14 Dec 2000 15:22:47 +0000 Subject: [PATCH] Make AntEater compile. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268355 13f79535-47bb-0310-9956-ffa450edef68 --- .../source/main/org/apache/ant/Project.java | 12 ++++++------ .../source/main/org/apache/ant/ProjectBuilder.java | 6 +++--- .../source/main/org/apache/ant/TaskManager.java | 14 +++++++------- .../main/org/apache/ant/cli/CLIFrontEnd.java | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/proposal/anteater/source/main/org/apache/ant/Project.java b/proposal/anteater/source/main/org/apache/ant/Project.java index f2160a535..63e2d4d38 100644 --- a/proposal/anteater/source/main/org/apache/ant/Project.java +++ b/proposal/anteater/source/main/org/apache/ant/Project.java @@ -43,7 +43,7 @@ public class Project { /** * Front end that this project communicates to. */ - private FrontEnd frontEnd; + private AntFrontEnd frontEnd; /** * Properties of this project. @@ -80,7 +80,7 @@ public class Project { /** * Creates a new Project object with the given FrontEnd and TaskManager */ - public Project(FrontEnd frontEnd, TaskManager taskManager) { + public Project(AntFrontEnd frontEnd, TaskManager taskManager) { this.frontEnd = frontEnd; this.taskManager = taskManager; } @@ -123,7 +123,7 @@ public class Project { /** * Gets the front end that is running this project. */ - public FrontEnd getFrontEnd() { + public AntFrontEnd getFrontEnd() { return frontEnd; } @@ -198,7 +198,7 @@ public class Project { /** * Sets the front end for this project. */ - public void setFrontEnd(FrontEnd frontEnd) { + public void setFrontEnd(AntFrontEnd frontEnd) { this.frontEnd = frontEnd; } @@ -233,7 +233,7 @@ public class Project { */ public void startBuild(String targetName) throws AntException { - // notify FrontEnd that we are starting a build on a project + // notify AntFrontEnd that we are starting a build on a project frontEnd.notifyProjectStart(this); @@ -283,4 +283,4 @@ public class Project { public String toString() { return "Project name=" + name; } -} \ No newline at end of file +} diff --git a/proposal/anteater/source/main/org/apache/ant/ProjectBuilder.java b/proposal/anteater/source/main/org/apache/ant/ProjectBuilder.java index 692a649af..ea2eb13d7 100644 --- a/proposal/anteater/source/main/org/apache/ant/ProjectBuilder.java +++ b/proposal/anteater/source/main/org/apache/ant/ProjectBuilder.java @@ -26,7 +26,7 @@ public class ProjectBuilder { /** * */ - private FrontEnd frontEnd; + private AntFrontEnd frontEnd; /** * @@ -47,7 +47,7 @@ public class ProjectBuilder { * Creates a new project builder that will build projects for the given * Ant. */ - public ProjectBuilder(FrontEnd frontEnd) { + public ProjectBuilder(AntFrontEnd frontEnd) { this.frontEnd = frontEnd; taskManager = new TaskManager(frontEnd); parserFactory = SAXParserFactory.newInstance(); @@ -304,4 +304,4 @@ public class ProjectBuilder { } } } -} \ No newline at end of file +} diff --git a/proposal/anteater/source/main/org/apache/ant/TaskManager.java b/proposal/anteater/source/main/org/apache/ant/TaskManager.java index 5d79c4910..9ffc7e959 100644 --- a/proposal/anteater/source/main/org/apache/ant/TaskManager.java +++ b/proposal/anteater/source/main/org/apache/ant/TaskManager.java @@ -26,7 +26,7 @@ public class TaskManager { /** * FrontEnd that this TaskManager can communicate through. */ - private FrontEnd frontEnd; + private AntFrontEnd frontEnd; /** * Data structure where all the Class definition for all known tasks are @@ -46,7 +46,7 @@ public class TaskManager { /** * Creates a new TaskManager. */ - TaskManager(FrontEnd frontEnd) { + TaskManager(AntFrontEnd frontEnd) { this.frontEnd = frontEnd; } @@ -104,7 +104,7 @@ public class TaskManager { */ private void processDir(File dir) { frontEnd.writeMessage("Scanning " + dir + " for tasks", - FrontEnd.MSG_LEVEL_LOW); + AntFrontEnd.MSG_LEVEL_LOW); File file = new File(dir, "taskdef.properties"); if (file.exists()) { try { @@ -121,7 +121,7 @@ public class TaskManager { try { Class clazz = loader.loadClass(taskClass); frontEnd.writeMessage("Got Task: " + taskName + - clazz, FrontEnd.MSG_LEVEL_LOW); + clazz, AntFrontEnd.MSG_LEVEL_LOW); taskClasses.put(taskName, clazz); } catch (ClassNotFoundException cnfe) { System.out.println("Couldn't load task: " + taskName); @@ -142,7 +142,7 @@ public class TaskManager { */ private void processJar(File file) throws AntException { frontEnd.writeMessage("Scanning " + file + " for tasks", - FrontEnd.MSG_LEVEL_LOW); + AntFrontEnd.MSG_LEVEL_LOW); try { ZipFile zipFile = new ZipFile(file); ZipEntry zipEntry = zipFile.getEntry("taskdef.properties"); @@ -166,7 +166,7 @@ public class TaskManager { try { Class clazz = loader.loadClass(taskClass); frontEnd.writeMessage("Got Task: " + taskName + - clazz, FrontEnd.MSG_LEVEL_LOW); + clazz, AntFrontEnd.MSG_LEVEL_LOW); taskClasses.put(taskName, clazz); } catch (ClassNotFoundException cnfe) { System.out.println("Couldn't load task: " + taskName); @@ -265,4 +265,4 @@ public class TaskManager { // hafta think about it. } -} \ No newline at end of file +} diff --git a/proposal/anteater/source/main/org/apache/ant/cli/CLIFrontEnd.java b/proposal/anteater/source/main/org/apache/ant/cli/CLIFrontEnd.java index 3c6151080..91cb8f3bf 100644 --- a/proposal/anteater/source/main/org/apache/ant/cli/CLIFrontEnd.java +++ b/proposal/anteater/source/main/org/apache/ant/cli/CLIFrontEnd.java @@ -14,7 +14,7 @@ import org.apache.ant.*; * * @author James Duncan Davidson (duncan@apache.org) */ -public class CLIFrontEnd extends FrontEnd { +public class CLIFrontEnd extends AntFrontEnd { // ----------------------------------------------------------------- // PRIVATE MEMBERS @@ -304,4 +304,4 @@ public class CLIFrontEnd extends FrontEnd { " will bail."; writeMessage(msg); } -} \ No newline at end of file +}