Browse Source

Make AntEater compile.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268355 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
9ddadd7146
4 changed files with 18 additions and 18 deletions
  1. +6
    -6
      proposal/anteater/source/main/org/apache/ant/Project.java
  2. +3
    -3
      proposal/anteater/source/main/org/apache/ant/ProjectBuilder.java
  3. +7
    -7
      proposal/anteater/source/main/org/apache/ant/TaskManager.java
  4. +2
    -2
      proposal/anteater/source/main/org/apache/ant/cli/CLIFrontEnd.java

+ 6
- 6
proposal/anteater/source/main/org/apache/ant/Project.java View File

@@ -43,7 +43,7 @@ public class Project {
/** /**
* Front end that this project communicates to. * Front end that this project communicates to.
*/ */
private FrontEnd frontEnd;
private AntFrontEnd frontEnd;


/** /**
* Properties of this project. * Properties of this project.
@@ -80,7 +80,7 @@ public class Project {
/** /**
* Creates a new Project object with the given FrontEnd and TaskManager * 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.frontEnd = frontEnd;
this.taskManager = taskManager; this.taskManager = taskManager;
} }
@@ -123,7 +123,7 @@ public class Project {
/** /**
* Gets the front end that is running this project. * Gets the front end that is running this project.
*/ */
public FrontEnd getFrontEnd() {
public AntFrontEnd getFrontEnd() {
return frontEnd; return frontEnd;
} }


@@ -198,7 +198,7 @@ public class Project {
/** /**
* Sets the front end for this project. * Sets the front end for this project.
*/ */
public void setFrontEnd(FrontEnd frontEnd) {
public void setFrontEnd(AntFrontEnd frontEnd) {
this.frontEnd = frontEnd; this.frontEnd = frontEnd;
} }
@@ -233,7 +233,7 @@ public class Project {
*/ */
public void startBuild(String targetName) throws AntException { 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); frontEnd.notifyProjectStart(this);
@@ -283,4 +283,4 @@ public class Project {
public String toString() { public String toString() {
return "Project name=" + name; return "Project name=" + name;
} }
}
}

+ 3
- 3
proposal/anteater/source/main/org/apache/ant/ProjectBuilder.java View File

@@ -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 * Creates a new project builder that will build projects for the given
* Ant. * Ant.
*/ */
public ProjectBuilder(FrontEnd frontEnd) {
public ProjectBuilder(AntFrontEnd frontEnd) {
this.frontEnd = frontEnd; this.frontEnd = frontEnd;
taskManager = new TaskManager(frontEnd); taskManager = new TaskManager(frontEnd);
parserFactory = SAXParserFactory.newInstance(); parserFactory = SAXParserFactory.newInstance();
@@ -304,4 +304,4 @@ public class ProjectBuilder {
} }
} }
} }
}
}

+ 7
- 7
proposal/anteater/source/main/org/apache/ant/TaskManager.java View File

@@ -26,7 +26,7 @@ public class TaskManager {
/** /**
* FrontEnd that this TaskManager can communicate through. * 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 * Data structure where all the Class definition for all known tasks are
@@ -46,7 +46,7 @@ public class TaskManager {
/** /**
* Creates a new TaskManager. * Creates a new TaskManager.
*/ */
TaskManager(FrontEnd frontEnd) {
TaskManager(AntFrontEnd frontEnd) {
this.frontEnd = frontEnd; this.frontEnd = frontEnd;
} }
@@ -104,7 +104,7 @@ public class TaskManager {
*/ */
private void processDir(File dir) { private void processDir(File dir) {
frontEnd.writeMessage("Scanning " + dir + " for tasks", frontEnd.writeMessage("Scanning " + dir + " for tasks",
FrontEnd.MSG_LEVEL_LOW);
AntFrontEnd.MSG_LEVEL_LOW);
File file = new File(dir, "taskdef.properties"); File file = new File(dir, "taskdef.properties");
if (file.exists()) { if (file.exists()) {
try { try {
@@ -121,7 +121,7 @@ public class TaskManager {
try { try {
Class clazz = loader.loadClass(taskClass); Class clazz = loader.loadClass(taskClass);
frontEnd.writeMessage("Got Task: " + taskName + frontEnd.writeMessage("Got Task: " + taskName +
clazz, FrontEnd.MSG_LEVEL_LOW);
clazz, AntFrontEnd.MSG_LEVEL_LOW);
taskClasses.put(taskName, clazz); taskClasses.put(taskName, clazz);
} catch (ClassNotFoundException cnfe) { } catch (ClassNotFoundException cnfe) {
System.out.println("Couldn't load task: " + taskName); System.out.println("Couldn't load task: " + taskName);
@@ -142,7 +142,7 @@ public class TaskManager {
*/ */
private void processJar(File file) throws AntException { private void processJar(File file) throws AntException {
frontEnd.writeMessage("Scanning " + file + " for tasks", frontEnd.writeMessage("Scanning " + file + " for tasks",
FrontEnd.MSG_LEVEL_LOW);
AntFrontEnd.MSG_LEVEL_LOW);
try { try {
ZipFile zipFile = new ZipFile(file); ZipFile zipFile = new ZipFile(file);
ZipEntry zipEntry = zipFile.getEntry("taskdef.properties"); ZipEntry zipEntry = zipFile.getEntry("taskdef.properties");
@@ -166,7 +166,7 @@ public class TaskManager {
try { try {
Class clazz = loader.loadClass(taskClass); Class clazz = loader.loadClass(taskClass);
frontEnd.writeMessage("Got Task: " + taskName + frontEnd.writeMessage("Got Task: " + taskName +
clazz, FrontEnd.MSG_LEVEL_LOW);
clazz, AntFrontEnd.MSG_LEVEL_LOW);
taskClasses.put(taskName, clazz); taskClasses.put(taskName, clazz);
} catch (ClassNotFoundException cnfe) { } catch (ClassNotFoundException cnfe) {
System.out.println("Couldn't load task: " + taskName); System.out.println("Couldn't load task: " + taskName);
@@ -265,4 +265,4 @@ public class TaskManager {
// hafta think about it. // hafta think about it.
} }


}
}

+ 2
- 2
proposal/anteater/source/main/org/apache/ant/cli/CLIFrontEnd.java View File

@@ -14,7 +14,7 @@ import org.apache.ant.*;
* *
* @author James Duncan Davidson (duncan@apache.org) * @author James Duncan Davidson (duncan@apache.org)
*/ */
public class CLIFrontEnd extends FrontEnd {
public class CLIFrontEnd extends AntFrontEnd {


// ----------------------------------------------------------------- // -----------------------------------------------------------------
// PRIVATE MEMBERS // PRIVATE MEMBERS
@@ -304,4 +304,4 @@ public class CLIFrontEnd extends FrontEnd {
" will bail."; " will bail.";
writeMessage(msg); writeMessage(msg);
} }
}
}

Loading…
Cancel
Save