Browse Source

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
master
Costin Manolache 22 years ago
parent
commit
2ebc17d579
5 changed files with 10 additions and 10 deletions
  1. +6
    -6
      proposal/embed/src/java/org/apache/tools/ant/PropertyHelper2.java
  2. +1
    -1
      proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java
  3. +1
    -1
      proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java
  4. +1
    -1
      proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java
  5. +1
    -1
      proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java

proposal/embed/src/java/org/apache/tools/ant/PropertyHelper.java → proposal/embed/src/java/org/apache/tools/ant/PropertyHelper2.java View File

@@ -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;
}

+ 1
- 1
proposal/embed/src/java/org/apache/tools/ant/RuntimeConfigurable2.java View File

@@ -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);


+ 1
- 1
proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JXPath.java View File

@@ -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 );


+ 1
- 1
proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/JexlProperties.java View File

@@ -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 );

/*


+ 1
- 1
proposal/embed/src/java/org/apache/tools/ant/taskdefs/optional/VelocityProperties.java View File

@@ -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();


Loading…
Cancel
Save