umagesh 02/02/27 13:50:40
Modified: proposal/sandbox/filterreaders README
proposal/sandbox/filterreaders/docs/manual/CoreTasks
loadfile.html
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/taskdefs
LoadFile.java LoadProperties.java
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util
ChainReaderHelper.java
Removed: proposal/sandbox/filterreaders/docs/manual/CoreTypes
filterreaderset.html
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/types
FilterReaderSet.java
Log:
FilterReaderSet -> FilterChain as this is more representative of the
collection.
Documentation updates.
Revision Changes Path
1.4 +23 -6 jakarta-ant/proposal/sandbox/filterreaders/README
Index: README
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/sandbox/filterreaders/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README 15 Feb 2002 21:55:50 -0000 1.3
+++ README 27 Feb 2002 21:50:40 -0000 1.4
@@ -20,13 +20,17 @@
Design:
======
-* FilterReaderSet is a collection of 'AntFilterReader's
+* FilterChain is an ordered collection of 'AntFilterReader's and
+ 'java.io.FilterReader's
* Each AntFilterReader encloses the custom class representing
the actual java.io.FilterReader and contains configuration
parameters that may be used by the custom class if it
implements the org.apache.tools.ant.types.Parameterizable
interface.
+
+* For ease of use, Ant's core filter readers can
+ be used with a filter reader specific syntax also.
* Custom filter readers can be created easily even
without using any of Ant's API - all one needs to
@@ -44,14 +48,14 @@
=======
<loadfile srcFile="foo" property="bar">
- <filterreaderset>
+ <filterchain>
<filterreader
classname="org.apache.tools.ant.filters.StripLineComments">
- <param name="cpp.comment" value="//"/>
- <param name="oracle.comment" value="REM"/>
- <param name="dbms.comment" value="--"/>
+ <param type="comment" value="//"/>
+ <param type="comment" value="REM "/>
+ <param type="comment" value="--"/>
</filterreader>
<filterreader
classname="org.apache.tools.ant.filters.StripLineBreaks"/>
- </filterreaderset>
+ </filterchain>
</loadfile>
The above example loads the contents of the file foo,
@@ -59,3 +63,16 @@
removes line breaks and then stores the result in
the property named bar.
+Since StripLineComments and StripLineBreaks are built-in
+Ant filter readers, the same can also be represented as:
+
+<loadfile srcFile="foo" property="bar">
+ <filterchain>
+ <striplinecomments>
+ <comment value="//"/>
+ <comment value="REM "/>
+ <comment value="--"/>
+ </striplinecomments>
+ <striplinebreaks/>
+ </filterchain>
+</loadfile>
1.2 +3 -3
jakarta-ant/proposal/sandbox/filterreaders/docs/manual/CoreTasks/loadfile.html
Index: loadfile.html
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/sandbox/filterreaders/docs/manual/CoreTasks/loadfile.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- loadfile.html 18 Feb 2002 18:37:50 -0000 1.1
+++ loadfile.html 27 Feb 2002 21:50:40 -0000 1.2
@@ -74,9 +74,9 @@
<pre> <loadfile
property="mail.recipients"
srcFile="recipientlist.txt">
- <filterreaderset>
- <filterreader classname="org.apache.tools.ant.filters.<a
href="../CoreTypes/filterreaderset.html#StripLineBreaks">StripLineBreaks</a>"
/>
- </filterreaderset>
+ <filterchain>
+ <filterreader classname="org.apache.tools.ant.filters.<a
href="../CoreTypes/filterchain.html#StripLineBreaks">StripLineBreaks</a>" />
+ </filterchaint>
</loadfile>
</pre>
Load a property which can be used as a parameter for another task (in this
case mail),
1.8 +7 -7
jakarta-ant/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/taskdefs/LoadFile.java
Index: LoadFile.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/taskdefs/LoadFile.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LoadFile.java 24 Feb 2002 01:58:31 -0000 1.7
+++ LoadFile.java 27 Feb 2002 21:50:40 -0000 1.8
@@ -56,7 +56,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.FilterReaderSet;
+import org.apache.tools.ant.types.FilterChain;
import org.apache.tools.ant.util.ChainReaderHelper;
import java.io.*;
@@ -98,9 +98,9 @@
private boolean evaluateProperties=false;
/**
- * Holds filterReaderSets
+ * Holds FilterChains
*/
- private final Vector filterReaderSets = new Vector();
+ private final Vector filterChains = new Vector();
/**
* Encoding to use for filenames, defaults to the platform's default
@@ -193,7 +193,7 @@
ChainReaderHelper crh = new ChainReaderHelper();
crh.setBufferSize(size);
crh.setPrimaryReader(instream);
- crh.setFilterReaderSets(filterReaderSets);
+ crh.setFilterChains(filterChains);
String text = crh.processStream();
@@ -231,10 +231,10 @@
}
/**
- * Add the FilterReaderSet element.
+ * Add the FilterChain element.
*/
- public final void addFilterReaderSet(FilterReaderSet filter) {
- filterReaderSets.addElement(filter);
+ public final void addFilterChain(FilterChain filter) {
+ filterChains.addElement(filter);
}
//end class
1.4 +7 -7
jakarta-ant/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
Index: LoadProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LoadProperties.java 24 Feb 2002 01:58:31 -0000 1.3
+++ LoadProperties.java 27 Feb 2002 21:50:40 -0000 1.4
@@ -56,7 +56,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.types.FilterReaderSet;
+import org.apache.tools.ant.types.FilterChain;
import org.apache.tools.ant.util.ChainReaderHelper;
import java.io.*;
@@ -76,9 +76,9 @@
private File srcFile = null;
/**
- * Holds filterReaderSets
+ * Holds filterchains
*/
- private final Vector filterReaderSets = new Vector();
+ private final Vector filterChains = new Vector();
/**
* Sets the srcfile attribute.
@@ -124,7 +124,7 @@
ChainReaderHelper crh = new ChainReaderHelper();
crh.setBufferSize(size);
crh.setPrimaryReader(instream);
- crh.setFilterReaderSets(filterReaderSets);
+ crh.setFilterChains(filterChains);
String text = crh.processStream();
if (!text.endsWith("\n")) {
@@ -186,10 +186,10 @@
}
/**
- * Add the FilterReaderSet element.
+ * Add the FilterChain element.
*/
- public final void addFilterReaderSet(FilterReaderSet filter) {
- filterReaderSets.addElement(filter);
+ public final void addFilterChain(FilterChain filter) {
+ filterChains.addElement(filter);
}
//end class
1.6 +9 -9
jakarta-ant/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java
Index: ChainReaderHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChainReaderHelper.java 27 Feb 2002 20:48:44 -0000 1.5
+++ ChainReaderHelper.java 27 Feb 2002 21:50:40 -0000 1.6
@@ -58,7 +58,7 @@
import org.apache.tools.ant.Project;
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.FilterChain;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.types.Parameter;
import org.apache.tools.ant.types.Parameterizable;
@@ -87,9 +87,9 @@
public int bufferSize = 4096;
/**
- * Collection of 'FilterReaderSet's.
+ * Chain of filters
*/
- public Vector filterReaderSets = new Vector();
+ public Vector filterChains = new Vector();
/**
* Sets the primary reader
@@ -109,8 +109,8 @@
/**
* Sets the collection of filter reader sets
*/
- public final void setFilterReaderSets(Vector frsets) {
- filterReaderSets = frsets;
+ public final void setFilterChains(Vector fchain) {
+ filterChains = fchain;
}
/**
@@ -125,13 +125,13 @@
Reader instream = primaryReader;
final char[] buffer = new char[bufferSize];
- final int filterReadersCount = filterReaderSets.size();
+ final int filterReadersCount = filterChains.size();
final Vector finalFilters = new Vector();
for (int i = 0; i < filterReadersCount; i++) {
- final FilterReaderSet filterset =
- (FilterReaderSet) filterReaderSets.elementAt(i);
- final Vector filterReaders = filterset.getFilterReaders();
+ final FilterChain filterchain =
+ (FilterChain) filterChains.elementAt(i);
+ final Vector filterReaders = filterchain.getFilterReaders();
final int readerCount = filterReaders.size();
for (int j = 0; j < readerCount; j++) {
finalFilters.addElement(filterReaders.elementAt(j));
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
