Since Project.getProperties now returns a cloned hashtable, should

avoid using it for property replacement.

Project.replaceProperties now passes its properties map to ProjectHelper's
main replaceProperties method rather than calling the simple version which
just called back to project.getProperties().

The simple version in ProjectHelper now calls Project.replaceProperties
rather than calling Project.getProperties.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271073 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/Project.java

@@ -381,7 +381,7 @@ public class Project {
      */
     public String replaceProperties(String value)
         throws BuildException { 
-        return ProjectHelper.replaceProperties(this, value);
+        return ProjectHelper.replaceProperties(this, value, properties);
     }
 
     /**

src/main/org/apache/tools/ant/ProjectHelper.java

@@ -737,7 +737,7 @@ public class ProjectHelper {
      */
      public static String replaceProperties(Project project, String value)
             throws BuildException {
-         return replaceProperties(project,value,project.getProperties());
+         return project.replaceProperties(value);
      }
 
     /**

src/main/org/apache/tools/ant/taskdefs/LoadFile.java

@@ -56,7 +56,6 @@ package org.apache.tools.ant.taskdefs;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.ProjectHelper;
 
 
 import java.io.*;
@@ -205,7 +204,7 @@ public class LoadFile extends Task {
                 text=stripLineBreaks(text);
             }
             if(evaluateProperties) {
-                text=ProjectHelper.replaceProperties(project,text);
+                text = project.replaceProperties(text);
             }
             project.setNewProperty(property, text);
             log("loaded "+buffer.length+" characters",Project.MSG_VERBOSE);