Browse Source

make something a constant

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278472 13f79535-47bb-0310-9956-ffa450edef68
master
Steve Loughran 20 years ago
parent
commit
3c40bb97c2
2 changed files with 8 additions and 2 deletions
  1. +6
    -1
      src/main/org/apache/tools/ant/ProjectHelper.java
  2. +2
    -1
      src/main/org/apache/tools/ant/taskdefs/ImportTask.java

+ 6
- 1
src/main/org/apache/tools/ant/ProjectHelper.java View File

@@ -72,6 +72,11 @@ public class ProjectHelper {
*/
public static final String SERVICE_ID =
"META-INF/services/org.apache.tools.ant.ProjectHelper";
/**
* name of project helper reference that we add to a project
*/
public static final String PROJECTHELPER_REFERENCE = "ant.projectHelper";

/**
* Configures the project with the contents of the specified XML file.
@@ -86,7 +91,7 @@ public class ProjectHelper {
public static void configureProject(Project project, File buildFile)
throws BuildException {
ProjectHelper helper = ProjectHelper.getProjectHelper();
project.addReference("ant.projectHelper", helper);
project.addReference(PROJECTHELPER_REFERENCE, helper);
helper.parse(project, buildFile);
}



+ 2
- 1
src/main/org/apache/tools/ant/taskdefs/ImportTask.java View File

@@ -91,7 +91,8 @@ public class ImportTask extends Task {
}

ProjectHelper helper =
(ProjectHelper) getProject().getReference("ant.projectHelper");
(ProjectHelper) getProject().
getReference(ProjectHelper.PROJECTHELPER_REFERENCE);
Vector importStack = helper.getImportStack();

if (importStack.size() == 0) {


Loading…
Cancel
Save