From 62d9c97720c893337d7d97e316524595dff20f3d Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 16 Dec 2001 06:40:17 +0000 Subject: [PATCH] project.setNewProperty() --> setProperty which inherited from AbstractTask and delegates to TaskContext. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270217 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/org/apache/tools/ant/taskdefs/Checksum.java | 3 +-- .../main/org/apache/tools/ant/taskdefs/ConditionTask.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/ExecTask.java | 5 +++-- .../src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 4 +--- .../main/org/apache/tools/ant/taskdefs/PathConvert.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Property.java | 3 ++- .../src/main/org/apache/tools/ant/taskdefs/Tstamp.java | 8 ++++---- .../src/main/org/apache/tools/ant/taskdefs/WaitFor.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/Script.java | 1 - .../tools/ant/taskdefs/optional/sound/AntSoundPlayer.java | 6 +++--- .../src/todo/org/apache/tools/ant/taskdefs/Checksum.java | 3 +-- .../todo/org/apache/tools/ant/taskdefs/ConditionTask.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/ExecTask.java | 5 +++-- .../src/todo/org/apache/tools/ant/taskdefs/Javadoc.java | 4 +--- .../todo/org/apache/tools/ant/taskdefs/PathConvert.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Property.java | 3 ++- .../src/todo/org/apache/tools/ant/taskdefs/Tstamp.java | 8 ++++---- .../src/todo/org/apache/tools/ant/taskdefs/WaitFor.java | 2 +- .../org/apache/tools/ant/taskdefs/optional/Script.java | 1 - .../tools/ant/taskdefs/optional/sound/AntSoundPlayer.java | 6 +++--- 20 files changed, 34 insertions(+), 38 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java index 38046145f..71c1ddc6a 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Checksum.java @@ -188,8 +188,7 @@ public class Checksum extends MatchingTask implements Condition boolean value = validateAndExecute(); if( verifyProperty != null ) { - project.setNewProperty( verifyProperty, - new Boolean( value ).toString() ); + setProperty( verifyProperty, new Boolean( value ).toString() ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java index 16261d965..91f512998 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ConditionTask.java @@ -71,7 +71,7 @@ public class ConditionTask extends ConditionBase Condition c = (Condition)getConditions().nextElement(); if( c.eval() ) { - getProject().setNewProperty( property, value ); + setProperty( property, value ); } } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java index 79605d8ef..d7fa0dc92 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/ExecTask.java @@ -267,7 +267,7 @@ public class ExecTask extends Task } val.append( line ); } - project.setNewProperty( outputprop, val.toString() ); + setProperty( outputprop, val.toString() ); } } @@ -370,11 +370,12 @@ public class ExecTask extends Task * @param result Description of Parameter */ protected void maybeSetResultPropertyValue( int result ) + throws TaskException { String res = Integer.toString( result ); if( resultProperty != null ) { - project.setNewProperty( resultProperty, res ); + setProperty( resultProperty, res ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index cc2b7e5a0..5b474bb66 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1028,9 +1028,7 @@ public class Javadoc extends Task } else { - project.log( this, - "Warning: Leaving out empty argument '" + key + "'", - Project.MSG_WARN ); + log( "Warning: Leaving out empty argument '" + key + "'", Project.MSG_WARN ); } } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java index 58b4f5c8c..5f44c7c49 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/PathConvert.java @@ -226,7 +226,7 @@ public class PathConvert extends Task log( "Set property " + property + " = " + value, Project.MSG_VERBOSE ); - getProject().setNewProperty( property, value ); + setProperty( property, value ); } /** diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java index 93b33e45a..1753659c1 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Property.java @@ -200,8 +200,9 @@ public class Property extends Task } protected void addProperty( String n, String v ) + throws TaskException { - project.setNewProperty( n, v ); + setProperty( n, v ); } protected void loadEnvironment( String prefix ) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java index f0be5527c..bd4439c6d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Tstamp.java @@ -61,13 +61,13 @@ public class Tstamp extends Task Date d = new Date(); SimpleDateFormat dstamp = new SimpleDateFormat( "yyyyMMdd" ); - project.setNewProperty( prefix + "DSTAMP", dstamp.format( d ) ); + setProperty( prefix + "DSTAMP", dstamp.format( d ) ); SimpleDateFormat tstamp = new SimpleDateFormat( "HHmm" ); - project.setNewProperty( prefix + "TSTAMP", tstamp.format( d ) ); + setProperty( prefix + "TSTAMP", tstamp.format( d ) ); SimpleDateFormat today = new SimpleDateFormat( "MMMM d yyyy", Locale.US ); - project.setNewProperty( prefix + "TODAY", today.format( d ) ); + setProperty( prefix + "TODAY", today.format( d ) ); Enumeration i = customFormats.elements(); while( i.hasMoreElements() ) @@ -243,7 +243,7 @@ public class Tstamp extends Task { sdf.setTimeZone( timeZone ); } - project.setNewProperty( propertyName, sdf.format( date ) ); + getContext().setProperty( propertyName, sdf.format( date ) ); } } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java index a96faa7ef..aa4d53d5d 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/WaitFor.java @@ -134,7 +134,7 @@ public class WaitFor extends ConditionBase if( timeoutProperty != null ) { - project.setNewProperty( timeoutProperty, "true" ); + setProperty( timeoutProperty, "true" ); } } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java index 6447af349..50020e2ec 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/Script.java @@ -87,7 +87,6 @@ public class Script extends Task try { addBeans( project.getProperties() ); - addBeans( project.getTargets() ); addBeans( project.getReferences() ); beans.put( "project", getProject() ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java index 02f427574..9ee10a68f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java @@ -205,7 +205,7 @@ public class AntSoundPlayer } catch( UnsupportedAudioFileException uafe ) { - project.log( "Audio format is not yet supported: " + uafe.getMessage() ); + project.log( "Audio format is not yet supported: " + uafe.getMessage(), Project.MSG_INFO ); } catch( IOException ioe ) { @@ -225,7 +225,7 @@ public class AntSoundPlayer } catch( LineUnavailableException e ) { - project.log( "The sound device is currently unavailable" ); + project.log( "The sound device is currently unavailable", Project.MSG_INFO ); return; } catch( IOException e ) @@ -246,7 +246,7 @@ public class AntSoundPlayer } else { - project.log( "Can't get data from file " + file.getName() ); + project.log( "Can't get data from file " + file.getName(), Project.MSG_INFO ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java index 38046145f..71c1ddc6a 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Checksum.java @@ -188,8 +188,7 @@ public class Checksum extends MatchingTask implements Condition boolean value = validateAndExecute(); if( verifyProperty != null ) { - project.setNewProperty( verifyProperty, - new Boolean( value ).toString() ); + setProperty( verifyProperty, new Boolean( value ).toString() ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java index 16261d965..91f512998 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ConditionTask.java @@ -71,7 +71,7 @@ public class ConditionTask extends ConditionBase Condition c = (Condition)getConditions().nextElement(); if( c.eval() ) { - getProject().setNewProperty( property, value ); + setProperty( property, value ); } } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java index 79605d8ef..d7fa0dc92 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/ExecTask.java @@ -267,7 +267,7 @@ public class ExecTask extends Task } val.append( line ); } - project.setNewProperty( outputprop, val.toString() ); + setProperty( outputprop, val.toString() ); } } @@ -370,11 +370,12 @@ public class ExecTask extends Task * @param result Description of Parameter */ protected void maybeSetResultPropertyValue( int result ) + throws TaskException { String res = Integer.toString( result ); if( resultProperty != null ) { - project.setNewProperty( resultProperty, res ); + setProperty( resultProperty, res ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java index cc2b7e5a0..5b474bb66 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Javadoc.java @@ -1028,9 +1028,7 @@ public class Javadoc extends Task } else { - project.log( this, - "Warning: Leaving out empty argument '" + key + "'", - Project.MSG_WARN ); + log( "Warning: Leaving out empty argument '" + key + "'", Project.MSG_WARN ); } } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java index 58b4f5c8c..5f44c7c49 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/PathConvert.java @@ -226,7 +226,7 @@ public class PathConvert extends Task log( "Set property " + property + " = " + value, Project.MSG_VERBOSE ); - getProject().setNewProperty( property, value ); + setProperty( property, value ); } /** diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java index 93b33e45a..1753659c1 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Property.java @@ -200,8 +200,9 @@ public class Property extends Task } protected void addProperty( String n, String v ) + throws TaskException { - project.setNewProperty( n, v ); + setProperty( n, v ); } protected void loadEnvironment( String prefix ) diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java index f0be5527c..bd4439c6d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Tstamp.java @@ -61,13 +61,13 @@ public class Tstamp extends Task Date d = new Date(); SimpleDateFormat dstamp = new SimpleDateFormat( "yyyyMMdd" ); - project.setNewProperty( prefix + "DSTAMP", dstamp.format( d ) ); + setProperty( prefix + "DSTAMP", dstamp.format( d ) ); SimpleDateFormat tstamp = new SimpleDateFormat( "HHmm" ); - project.setNewProperty( prefix + "TSTAMP", tstamp.format( d ) ); + setProperty( prefix + "TSTAMP", tstamp.format( d ) ); SimpleDateFormat today = new SimpleDateFormat( "MMMM d yyyy", Locale.US ); - project.setNewProperty( prefix + "TODAY", today.format( d ) ); + setProperty( prefix + "TODAY", today.format( d ) ); Enumeration i = customFormats.elements(); while( i.hasMoreElements() ) @@ -243,7 +243,7 @@ public class Tstamp extends Task { sdf.setTimeZone( timeZone ); } - project.setNewProperty( propertyName, sdf.format( date ) ); + getContext().setProperty( propertyName, sdf.format( date ) ); } } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java index a96faa7ef..aa4d53d5d 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/WaitFor.java @@ -134,7 +134,7 @@ public class WaitFor extends ConditionBase if( timeoutProperty != null ) { - project.setNewProperty( timeoutProperty, "true" ); + setProperty( timeoutProperty, "true" ); } } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java index 6447af349..50020e2ec 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/Script.java @@ -87,7 +87,6 @@ public class Script extends Task try { addBeans( project.getProperties() ); - addBeans( project.getTargets() ); addBeans( project.getReferences() ); beans.put( "project", getProject() ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java index 02f427574..9ee10a68f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/sound/AntSoundPlayer.java @@ -205,7 +205,7 @@ public class AntSoundPlayer } catch( UnsupportedAudioFileException uafe ) { - project.log( "Audio format is not yet supported: " + uafe.getMessage() ); + project.log( "Audio format is not yet supported: " + uafe.getMessage(), Project.MSG_INFO ); } catch( IOException ioe ) { @@ -225,7 +225,7 @@ public class AntSoundPlayer } catch( LineUnavailableException e ) { - project.log( "The sound device is currently unavailable" ); + project.log( "The sound device is currently unavailable", Project.MSG_INFO ); return; } catch( IOException e ) @@ -246,7 +246,7 @@ public class AntSoundPlayer } else { - project.log( "Can't get data from file " + file.getName() ); + project.log( "Can't get data from file " + file.getName(), Project.MSG_INFO ); } }