ant1.6 after a PropertyHelper is added. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273706 13f79535-47bb-0310-9956-ffa450edef68master
| @@ -75,11 +75,11 @@ import org.xml.sax.helpers.AttributesImpl; | |||||
| * | * | ||||
| * @author Costin Manolache | * @author Costin Manolache | ||||
| */ | */ | ||||
| public class PropertyHelper { | |||||
| public class PropertyHelper2 { | |||||
| Project project; | Project project; | ||||
| Vector propertyInterceptors=new Vector(); | Vector propertyInterceptors=new Vector(); | ||||
| protected PropertyHelper() { | |||||
| protected PropertyHelper2() { | |||||
| } | } | ||||
| public void setProject(Project p ) { | public void setProject(Project p ) { | ||||
| @@ -91,13 +91,13 @@ public class PropertyHelper { | |||||
| * in future it may use discovery of config to return a | * in future it may use discovery of config to return a | ||||
| * customized version, for integration in other apps. | * 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; | if( ph!=null ) return ph; | ||||
| ph=new PropertyHelper(); | |||||
| ph=new PropertyHelper2(); | |||||
| ph.setProject( project ); | ph.setProject( project ); | ||||
| project.addReference( "ant.PropertyHelper",ph ); | |||||
| project.addReference( "ant.PropertyHelper2",ph ); | |||||
| return ph; | return ph; | ||||
| } | } | ||||
| @@ -281,7 +281,7 @@ public class RuntimeConfigurable2 extends RuntimeConfigurable { | |||||
| if( proxyConfigured ) { | if( proxyConfigured ) { | ||||
| return; | return; | ||||
| } | } | ||||
| PropertyHelper ph=PropertyHelper.getPropertyHelper(p); | |||||
| PropertyHelper2 ph=PropertyHelper2.getPropertyHelper(p); | |||||
| if (attributes != null) { | if (attributes != null) { | ||||
| ph.configure(wrappedObject, attributes, p); | ph.configure(wrappedObject, attributes, p); | ||||
| @@ -128,7 +128,7 @@ public class JXPath extends Task implements PropertyInterceptor { | |||||
| public void execute() { | public void execute() { | ||||
| JXPathIntrospector.registerDynamicClass(Hashtable.class, JXPathHashtableHandler.class); | JXPathIntrospector.registerDynamicClass(Hashtable.class, JXPathHashtableHandler.class); | ||||
| PropertyHelper phelper=PropertyHelper.getPropertyHelper( project ); | |||||
| PropertyHelper2 phelper=PropertyHelper2.getPropertyHelper( project ); | |||||
| phelper.addPropertyInterceptor( this ); | phelper.addPropertyInterceptor( this ); | ||||
| project.addReference( "jxpathTask", this ); | project.addReference( "jxpathTask", this ); | ||||
| @@ -95,7 +95,7 @@ public class JexlProperties extends Task implements PropertyInterceptor { | |||||
| public void execute() { | public void execute() { | ||||
| PropertyHelper phelper=PropertyHelper.getPropertyHelper( project ); | |||||
| PropertyHelper2 phelper=PropertyHelper2.getPropertyHelper( project ); | |||||
| phelper.addPropertyInterceptor( this ); | phelper.addPropertyInterceptor( this ); | ||||
| /* | /* | ||||
| @@ -104,7 +104,7 @@ public class VelocityProperties extends Task implements PropertyInterceptor { | |||||
| public void execute() { | public void execute() { | ||||
| try { | try { | ||||
| PropertyHelper phelper=PropertyHelper.getPropertyHelper( project ); | |||||
| PropertyHelper2 phelper=PropertyHelper2.getPropertyHelper( project ); | |||||
| phelper.addPropertyInterceptor( this ); | phelper.addPropertyInterceptor( this ); | ||||
| engine=new VelocityEngine(); | engine=new VelocityEngine(); | ||||