Update of /var/cvs/src/org/mmbase/util/transformers
In directory
james.mmbase.org:/tmp/cvs-serv25982/src/org/mmbase/util/transformers
Modified Files:
CodeSampleFactory.java ChecksumFactory.java
TagStripperFactory.java ResourceBundleReplacerFactory.java
EncryptionTransformerFactory.java
Log Message:
Cleaned the code a little
Added some generic stuff for function and datatypes
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/transformers
Index: CodeSampleFactory.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/transformers/CodeSampleFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CodeSampleFactory.java 4 Aug 2007 08:09:14 -0000 1.5
+++ CodeSampleFactory.java 3 Feb 2008 17:33:56 -0000 1.6
@@ -29,7 +29,7 @@
*
* @author André van Toly
* @since MMBase 1.8.0
- * @version $Id: CodeSampleFactory.java,v 1.5 2007/08/04 08:09:14 michiel Exp $
+ * @version $Id: CodeSampleFactory.java,v 1.6 2008/02/03 17:33:56 nklasens Exp
$
*/
public class CodeSampleFactory implements
ParameterizedTransformerFactory<CharTransformer> {
@@ -37,10 +37,10 @@
private final static Logger log =
Logging.getLoggerInstance(CodeSampleFactory.class);
private final static Parameter[] PARAMS = new Parameter[] {
- new Parameter("starttag", String.class, "<pre>"),
- new Parameter("closetag", String.class, ""),
- new Parameter("escapecode", String.class, "text/html"), // like
attr. escaper of mm:content
- new Parameter("escaperest", String.class, ""), // do nothing by
default
+ new Parameter<String>("starttag", String.class, "<pre>"),
+ new Parameter<String>("closetag", String.class, ""),
+ new Parameter<String>("escapecode", String.class, "text/html"), //
like attr. escaper of mm:content
+ new Parameter<String>("escaperest", String.class, ""), // do
nothing by default
};
Index: ChecksumFactory.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/transformers/ChecksumFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ChecksumFactory.java 24 Feb 2007 21:57:50 -0000 1.10
+++ ChecksumFactory.java 3 Feb 2008 17:33:56 -0000 1.11
@@ -22,14 +22,14 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: ChecksumFactory.java,v 1.10 2007/02/24 21:57:50 nklasens Exp $
+ * @version $Id: ChecksumFactory.java,v 1.11 2008/02/03 17:33:56 nklasens Exp $
*/
public class ChecksumFactory implements ParameterizedTransformerFactory {
private static final Logger log =
Logging.getLoggerInstance(ChecksumFactory.class);
public static final Parameter[] PARAMS = new Parameter[] {
- new Parameter("implementation", String.class,
java.util.zip.Adler32.class.getName())
+ new Parameter<String>("implementation", String.class,
java.util.zip.Adler32.class.getName())
};
public Parameters createParameters() {
Index: TagStripperFactory.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/transformers/TagStripperFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- TagStripperFactory.java 6 Dec 2007 08:26:13 -0000 1.11
+++ TagStripperFactory.java 3 Feb 2008 17:33:56 -0000 1.12
@@ -19,7 +19,7 @@
*
* http://javafaq.nu/java-example-code-618.html
* @author Michiel Meeuwissen
- * @version $Id: TagStripperFactory.java,v 1.11 2007/12/06 08:26:13 michiel
Exp $
+ * @version $Id: TagStripperFactory.java,v 1.12 2008/02/03 17:33:56 nklasens
Exp $
* @since MMBase-1.8.4
*/
public class TagStripperFactory implements
ParameterizedTransformerFactory<CharTransformer> {
@@ -320,7 +320,7 @@
}
protected void handleAttributes(Tag t, MutableAttributeSet attributes)
throws IOException {
- Enumeration en = attributes.getAttributeNames();
+ Enumeration<?> en = attributes.getAttributeNames();
while (en.hasMoreElements()) {
Object attName = en.nextElement();
if (addBrs && attName.equals("nl_")) continue;
@@ -483,7 +483,7 @@
// String source = "<p style=\"nanana\">allow this <b>but not
this</b></p>";
// String source = "<p style=nanana/>";
// String source = "<p style=\"nanana\">text</p>";
- String source = "<P sTyle=\"nanana\">hoi hoi\n<br><table WIDTH=\"45\"
height=99 border='1\"' fONt=bold styLe=\"n\\\"one\">\nbla bla bla</table></p>";
+// String source = "<P sTyle=\"nanana\">hoi hoi\n<br><table
WIDTH=\"45\" height=99 border='1\"' fONt=bold styLe=\"n\\\"one\">\nbla bla
bla</table></p>";
//System.out.println("Source = "+source);
Writer w = new OutputStreamWriter(System.out);
transformer.transform(new InputStreamReader(System.in), w);
Index: ResourceBundleReplacerFactory.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/util/transformers/ResourceBundleReplacerFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ResourceBundleReplacerFactory.java 4 Aug 2007 07:45:52 -0000 1.6
+++ ResourceBundleReplacerFactory.java 3 Feb 2008 17:33:56 -0000 1.7
@@ -24,7 +24,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: ResourceBundleReplacerFactory.java,v 1.6 2007/08/04 07:45:52
michiel Exp $
+ * @version $Id: ResourceBundleReplacerFactory.java,v 1.7 2008/02/03 17:33:56
nklasens Exp $
*/
public class ResourceBundleReplacerFactory implements
ParameterizedTransformerFactory<CharTransformer> {
@@ -32,8 +32,8 @@
protected static final Parameter[] PARAMS = new Parameter[] {
- new Parameter("basename", String.class, true),
- new Parameter("mode", String.class),
+ new Parameter<String>("basename", String.class, true),
+ new Parameter<String>("mode", String.class),
Parameter.LOCALE
};
Index: EncryptionTransformerFactory.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/util/transformers/EncryptionTransformerFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EncryptionTransformerFactory.java 4 Aug 2007 08:09:14 -0000 1.3
+++ EncryptionTransformerFactory.java 3 Feb 2008 17:33:56 -0000 1.4
@@ -70,10 +70,10 @@
}
protected final static Parameter[] PARAMS = {
- new Parameter("key", String.class, "1234567890abcdef"),
- new Parameter("format", String.class, "hex"),
- new Parameter("algorithm", String.class, "AES"),
- new Parameter("direction", String.class, "encrypt")
+ new Parameter<String>("key", String.class, "1234567890abcdef"),
+ new Parameter<String>("format", String.class, "hex"),
+ new Parameter<String>("algorithm", String.class, "AES"),
+ new Parameter<String>("direction", String.class, "encrypt")
};
public Parameters createParameters() {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
