From 2ebc17d579e5e8a3ca1db259e25ecd370e945a34 Mon Sep 17 00:00:00 2001
From: Costin Manolache <costin@apache.org>
Date: Sat, 28 Dec 2002 05:33:21 +0000
Subject: [PATCH] Renamed PropertyHelper to PropertyHelper2, so it'll still
 compile with ant1.6 after a PropertyHelper is added.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273706 13f79535-47bb-0310-9956-ffa450edef68
---
 .../{PropertyHelper.java => PropertyHelper2.java}    | 12 ++++++------
 .../org/apache/tools/ant/RuntimeConfigurable2.java   |  2 +-
 .../apache/tools/ant/taskdefs/optional/JXPath.java   |  2 +-
 .../tools/ant/taskdefs/optional/JexlProperties.java  |  2 +-
 .../ant/taskdefs/optional/VelocityProperties.java    |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename proposal/embed/src/java/org/apache/tools/ant/{PropertyHelper.java => PropertyHelper2.java} (96%)

diff --git a/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java b/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper2.java
similarity index 96%
rename from proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java
rename to proposal/embed/src/java/org/apache/tools/ant/PropertyHelper2.java
index 6e0c0c90e..6859ef504 100644
--- a/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java
+++ b/proposal/embed/src/java/org/apache/tools/ant/PropertyHelper2.java
@@ -75,11 +75,11 @@ import org.xml.sax.helpers.AttributesImpl;
  *
  * @author Costin Manolache
  */
-public class PropertyHelper {
+public class PropertyHelper2 {
     Project project;
     Vector propertyInterceptors=new Vector();
     
-    protected PropertyHelper() {
+    protected PropertyHelper2() {
     }
 
     public void setProject(Project p ) {
@@ -91,13 +91,13 @@ public class PropertyHelper {
      *  in future it may use discovery of config to return a
      *  customized version, for integration in other apps.
      */
-    public static PropertyHelper getPropertyHelper(Project project) {
-        PropertyHelper ph=(PropertyHelper)project.getReference( "ant.PropertyHelper" ); 
+    public static PropertyHelper2 getPropertyHelper(Project project) {
+        PropertyHelper2 ph=(PropertyHelper2)project.getReference( "ant.PropertyHelper2" );
         if( ph!=null ) return ph;
-        ph=new PropertyHelper();
+        ph=new PropertyHelper2();
         ph.setProject( project );
 
-        project.addReference( "ant.PropertyHelper",ph );
+        project.addReference( "ant.PropertyHelper2",ph );
         return ph;
     }
     
diff --git a/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java b/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
index 8235640db..5cd66ed48 100644
--- a/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
+++ b/proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
@@ -281,7 +281,7 @@ public class RuntimeConfigurable2 extends RuntimeConfigurable {
         if( proxyConfigured ) {
             return;
         }
-        PropertyHelper ph=PropertyHelper.getPropertyHelper(p);
+        PropertyHelper2 ph=PropertyHelper2.getPropertyHelper(p);
 
         if (attributes != null) {
             ph.configure(wrappedObject, attributes, p);
diff --git a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java
index 68491fe0a..c0af5f10a 100644
--- a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java
+++ b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java
@@ -128,7 +128,7 @@ public class JXPath extends Task implements PropertyInterceptor {
     public void execute() {
         JXPathIntrospector.registerDynamicClass(Hashtable.class, JXPathHashtableHandler.class);
 
-        PropertyHelper phelper=PropertyHelper.getPropertyHelper( project );
+        PropertyHelper2 phelper=PropertyHelper2.getPropertyHelper( project );
         phelper.addPropertyInterceptor( this );
 
         project.addReference( "jxpathTask", this );
diff --git a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java
index 0a22a4c3e..e42198ad5 100644
--- a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java
+++ b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java
@@ -95,7 +95,7 @@ public class JexlProperties extends Task implements PropertyInterceptor {
     
     
     public void execute() {
-        PropertyHelper phelper=PropertyHelper.getPropertyHelper( project );
+        PropertyHelper2 phelper=PropertyHelper2.getPropertyHelper( project );
         phelper.addPropertyInterceptor( this );
 
         /*
diff --git a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java
index 06b404d94..213a9a406 100644
--- a/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java
+++ b/proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java
@@ -104,7 +104,7 @@ public class VelocityProperties extends Task implements PropertyInterceptor {
     
     public void execute() {
         try {
-            PropertyHelper phelper=PropertyHelper.getPropertyHelper( project );
+            PropertyHelper2 phelper=PropertyHelper2.getPropertyHelper( project );
             phelper.addPropertyInterceptor( this );
 
             engine=new VelocityEngine();