<filterchain> ele
A FilterChain is formed by defining zero or more of the following
nested elements.since Ant 1.8.0
+ +| Parameter Name | +Parameter Value | +Required | +
| append | +Appendix to be attached to lines. | +Yes | +
+
Foo to all lines.
++ +Convenience method: ++<filterreader classname="org.apache.tools.ant.filters.AppendToLines"> + <param name="append" value="Foo"/> +</filterreader> +
++<appendtolines append="Foo"/> +
<appendtolines append="Foo"/>+ * + * Or: + * + *
<filterreader classname="org.apache.tools.ant.filters.AppendToLines"> + * <param name="append" value="Foo"/> + * </filterreader>+ * + * @since Ant 1.8.0 + */ +public final class AppendToLines + extends BaseParamFilterReader + implements ChainableReader { + /** Parameter name for the prefix. */ + private static final String APPEND_KEY = "append"; + + /** The appendix to be used. */ + private String append = null; + + /** Data that must be read from, if not null. */ + private String queuedData = null; + + /** + * Constructor for "dummy" instances. + * + * @see BaseFilterReader#BaseFilterReader() + */ + public AppendToLines() { + super(); + } + + /** + * Creates a new filtered reader. + * + * @param in A Reader object providing the underlying stream. + * Must not be
null.
+ */
+ public AppendToLines(final Reader in) {
+ super(in);
+ }
+
+ /**
+ * Returns the next character in the filtered stream. One line is read
+ * from the original input, and the appendix added. The resulting
+ * line is then used until it ends, at which point the next original line
+ * is read, etc.
+ *
+ * @return the next character in the resulting stream, or -1
+ * if the end of the resulting stream has been reached
+ *
+ * @exception IOException if the underlying stream throws an IOException
+ * during reading
+ */
+ public int read() throws IOException {
+ if (!getInitialized()) {
+ initialize();
+ setInitialized(true);
+ }
+
+ int ch = -1;
+
+ if (queuedData != null && queuedData.length() == 0) {
+ queuedData = null;
+ }
+
+ if (queuedData != null) {
+ ch = queuedData.charAt(0);
+ queuedData = queuedData.substring(1);
+ if (queuedData.length() == 0) {
+ queuedData = null;
+ }
+ } else {
+ queuedData = readLine();
+ if (queuedData == null) {
+ ch = -1;
+ } else {
+ if (append != null) {
+ String lf = "";
+ if (queuedData.endsWith("\r\n")) {
+ lf = "\r\n";
+ } else if (queuedData.endsWith("\n")) {
+ lf = "\n";
+ }
+ queuedData =
+ queuedData.substring(0,
+ queuedData.length() - lf.length())
+ + append + lf;
+ }
+ return read();
+ }
+ }
+ return ch;
+ }
+
+ /**
+ * Sets the appendix to add at the end of each input line.
+ *
+ * @param append The appendix to add at the end of each input line.
+ * May be null, in which case no appendix
+ * is added.
+ */
+ public void setAppend(final String append) {
+ this.append = append;
+ }
+
+ /**
+ * Returns the appendix which will be added at the end of each input line.
+ *
+ * @return the appendix which will be added at the end of each input line
+ */
+ private String getAppend() {
+ return append;
+ }
+
+ /**
+ * Creates a new AppendToLines filter using the passed in
+ * Reader for instantiation.
+ *
+ * @param rdr A Reader object providing the underlying stream.
+ * Must not be null.
+ *
+ * @return a new filter based on this configuration, but filtering
+ * the specified reader
+ */
+ public Reader chain(final Reader rdr) {
+ AppendToLines newFilter = new AppendToLines(rdr);
+ newFilter.setAppend(getAppend());
+ newFilter.setInitialized(true);
+ return newFilter;
+ }
+
+ /**
+ * Initializes the appendix if it is available from the parameters.
+ */
+ private void initialize() {
+ Parameter[] params = getParameters();
+ if (params != null) {
+ for (int i = 0; i < params.length; i++) {
+ if (APPEND_KEY.equals(params[i].getName())) {
+ append = params[i].getValue();
+ break;
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/org/apache/tools/ant/types/FilterChain.java b/src/main/org/apache/tools/ant/types/FilterChain.java
index ebfc1531a..7808b6b51 100644
--- a/src/main/org/apache/tools/ant/types/FilterChain.java
+++ b/src/main/org/apache/tools/ant/types/FilterChain.java
@@ -23,6 +23,7 @@ import java.util.Vector;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
+import org.apache.tools.ant.filters.AppendToLines;
import org.apache.tools.ant.filters.ChainableReader;
import org.apache.tools.ant.filters.ClassConstants;
import org.apache.tools.ant.filters.EscapeUnicode;
@@ -154,6 +155,19 @@ public class FilterChain extends DataType
filterReaders.addElement(prefixLines);
}
+ /**
+ * Add a PrefixLines filter.
+ *
+ * @param prefixLines a AppendToLines value
+ */
+ public void addAppendToLines(final AppendToLines appendToLines) {
+ if (isReference()) {
+ throw noChildrenAllowed();
+ }
+ setChecked(false);
+ filterReaders.addElement(appendToLines);
+ }
+
/**
* Add a ReplaceTokens filter.
*
diff --git a/src/tests/antunit/filters/append-test.xml b/src/tests/antunit/filters/append-test.xml
new file mode 100644
index 000000000..f953de2b3
--- /dev/null
+++ b/src/tests/antunit/filters/append-test.xml
@@ -0,0 +1,42 @@
+
+
+