Update of /var/cvs/src/org/mmbase/util/transformers
In directory james.mmbase.org:/tmp/cvs-serv5345/src/org/mmbase/util/transformers
Modified Files:
Tag: MMBase-1_8
ChunkedTransformer.java RegexpReplacerFactory.java
Log Message:
proper use of constants
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers
Index: ChunkedTransformer.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/transformers/ChunkedTransformer.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -b -r1.4.2.1 -r1.4.2.2
--- ChunkedTransformer.java 28 Mar 2007 12:25:16 -0000 1.4.2.1
+++ ChunkedTransformer.java 18 Mar 2008 15:09:41 -0000 1.4.2.2
@@ -28,6 +28,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8
+ * @version $Id
*/
public abstract class ChunkedTransformer extends ConfigurableReaderTransformer
implements CharTransformer {
@@ -73,13 +74,13 @@
protected boolean replaceFirstAll = false;
public void configure(int i) {
- if (i >= 200) {
+ if (i >= REPLACE_FIRST_ALL) {
replaceFirstAll = true;
- i -= 200;
+ i -= REPLACE_FIRST_ALL;
}
- if (i >= 100) {
+ if (i >= REPLACE_FIRST) {
replaceFirst = true;
- i -= 100;
+ i -= REPLACE_FIRST;
}
super.configure(i);
}
@@ -99,10 +100,11 @@
if (replaceFirstAll) used = new HashSet();
}
}
+
protected Status newStatus() {
return new Status();
-
}
+
/**
* Implement this. Return true if a replacement done.
*/
Index: RegexpReplacerFactory.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/transformers/RegexpReplacerFactory.java,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -b -r1.11 -r1.11.2.1
--- RegexpReplacerFactory.java 18 Jul 2006 12:11:55 -0000 1.11
+++ RegexpReplacerFactory.java 18 Mar 2008 15:09:41 -0000 1.11.2.1
@@ -21,6 +21,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8
+ * @version $Id
*/
public class RegexpReplacerFactory implements ParameterizedTransformerFactory {
@@ -63,8 +64,8 @@
boolean replaceFirst = "true".equals(firstParam);
boolean replaceFirstAll = "all".equals(firstParam);
trans.configure(c.config +
- (replaceFirst ? RegexpReplacer.REPLACE_FIRST : 0) +
- (replaceFirstAll ? RegexpReplacer.REPLACE_FIRST_ALL :
0)
+ (replaceFirst ? ChunkedTransformer.REPLACE_FIRST : 0) +
+ (replaceFirstAll ?
ChunkedTransformer.REPLACE_FIRST_ALL : 0)
);
return trans;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
