From e2288433da8e8b2fe837d978bf095e8652328183 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Sun, 30 Dec 2001 00:38:44 +0000 Subject: [PATCH] addText() --> addContent() git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270436 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/org/apache/tools/ant/taskdefs/Echo.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Input.java | 2 +- .../src/main/org/apache/tools/ant/taskdefs/Replace.java | 6 +++--- .../src/main/org/apache/tools/ant/taskdefs/SQLExec.java | 6 +++--- .../apache/tools/ant/taskdefs/javadoc/GroupArgument.java | 2 +- .../main/org/apache/tools/ant/taskdefs/javadoc/Html.java | 2 +- .../org/apache/tools/ant/taskdefs/javadoc/Javadoc.java | 8 ++++---- .../org/apache/tools/ant/taskdefs/optional/Script.java | 2 +- .../tools/ant/taskdefs/optional/net/TelnetTask.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Echo.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Input.java | 2 +- .../src/todo/org/apache/tools/ant/taskdefs/Replace.java | 6 +++--- .../src/todo/org/apache/tools/ant/taskdefs/SQLExec.java | 6 +++--- .../apache/tools/ant/taskdefs/javadoc/GroupArgument.java | 2 +- .../todo/org/apache/tools/ant/taskdefs/javadoc/Html.java | 2 +- .../org/apache/tools/ant/taskdefs/javadoc/Javadoc.java | 8 ++++---- .../org/apache/tools/ant/taskdefs/optional/Script.java | 2 +- .../tools/ant/taskdefs/optional/net/TelnetTask.java | 2 +- 18 files changed, 32 insertions(+), 32 deletions(-) diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java index 450283a40..089781b57 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Echo.java @@ -60,7 +60,7 @@ public class Echo * * @param msg The feature to be added to the Text attribute */ - public void addText( final String message ) + public void addContent( final String message ) throws TaskException { m_message = message; diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java index 1685549df..e5df17931 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Input.java @@ -85,7 +85,7 @@ public class Input extends Task * * @param msg The feature to be added to the Text attribute */ - public void addText( String msg ) + public void addContent( String msg ) throws TaskException { message += getProject().replaceProperties( msg ); diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java index bad4fa8f5..8bce5e49c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Replace.java @@ -114,7 +114,7 @@ public class Replace extends MatchingTask */ public void setToken( String token ) { - createReplaceToken().addText( token ); + createReplaceToken().addContent( token ); } /** @@ -124,7 +124,7 @@ public class Replace extends MatchingTask */ public void setValue( String value ) { - createReplaceValue().addText( value ); + createReplaceValue().addContent( value ); } public Properties getProperties( File propertyFile ) @@ -485,7 +485,7 @@ public class Replace extends MatchingTask return buf.toString(); } - public void addText( String val ) + public void addContent( String val ) { buf.append( val ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java index 2fb48faa8..7eff3717b 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/SQLExec.java @@ -354,7 +354,7 @@ public class SQLExec extends Task * * @param sql The feature to be added to the Text attribute */ - public void addText( String sql ) + public void addContent( String sql ) { this.sqlCommand += sql; } @@ -425,7 +425,7 @@ public class SQLExec extends Task // Make a transaction group for the outer command Transaction t = createTransaction(); t.setSrc( srcFile ); - t.addText( sqlCommand ); + t.addContent( sqlCommand ); } if( driver == null ) @@ -839,7 +839,7 @@ public class SQLExec extends Task this.tSrcFile = src; } - public void addText( String sql ) + public void addContent( String sql ) { this.tSqlCommand += sql; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java index a176f27ff..25d1cd063 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java @@ -30,7 +30,7 @@ public class GroupArgument public void setTitle( final String src ) { final Html h = new Html(); - h.addText( src ); + h.addContent( src ); addTitle( h ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Html.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Html.java index e29b7968a..c81178f3f 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Html.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Html.java @@ -16,7 +16,7 @@ public class Html return m_text.toString(); } - public void addText( final String text ) + public void addContent( final String text ) { m_text.append( text ); } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index 6908f4c68..bb9049f32 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -130,7 +130,7 @@ public class Javadoc public void setBottom( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addBottom( h ); } @@ -219,7 +219,7 @@ public class Javadoc public void setDoctitle( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addDoctitle( h ); } @@ -250,7 +250,7 @@ public class Javadoc public void setFooter( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addFooter( h ); } @@ -262,7 +262,7 @@ public class Javadoc public void setHeader( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addHeader( h ); } 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 008df1078..c88acfb5b 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 @@ -71,7 +71,7 @@ public class Script extends Task * * @param text The feature to be added to the Text attribute */ - public void addText( String text ) + public void addContent( String text ) { this.script += text; } diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index 5f16a0346..1479006fb 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java @@ -369,7 +369,7 @@ public class TelnetTask extends Task taskString += s; } - public void addText( String s ) + public void addContent( String s ) { setString( s ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java index 450283a40..089781b57 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Echo.java @@ -60,7 +60,7 @@ public class Echo * * @param msg The feature to be added to the Text attribute */ - public void addText( final String message ) + public void addContent( final String message ) throws TaskException { m_message = message; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java index 1685549df..e5df17931 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Input.java @@ -85,7 +85,7 @@ public class Input extends Task * * @param msg The feature to be added to the Text attribute */ - public void addText( String msg ) + public void addContent( String msg ) throws TaskException { message += getProject().replaceProperties( msg ); diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java index bad4fa8f5..8bce5e49c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/Replace.java @@ -114,7 +114,7 @@ public class Replace extends MatchingTask */ public void setToken( String token ) { - createReplaceToken().addText( token ); + createReplaceToken().addContent( token ); } /** @@ -124,7 +124,7 @@ public class Replace extends MatchingTask */ public void setValue( String value ) { - createReplaceValue().addText( value ); + createReplaceValue().addContent( value ); } public Properties getProperties( File propertyFile ) @@ -485,7 +485,7 @@ public class Replace extends MatchingTask return buf.toString(); } - public void addText( String val ) + public void addContent( String val ) { buf.append( val ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java index 2fb48faa8..7eff3717b 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/SQLExec.java @@ -354,7 +354,7 @@ public class SQLExec extends Task * * @param sql The feature to be added to the Text attribute */ - public void addText( String sql ) + public void addContent( String sql ) { this.sqlCommand += sql; } @@ -425,7 +425,7 @@ public class SQLExec extends Task // Make a transaction group for the outer command Transaction t = createTransaction(); t.setSrc( srcFile ); - t.addText( sqlCommand ); + t.addContent( sqlCommand ); } if( driver == null ) @@ -839,7 +839,7 @@ public class SQLExec extends Task this.tSrcFile = src; } - public void addText( String sql ) + public void addContent( String sql ) { this.tSqlCommand += sql; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java index a176f27ff..25d1cd063 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/GroupArgument.java @@ -30,7 +30,7 @@ public class GroupArgument public void setTitle( final String src ) { final Html h = new Html(); - h.addText( src ); + h.addContent( src ); addTitle( h ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Html.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Html.java index e29b7968a..c81178f3f 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Html.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Html.java @@ -16,7 +16,7 @@ public class Html return m_text.toString(); } - public void addText( final String text ) + public void addContent( final String text ) { m_text.append( text ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java index 6908f4c68..bb9049f32 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/javadoc/Javadoc.java @@ -130,7 +130,7 @@ public class Javadoc public void setBottom( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addBottom( h ); } @@ -219,7 +219,7 @@ public class Javadoc public void setDoctitle( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addDoctitle( h ); } @@ -250,7 +250,7 @@ public class Javadoc public void setFooter( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addFooter( h ); } @@ -262,7 +262,7 @@ public class Javadoc public void setHeader( String src ) { Html h = new Html(); - h.addText( src ); + h.addContent( src ); addHeader( h ); } 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 008df1078..c88acfb5b 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 @@ -71,7 +71,7 @@ public class Script extends Task * * @param text The feature to be added to the Text attribute */ - public void addText( String text ) + public void addContent( String text ) { this.script += text; } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java index 5f16a0346..1479006fb 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java @@ -369,7 +369,7 @@ public class TelnetTask extends Task taskString += s; } - public void addText( String s ) + public void addContent( String s ) { setString( s ); }