diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ChainableReader.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ChainableReader.java new file mode 100644 index 000000000..1ad96db65 --- /dev/null +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ChainableReader.java @@ -0,0 +1,7 @@ +package org.apache.tools.ant.filters; + +import java.io.Reader; + +public interface ChainableReader { + public Reader chain(Reader rdr); +} diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/CloneableReader.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/CloneableReader.java deleted file mode 100644 index 21db350fb..000000000 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/CloneableReader.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.apache.tools.ant.filters; - -import java.io.Reader; - -public interface CloneableReader { - public Reader clone(Reader rdr); -} diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/HeadFilter.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/HeadFilter.java index 97de2f1c5..6be71608e 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/HeadFilter.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/HeadFilter.java @@ -79,7 +79,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class HeadFilter extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { private static final String LINES_KEY = "lines"; @@ -192,7 +192,7 @@ public final class HeadFilter return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { HeadFilter newFilter = new HeadFilter(rdr); newFilter.setLines(getLines()); newFilter.setInitialized(true); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java index 7a08ebe95..4b1b1fd93 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java @@ -34,7 +34,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class LineContains extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { private static final String CONTAINS_KEY = "contains"; @@ -160,7 +160,7 @@ public final class LineContains return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { LineContains newFilter = new LineContains(rdr); newFilter.setContains(getContains()); newFilter.setInitialized(true); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java index b142446d8..5b5cab041 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java @@ -26,7 +26,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class PrefixLines extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { /** * prefix key @@ -145,7 +145,7 @@ public final class PrefixLines return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { PrefixLines newFilter = new PrefixLines(rdr); newFilter.setPrefix(getPrefix()); newFilter.setInitialized(true); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ReplaceTokens.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ReplaceTokens.java index c04871c52..2968e7bd3 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ReplaceTokens.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ReplaceTokens.java @@ -84,7 +84,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class ReplaceTokens extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { private static final char DEFAULT_BEGIN_TOKEN = '@'; @@ -237,7 +237,7 @@ public final class ReplaceTokens return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { ReplaceTokens newFilter = new ReplaceTokens(rdr); newFilter.setBeginToken(getBeginToken()); newFilter.setEndToken(getEndToken()); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripJavaComments.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripJavaComments.java index 32a31fe24..81b7b3d2d 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripJavaComments.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripJavaComments.java @@ -67,7 +67,7 @@ import java.io.StringReader; */ public final class StripJavaComments extends FilterReader - implements CloneableReader + implements ChainableReader { /** * This constructor is a dummy constructor and is @@ -167,7 +167,7 @@ public final class StripJavaComments return n; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { StripJavaComments newFilter = new StripJavaComments(rdr); return newFilter; } diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineBreaks.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineBreaks.java index 680aaf870..187636bf4 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineBreaks.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineBreaks.java @@ -75,7 +75,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class StripLineBreaks extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { /** * Linebreaks. What do to on funny IBM mainframes with odd line endings? @@ -177,7 +177,7 @@ public final class StripLineBreaks return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { StripLineBreaks newFilter = new StripLineBreaks(rdr); newFilter.setLineBreaks(getLineBreaks()); newFilter.setInitialized(true); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineComments.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineComments.java index c2c2fe0cc..15a75381b 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineComments.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineComments.java @@ -37,7 +37,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class StripLineComments extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { private static final String COMMENTS_KEY = "comment"; @@ -161,7 +161,7 @@ public final class StripLineComments return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { StripLineComments newFilter = new StripLineComments(rdr); newFilter.setComments(getComments()); newFilter.setInitialized(true); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TabsToSpaces.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TabsToSpaces.java index 861b992bf..556e20413 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TabsToSpaces.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TabsToSpaces.java @@ -79,7 +79,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class TabsToSpaces extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { private static final int DEFAULT_TAB_LENGTH = 8; @@ -183,7 +183,7 @@ public final class TabsToSpaces return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { TabsToSpaces newFilter = new TabsToSpaces(rdr); newFilter.setTablength(getTablength()); newFilter.setInitialized(true); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TailFilter.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TailFilter.java index 1d32a9566..5719cd86a 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TailFilter.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TailFilter.java @@ -79,7 +79,7 @@ import org.apache.tools.ant.types.Parameterizable; */ public final class TailFilter extends FilterReader - implements Parameterizable, CloneableReader + implements Parameterizable, ChainableReader { private static final String LINES_KEY = "lines"; @@ -237,7 +237,7 @@ public final class TailFilter return initialized; } - public final Reader clone(final Reader rdr) { + public final Reader chain(final Reader rdr) { TailFilter newFilter = new TailFilter(rdr); newFilter.setLines(getLines()); newFilter.setInitialized(true); diff --git a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java index d78ef6ede..256608753 100644 --- a/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java +++ b/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java @@ -56,7 +56,7 @@ package org.apache.tools.ant.util; import org.apache.tools.ant.AntClassLoader; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; -import org.apache.tools.ant.filters.CloneableReader; +import org.apache.tools.ant.filters.ChainableReader; import org.apache.tools.ant.types.AntFilterReader; import org.apache.tools.ant.types.FilterReaderSet; import org.apache.tools.ant.types.Path; @@ -195,9 +195,9 @@ public final class ChainReaderHelper { throw new BuildException(ite); } } - } else if (o instanceof CloneableReader && + } else if (o instanceof ChainableReader && o instanceof Reader) { - instream = ((CloneableReader) o).clone(instream); + instream = ((ChainableReader) o).chain(instream); } } }