stevel 2005/07/22 08:09:17
Modified: src/main/org/apache/tools/ant ProjectHelper.java
src/main/org/apache/tools/ant/taskdefs ImportTask.java
Log:
make something a constant
Revision Changes Path
1.118 +6 -1 ant/src/main/org/apache/tools/ant/ProjectHelper.java
Index: ProjectHelper.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ProjectHelper.java 23 May 2005 19:14:36 -0000 1.117
+++ ProjectHelper.java 22 Jul 2005 15:09:16 -0000 1.118
@@ -72,6 +72,11 @@
*/
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 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);
}
1.32 +2 -1
ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java
Index: ImportTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/ImportTask.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ImportTask.java 6 Jan 2005 12:05:05 -0000 1.31
+++ ImportTask.java 22 Jul 2005 15:09:17 -0000 1.32
@@ -91,7 +91,8 @@
}
ProjectHelper helper =
- (ProjectHelper)
getProject().getReference("ant.projectHelper");
+ (ProjectHelper) getProject().
+ getReference(ProjectHelper.PROJECTHELPER_REFERENCE);
Vector importStack = helper.getImportStack();
if (importStack.size() == 0) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
