Author: bodewig
Date: Thu Aug 27 07:22:29 2009
New Revision: 808306
URL: http://svn.apache.org/viewvc?rev=808306&view=rev
Log:
Hey, TokenFilters can be used in filterchains with no effort, didn't know that
Modified:
ant/core/trunk/docs/manual/CoreTypes/filterchain.html
ant/core/trunk/src/main/org/apache/tools/ant/filters/UniqFilter.java
ant/core/trunk/src/tests/antunit/filters/uniq-test.xml
Modified: ant/core/trunk/docs/manual/CoreTypes/filterchain.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/CoreTypes/filterchain.html?rev=808306&r1=808305&r2=808306&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/CoreTypes/filterchain.html (original)
+++ ant/core/trunk/docs/manual/CoreTypes/filterchain.html Thu Aug 27 07:22:29
2009
@@ -1365,6 +1365,8 @@
<p>Suppresses all tokens that match their ancestor token. It is most
useful if combined with a sort filter.</p>
+<p>This filter may be used directly within a filterchain.</p>
+
<h4>Example:</h4>
This suppresses duplicate lines.
Modified: ant/core/trunk/src/main/org/apache/tools/ant/filters/UniqFilter.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/filters/UniqFilter.java?rev=808306&r1=808305&r2=808306&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/filters/UniqFilter.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/filters/UniqFilter.java Thu
Aug 27 07:22:29 2009
@@ -26,12 +26,10 @@
*
* @since Ant 1.8.0
*/
-public class UniqFilter implements TokenFilter.Filter {
+public class UniqFilter extends TokenFilter.ChainableReaderFilter {
private String lastLine = null;
- public UniqFilter() { }
-
public String filter(String string) {
return lastLine == null || !lastLine.equals(string)
? (lastLine = string) : null;
Modified: ant/core/trunk/src/tests/antunit/filters/uniq-test.xml
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/filters/uniq-test.xml?rev=808306&r1=808305&r2=808306&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/filters/uniq-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/filters/uniq-test.xml Thu Aug 27 07:22:29
2009
@@ -26,6 +26,18 @@
<copy file="input/uniq.txt"
tofile="${output}/uniq.txt">
<filterchain>
+ <uniqfilter/>
+ </filterchain>
+ </copy>
+ <au:assertFilesMatch
+ expected="expected/uniq.txt"
+ actual="${output}/uniq.txt"/>
+ </target>
+
+ <target name="testUniqTokenFilter" depends="setUp">
+ <copy file="input/uniq.txt"
+ tofile="${output}/uniq.txt">
+ <filterchain>
<tokenfilter>
<uniqfilter/>
</tokenfilter>
