git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270436 13f79535-47bb-0310-9956-ffa450edef68master
@@ -60,7 +60,7 @@ public class Echo | |||||
* | * | ||||
* @param msg The feature to be added to the Text attribute | * @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 | throws TaskException | ||||
{ | { | ||||
m_message = message; | m_message = message; | ||||
@@ -85,7 +85,7 @@ public class Input extends Task | |||||
* | * | ||||
* @param msg The feature to be added to the Text attribute | * @param msg The feature to be added to the Text attribute | ||||
*/ | */ | ||||
public void addText( String msg ) | |||||
public void addContent( String msg ) | |||||
throws TaskException | throws TaskException | ||||
{ | { | ||||
message += getProject().replaceProperties( msg ); | message += getProject().replaceProperties( msg ); | ||||
@@ -114,7 +114,7 @@ public class Replace extends MatchingTask | |||||
*/ | */ | ||||
public void setToken( String token ) | 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 ) | public void setValue( String value ) | ||||
{ | { | ||||
createReplaceValue().addText( value ); | |||||
createReplaceValue().addContent( value ); | |||||
} | } | ||||
public Properties getProperties( File propertyFile ) | public Properties getProperties( File propertyFile ) | ||||
@@ -485,7 +485,7 @@ public class Replace extends MatchingTask | |||||
return buf.toString(); | return buf.toString(); | ||||
} | } | ||||
public void addText( String val ) | |||||
public void addContent( String val ) | |||||
{ | { | ||||
buf.append( val ); | buf.append( val ); | ||||
} | } | ||||
@@ -354,7 +354,7 @@ public class SQLExec extends Task | |||||
* | * | ||||
* @param sql The feature to be added to the Text attribute | * @param sql The feature to be added to the Text attribute | ||||
*/ | */ | ||||
public void addText( String sql ) | |||||
public void addContent( String sql ) | |||||
{ | { | ||||
this.sqlCommand += sql; | this.sqlCommand += sql; | ||||
} | } | ||||
@@ -425,7 +425,7 @@ public class SQLExec extends Task | |||||
// Make a transaction group for the outer command | // Make a transaction group for the outer command | ||||
Transaction t = createTransaction(); | Transaction t = createTransaction(); | ||||
t.setSrc( srcFile ); | t.setSrc( srcFile ); | ||||
t.addText( sqlCommand ); | |||||
t.addContent( sqlCommand ); | |||||
} | } | ||||
if( driver == null ) | if( driver == null ) | ||||
@@ -839,7 +839,7 @@ public class SQLExec extends Task | |||||
this.tSrcFile = src; | this.tSrcFile = src; | ||||
} | } | ||||
public void addText( String sql ) | |||||
public void addContent( String sql ) | |||||
{ | { | ||||
this.tSqlCommand += sql; | this.tSqlCommand += sql; | ||||
} | } | ||||
@@ -30,7 +30,7 @@ public class GroupArgument | |||||
public void setTitle( final String src ) | public void setTitle( final String src ) | ||||
{ | { | ||||
final Html h = new Html(); | final Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addTitle( h ); | addTitle( h ); | ||||
} | } | ||||
@@ -16,7 +16,7 @@ public class Html | |||||
return m_text.toString(); | return m_text.toString(); | ||||
} | } | ||||
public void addText( final String text ) | |||||
public void addContent( final String text ) | |||||
{ | { | ||||
m_text.append( text ); | m_text.append( text ); | ||||
} | } | ||||
@@ -130,7 +130,7 @@ public class Javadoc | |||||
public void setBottom( String src ) | public void setBottom( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addBottom( h ); | addBottom( h ); | ||||
} | } | ||||
@@ -219,7 +219,7 @@ public class Javadoc | |||||
public void setDoctitle( String src ) | public void setDoctitle( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addDoctitle( h ); | addDoctitle( h ); | ||||
} | } | ||||
@@ -250,7 +250,7 @@ public class Javadoc | |||||
public void setFooter( String src ) | public void setFooter( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addFooter( h ); | addFooter( h ); | ||||
} | } | ||||
@@ -262,7 +262,7 @@ public class Javadoc | |||||
public void setHeader( String src ) | public void setHeader( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addHeader( h ); | addHeader( h ); | ||||
} | } | ||||
@@ -71,7 +71,7 @@ public class Script extends Task | |||||
* | * | ||||
* @param text The feature to be added to the Text attribute | * @param text The feature to be added to the Text attribute | ||||
*/ | */ | ||||
public void addText( String text ) | |||||
public void addContent( String text ) | |||||
{ | { | ||||
this.script += text; | this.script += text; | ||||
} | } | ||||
@@ -369,7 +369,7 @@ public class TelnetTask extends Task | |||||
taskString += s; | taskString += s; | ||||
} | } | ||||
public void addText( String s ) | |||||
public void addContent( String s ) | |||||
{ | { | ||||
setString( s ); | setString( s ); | ||||
} | } | ||||
@@ -60,7 +60,7 @@ public class Echo | |||||
* | * | ||||
* @param msg The feature to be added to the Text attribute | * @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 | throws TaskException | ||||
{ | { | ||||
m_message = message; | m_message = message; | ||||
@@ -85,7 +85,7 @@ public class Input extends Task | |||||
* | * | ||||
* @param msg The feature to be added to the Text attribute | * @param msg The feature to be added to the Text attribute | ||||
*/ | */ | ||||
public void addText( String msg ) | |||||
public void addContent( String msg ) | |||||
throws TaskException | throws TaskException | ||||
{ | { | ||||
message += getProject().replaceProperties( msg ); | message += getProject().replaceProperties( msg ); | ||||
@@ -114,7 +114,7 @@ public class Replace extends MatchingTask | |||||
*/ | */ | ||||
public void setToken( String token ) | 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 ) | public void setValue( String value ) | ||||
{ | { | ||||
createReplaceValue().addText( value ); | |||||
createReplaceValue().addContent( value ); | |||||
} | } | ||||
public Properties getProperties( File propertyFile ) | public Properties getProperties( File propertyFile ) | ||||
@@ -485,7 +485,7 @@ public class Replace extends MatchingTask | |||||
return buf.toString(); | return buf.toString(); | ||||
} | } | ||||
public void addText( String val ) | |||||
public void addContent( String val ) | |||||
{ | { | ||||
buf.append( val ); | buf.append( val ); | ||||
} | } | ||||
@@ -354,7 +354,7 @@ public class SQLExec extends Task | |||||
* | * | ||||
* @param sql The feature to be added to the Text attribute | * @param sql The feature to be added to the Text attribute | ||||
*/ | */ | ||||
public void addText( String sql ) | |||||
public void addContent( String sql ) | |||||
{ | { | ||||
this.sqlCommand += sql; | this.sqlCommand += sql; | ||||
} | } | ||||
@@ -425,7 +425,7 @@ public class SQLExec extends Task | |||||
// Make a transaction group for the outer command | // Make a transaction group for the outer command | ||||
Transaction t = createTransaction(); | Transaction t = createTransaction(); | ||||
t.setSrc( srcFile ); | t.setSrc( srcFile ); | ||||
t.addText( sqlCommand ); | |||||
t.addContent( sqlCommand ); | |||||
} | } | ||||
if( driver == null ) | if( driver == null ) | ||||
@@ -839,7 +839,7 @@ public class SQLExec extends Task | |||||
this.tSrcFile = src; | this.tSrcFile = src; | ||||
} | } | ||||
public void addText( String sql ) | |||||
public void addContent( String sql ) | |||||
{ | { | ||||
this.tSqlCommand += sql; | this.tSqlCommand += sql; | ||||
} | } | ||||
@@ -30,7 +30,7 @@ public class GroupArgument | |||||
public void setTitle( final String src ) | public void setTitle( final String src ) | ||||
{ | { | ||||
final Html h = new Html(); | final Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addTitle( h ); | addTitle( h ); | ||||
} | } | ||||
@@ -16,7 +16,7 @@ public class Html | |||||
return m_text.toString(); | return m_text.toString(); | ||||
} | } | ||||
public void addText( final String text ) | |||||
public void addContent( final String text ) | |||||
{ | { | ||||
m_text.append( text ); | m_text.append( text ); | ||||
} | } | ||||
@@ -130,7 +130,7 @@ public class Javadoc | |||||
public void setBottom( String src ) | public void setBottom( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addBottom( h ); | addBottom( h ); | ||||
} | } | ||||
@@ -219,7 +219,7 @@ public class Javadoc | |||||
public void setDoctitle( String src ) | public void setDoctitle( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addDoctitle( h ); | addDoctitle( h ); | ||||
} | } | ||||
@@ -250,7 +250,7 @@ public class Javadoc | |||||
public void setFooter( String src ) | public void setFooter( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addFooter( h ); | addFooter( h ); | ||||
} | } | ||||
@@ -262,7 +262,7 @@ public class Javadoc | |||||
public void setHeader( String src ) | public void setHeader( String src ) | ||||
{ | { | ||||
Html h = new Html(); | Html h = new Html(); | ||||
h.addText( src ); | |||||
h.addContent( src ); | |||||
addHeader( h ); | addHeader( h ); | ||||
} | } | ||||
@@ -71,7 +71,7 @@ public class Script extends Task | |||||
* | * | ||||
* @param text The feature to be added to the Text attribute | * @param text The feature to be added to the Text attribute | ||||
*/ | */ | ||||
public void addText( String text ) | |||||
public void addContent( String text ) | |||||
{ | { | ||||
this.script += text; | this.script += text; | ||||
} | } | ||||
@@ -369,7 +369,7 @@ public class TelnetTask extends Task | |||||
taskString += s; | taskString += s; | ||||
} | } | ||||
public void addText( String s ) | |||||
public void addContent( String s ) | |||||
{ | { | ||||
setString( s ); | setString( s ); | ||||
} | } | ||||