Author: michiel
Date: 2009-05-29 15:32:32 +0200 (Fri, 29 May 2009)
New Revision: 35515
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/Base64.java
mmbase/trunk/src/org/mmbase/util/transformers/BufferedReaderTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/ByteCharTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/ByteToCharTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/CP1252Surrogator.java
mmbase/trunk/src/org/mmbase/util/transformers/Censor.java
mmbase/trunk/src/org/mmbase/util/transformers/ChainedCharTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/ChecksumFactory.java
mmbase/trunk/src/org/mmbase/util/transformers/ChunkedTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/Config.java
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableReaderTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableStringTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/CopyCharTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/EncryptionTransformerFactory.java
mmbase/trunk/src/org/mmbase/util/transformers/Figlet.java
mmbase/trunk/src/org/mmbase/util/transformers/GoogleHighlighterFactory.java
mmbase/trunk/src/org/mmbase/util/transformers/Hex.java
mmbase/trunk/src/org/mmbase/util/transformers/Identifier.java
mmbase/trunk/src/org/mmbase/util/transformers/InverseCharTransformer.java
mmbase/trunk/src/org/mmbase/util/transformers/Javascript.java
mmbase/trunk/src/org/mmbase/util/transformers/Latin3Surrogator.java
mmbase/trunk/src/org/mmbase/util/transformers/LinkFinder.java
mmbase/trunk/src/org/mmbase/util/transformers/LowerCaser.java
mmbase/trunk/src/org/mmbase/util/transformers/MD5.java
mmbase/trunk/src/org/mmbase/util/transformers/ParagraphTransformerFactory.java
mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacer.java
mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacerFactory.java
Log:
Various nb-recommendations
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Base64.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Base64.java 2009-05-29
13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Base64.java 2009-05-29
13:32:32 UTC (rev 35515)
@@ -24,6 +24,7 @@
*/
public class Base64 implements ByteToCharTransformer, ConfigurableTransformer {
+ private static final long serialVersionUID = 0L;
private final static String ENCODING = "BASE64";
private final static int BASE_64 = 1;
@@ -31,17 +32,27 @@
private static char[] map1 = new char[64];
static {
int i=0;
- for (char c='A'; c<='Z'; c++) map1[i++] = c;
- for (char c='a'; c<='z'; c++) map1[i++] = c;
- for (char c='0'; c<='9'; c++) map1[i++] = c;
+ for (char c='A'; c<='Z'; c++) {
+ map1[i++] = c;
+ }
+ for (char c='a'; c<='z'; c++) {
+ map1[i++] = c;
+ }
+ for (char c='0'; c<='9'; c++) {
+ map1[i++] = c;
+ }
map1[i++] = '+'; map1[i++] = '/';
}
// Mapping table from Base64 characters to 6-bit nibbles.
private static byte[] map2 = new byte[128];
static {
- for (int i=0; i<map2.length; i++) map2[i] = -1;
- for (int i=0; i<64; i++) map2[map1[i]] = (byte)i;
+ for (int i=0; i<map2.length; i++) {
+ map2[i] = -1;
+ }
+ for (int i=0; i<64; i++) {
+ map2[map1[i]] = (byte) i;
+ }
}
@@ -121,7 +132,9 @@
char[] in = r.toCharArray();
int iLen = in.length;
if (iLen%4 != 0) throw new IllegalArgumentException ("Length of Base64
encoded input string is not a multiple of 4.");
- while (iLen > 0 && in[iLen-1] == '=') iLen--;
+ while (iLen > 0 && in[iLen-1] == '=') {
+ iLen--;
+ }
int oLen = (iLen*3) / 4;
byte[] out = new byte[oLen];
int ip = 0;
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/BufferedReaderTransformer.java
===================================================================
---
mmbase/trunk/src/org/mmbase/util/transformers/BufferedReaderTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++
mmbase/trunk/src/org/mmbase/util/transformers/BufferedReaderTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -10,8 +10,6 @@
package org.mmbase.util.transformers;
import java.io.*;
-import java.util.HashMap;
-import java.util.Map;
import org.mmbase.util.logging.*;
@@ -59,7 +57,7 @@
protected abstract Status createNewStatus();
- abstract static class Status{
+ protected abstract static class Status {
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/ByteCharTransformer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/ByteCharTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/ByteCharTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -23,7 +23,7 @@
*/
public class ByteCharTransformer extends ReaderTransformer implements
CharTransformer {
-
+ private static final long serialVersionUID = 0L;
private ByteToCharTransformer byteToChars;
private String encoding = "UTF-8";
public ByteCharTransformer(ByteToCharTransformer b) {
@@ -39,6 +39,7 @@
return byteToChars.transform(new ReaderInputStream(reader, encoding),
writer);
}
+ @Override
public String toString() {
return "CHAR " + byteToChars ;
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/ByteToCharTransformer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/ByteToCharTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/ByteToCharTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -22,13 +22,13 @@
public interface ByteToCharTransformer extends Transformer {
- public Writer transform(InputStream r);
- public Writer transform(InputStream r, Writer w);
+ Writer transform(InputStream r);
+ Writer transform(InputStream r, Writer w);
- public OutputStream transformBack(Reader r);
- public OutputStream transformBack(Reader r, OutputStream o);
+ OutputStream transformBack(Reader r);
+ OutputStream transformBack(Reader r, OutputStream o);
- public String transform(byte[] r);
- public byte[] transformBack(String r);
+ String transform(byte[] r);
+ byte[] transformBack(String r);
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/CP1252Surrogator.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/CP1252Surrogator.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/CP1252Surrogator.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -26,6 +26,7 @@
*/
public class CP1252Surrogator extends ConfigurableReaderTransformer implements
CharTransformer {
+ private final static long serialVersionUID = 0L;
private static final Logger log =
Logging.getLoggerInstance(CP1252Surrogator.class);
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Censor.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Censor.java 2009-05-29
13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Censor.java 2009-05-29
13:32:32 UTC (rev 35515)
@@ -23,6 +23,7 @@
*/
public class Censor extends RegexpReplacer {
+ private static final long serialVersionUID = 0L;
protected static Collection<Entry<Pattern,String>> forbidden = new
ArrayList<Entry<Pattern,String>>();
@@ -30,16 +31,19 @@
new Censor().readPatterns(forbidden);
}
+ @Override
protected Collection<Entry<Pattern,String>> getPatterns() {
return forbidden;
}
+ @Override
protected String getConfigFile() {
return "censor.xml";
}
+ @Override
protected void readDefaultPatterns(Collection<Entry<Pattern,String>>
patterns) {
patterns.add(new Entry<Pattern,String>(Pattern.compile("(?i)mmbase"),
"MMBase"));
patterns.add(new
Entry<Pattern,String>(Pattern.compile("(?i)microsoft"), "Micro$soft"));
@@ -47,6 +51,7 @@
}
+ @Override
public String toString() {
return "CENSOR";
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/ChainedCharTransformer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/ChainedCharTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/ChainedCharTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -48,6 +48,7 @@
*/
public class ChainedCharTransformer extends ReaderTransformer implements
CharTransformer {
+ private static final long serialVersionUID = 0L;
private static Logger log =
Logging.getLoggerInstance(ChainedCharTransformer.class);
private List<CharTransformer> charTransformers = new
ArrayList<CharTransformer>();
@@ -96,6 +97,7 @@
/**
* Implementation without Threads. Not needed when transforming by String.
*/
+ @Override
public String transform(String string) {
for (CharTransformer ct : charTransformers) {
string = ct.transform(string);
@@ -155,6 +157,7 @@
return endWriter;
}
+ @Override
public String toString() {
return "CHAINED" + charTransformers;
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/ChecksumFactory.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/ChecksumFactory.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/ChecksumFactory.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -74,6 +74,7 @@
}
}
+ @Override
public String toString() {
return "checksum(" + checksum + ")";
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/ChunkedTransformer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/ChunkedTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/ChunkedTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -70,6 +70,7 @@
protected boolean onlyFirstPattern = false;
protected boolean onlyFirstMatch = false;
+ @Override
public void configure(int i) {
onlyFirstMatch = ((i & ONLY_REPLACE_FIRST_MATCH) > 0);
onlyFirstPattern = ((i & ONLY_USE_FIRST_MATCHING_PATTERN) > 0);
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Config.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Config.java 2009-05-29
13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Config.java 2009-05-29
13:32:32 UTC (rev 35515)
@@ -11,12 +11,13 @@
/**
* Describes what encoding is configured.
+ * @version $Id$
*/
public class Config {
- public Class<?> clazz;
- public int config;
- public String info;
+ public final Class<?> clazz;
+ public final int config;
+ public final String info;
public Config(Class<?> c, int i ) {
clazz = c;
config = i;
@@ -27,6 +28,7 @@
config = i;
info = in;
}
+ @Override
public String toString() {
return "" + config + ":" + info;
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableReaderTransformer.java
===================================================================
---
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableReaderTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableReaderTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -37,6 +37,7 @@
abstract public Map<String,Config> transformers();
abstract public String getEncoding();
+ @Override
public String toString() {
try {
return getEncoding();
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableStringTransformer.java
===================================================================
---
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableStringTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++
mmbase/trunk/src/org/mmbase/util/transformers/ConfigurableStringTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -38,6 +38,7 @@
abstract public Map<String,Config> transformers();
abstract public String getEncoding();
+ @Override
public String toString() {
try {
return getEncoding();
Modified: mmbase/trunk/src/org/mmbase/util/transformers/CopyCharTransformer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/CopyCharTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/CopyCharTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -25,7 +25,7 @@
*/
public class CopyCharTransformer extends ReaderTransformer implements
CharTransformer {
-
+ private static final long serialVersionUID = 0L;
public static final CopyCharTransformer INSTANCE = new
CopyCharTransformer();
private CopyCharTransformer() {
@@ -43,20 +43,24 @@
}
// implementation, javadoc inherited
+ @Override
public Writer transformBack(Reader r, Writer w) {
return transform(r, w);
}
// overridden for performance.
+ @Override
public String transform(String s) {
return s;
}
// overridden for performance.
+ @Override
public String transformBack(String s) {
return s;
}
+ @Override
public String toString() {
return "COPY";
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/EncryptionTransformerFactory.java
===================================================================
---
mmbase/trunk/src/org/mmbase/util/transformers/EncryptionTransformerFactory.java
2009-05-29 13:32:01 UTC (rev 35514)
+++
mmbase/trunk/src/org/mmbase/util/transformers/EncryptionTransformerFactory.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -101,9 +101,10 @@
}
class Encryption extends ReaderTransformer {
- private String key;
- private String format;
- private String algorithm;
+ private static final long serialVersionUID = 0L;
+ private final String key;
+ private final String format;
+ private final String algorithm;
Encryption(String key, String format, String algorithm) {
this.key = key;
@@ -151,9 +152,10 @@
}
class Decryption extends ReaderTransformer {
- private String key;
- private String format;
- private String algorithm;
+ private static final long serialVersionUID = 0L;
+ private final String key;
+ private final String format;
+ private final String algorithm;
Decryption(String key, String format, String algorithm) {
this.key = key;
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Figlet.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Figlet.java 2009-05-29
13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Figlet.java 2009-05-29
13:32:32 UTC (rev 35515)
@@ -21,6 +21,7 @@
*/
public class Figlet extends AbstractCommandStringTransformer implements
CharTransformer {
+ private static final long serialVersionUID = 0L;
protected String[] getCommand() {
return new String[] {"figlet", "-w", "160"};
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/GoogleHighlighterFactory.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/GoogleHighlighterFactory.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/GoogleHighlighterFactory.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -89,11 +89,13 @@
log.debug("Using search " + search);
RegexpReplacer trans = new RegexpReplacer() {
+ private static final long serialVersionUID = 0L;
private Collection<Entry<Pattern,String>> patterns = new
ArrayList<Entry<Pattern,String>>();
{
Pattern p = Pattern.compile("(" +
search.replace('+', '|') + ")");
patterns.add(new Entry<Pattern,String>(p,
parameters.get(FORMAT)));
}
+ @Override
public Collection<Entry<Pattern,String>> getPatterns() {
return patterns;
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Hex.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Hex.java 2009-05-29
13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Hex.java 2009-05-29
13:32:32 UTC (rev 35515)
@@ -22,6 +22,7 @@
*/
public class Hex extends ByteArrayToCharTransformer implements
ByteToCharTransformer, ConfigurableTransformer {
+ private static final long serialVersionUID = 0L;
private final static String ENCODING = "HEX";
private final static int HEX = 1;
@@ -63,6 +64,7 @@
* @return an array of bytes
* @throws IllegalArgumentException whenever the input string is not
correctly formatted.
*/
+ @Override
public byte[] transformBack(String r) {
try {
int strlen = r.length();
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Identifier.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Identifier.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Identifier.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -24,6 +24,7 @@
*/
public class Identifier extends ReaderTransformer implements CharTransformer {
+ private static final long serialVersionUID = 0L;
private static Logger log = Logging.getLoggerInstance(Identifier.class);
public Writer transform(Reader r, Writer w) {
@@ -45,6 +46,7 @@
return w;
}
+ @Override
public String toString() {
return "IDENTIFIER";
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/InverseCharTransformer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/InverseCharTransformer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/InverseCharTransformer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -22,9 +22,9 @@
*/
public class InverseCharTransformer implements CharTransformer {
+ private static final long serialVersionUID = 0L;
+ private final CharTransformer ct;
- private CharTransformer ct;
-
/**
* The constructor
* @param c The CharTransformed to be turned around.
@@ -58,6 +58,7 @@
}
+ @Override
public String toString() {
return "INVERSE " + ct;
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Javascript.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Javascript.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Javascript.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -23,6 +23,7 @@
*/
public class Javascript extends ConfigurableReaderTransformer implements
CharTransformer {
+ private static final long serialVersionUID = 0L;
private final static String SINGLE_QUOTES =
"JAVASCRIPT_ESCAPE_SINGLE_QUOTES";
private final static String DOUBLE_QUOTES =
"JAVASCRIPT_ESCAPE_DOUBLE_QUOTES";
private final static String BOTH_QUOTES =
"JAVASCRIPT_ESCAPE_BOTH_QUOTES";
@@ -129,6 +130,7 @@
}
}
+ @Override
public Writer transformBack(Reader r, Writer w) {
switch(to){
case ESCAPE_SINGLE_QUOTES:
Modified: mmbase/trunk/src/org/mmbase/util/transformers/Latin3Surrogator.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/Latin3Surrogator.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/Latin3Surrogator.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -27,6 +27,7 @@
* @version $Id$
*/
public class Latin3Surrogator extends ConfigurableReaderTransformer implements
CharTransformer {
+ private static final long serialVersionUID = 0L;
private static Logger log =
Logging.getLoggerInstance(Latin3Surrogator.class);
// esperanto
Modified: mmbase/trunk/src/org/mmbase/util/transformers/LinkFinder.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/LinkFinder.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/LinkFinder.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -24,6 +24,7 @@
*/
public class LinkFinder extends RegexpReplacer {
+ private static final long serialVersionUID = 0L;
protected static Collection<Entry<Pattern,String>> urlPatterns = new
ArrayList<Entry<Pattern,String>>();
@@ -38,15 +39,18 @@
}
+ @Override
protected String getConfigFile() {
return "linkfinder.xml";
}
+ @Override
protected Collection<Entry<Pattern,String>> getPatterns() {
return urlPatterns;
}
+ @Override
protected void readDefaultPatterns(Collection<Entry<Pattern,String>>
patterns) {
patterns.add(new Entry<Pattern,String>(Pattern.compile("....@.+"),
"<a href=\"mailto:$0\";>$0</a>"));
@@ -58,6 +62,7 @@
}
+ @Override
public String toString() {
return "LINKFINDER";
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/LowerCaser.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/LowerCaser.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/LowerCaser.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -23,6 +23,7 @@
*/
public class LowerCaser extends ReaderTransformer implements CharTransformer {
+ private static final long serialVersionUID = 0L;
private static Logger log = Logging.getLoggerInstance(LowerCaser.class);
public Writer transform(Reader r, Writer w) {
@@ -41,6 +42,7 @@
}
+ @Override
public String toString() {
return "LOWERCASER";
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/MD5.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/MD5.java 2009-05-29
13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/MD5.java 2009-05-29
13:32:32 UTC (rev 35515)
@@ -22,12 +22,13 @@
*/
public class MD5 extends StringTransformer implements CharTransformer {
-
+ private static final long serialVersionUID = 0L;
private static final Logger log = Logging.getLoggerInstance(MD5.class);
private final static String ENCODING = "MD5";
private MD5Implementation transformer = new MD5Implementation();
+ @Override
public String toString() {
return ENCODING;
}
@@ -36,6 +37,7 @@
return transformer.calcMD5(r);
}
+ @Override
public String transformBack(String w) {
throw new UnsupportedOperationException("transformBack(String) can
never be done for MD5(i hope so :p)");
}
@@ -43,6 +45,7 @@
// from http://pajhome.org.uk/crypt/md5/md5.java.txt
// With permission of Thomas Weber ([email protected])
static class MD5Implementation implements java.io.Serializable {
+ private static final long serialVersionUID = 0L;
/*
* A Java implementation of the RSA Data Security, Inc. MD5 Message
* Digest Algorithm, as defined in RFC 1321.
@@ -58,8 +61,9 @@
String hex_chr = "0123456789abcdef";
private String rhex(int num) {
String str = "";
- for (int j = 0; j <= 3; j++)
+ for (int j = 0; j <= 3; j++) {
str = str + hex_chr.charAt((num >> (j * 8 + 4)) & 0x0F) +
hex_chr.charAt((num >> (j * 8)) & 0x0F);
+ }
return str;
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/ParagraphTransformerFactory.java
===================================================================
---
mmbase/trunk/src/org/mmbase/util/transformers/ParagraphTransformerFactory.java
2009-05-29 13:32:01 UTC (rev 35514)
+++
mmbase/trunk/src/org/mmbase/util/transformers/ParagraphTransformerFactory.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -27,7 +27,7 @@
private static Logger log =
Logging.getLoggerInstance(ParagraphTransformerFactory.class);
protected final static Parameter[] PARAMS = {
- new Parameter("class", String.class, "")
+ new Parameter<String>("class", String.class, "")
};
public Transformer createTransformer(Parameters parameters) {
@@ -38,9 +38,9 @@
}
public class ParagraphTransformer extends StringTransformer {
+ private static final long serialVersionUID = 0L;
+ private final String className;
- private String className = null;
-
ParagraphTransformer(String c) {
className = c;
}
@@ -62,6 +62,7 @@
return r;
}
+ @Override
public String toString() {
return "PARAGRAPH";
}
Modified: mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacer.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacer.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacer.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -16,7 +16,6 @@
import org.mmbase.util.ResourceWatcher;
import org.mmbase.util.xml.UtilReader;
import org.mmbase.util.Entry;
-import org.mmbase.util.Casting;
import org.mmbase.util.logging.*;
@@ -31,6 +30,7 @@
*/
public class RegexpReplacer extends ChunkedTransformer<Pattern> {
+ private static final long serialVersionUID = 0L;
private static final Logger log =
Logging.getLoggerInstance(RegexpReplacer.class);
/**
@@ -140,6 +140,7 @@
Chunk(String s, boolean r) {
string = s; replaced = r;
}
+ @Override
public String toString() { return "'" + string + "'" + (replaced ? "."
: ""); }
}
@@ -234,6 +235,7 @@
return "REGEXPS";
}
+ @Override
public String toString() {
return getEncoding() + " " + getPatterns();
}
Modified:
mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacerFactory.java
===================================================================
--- mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacerFactory.java
2009-05-29 13:32:01 UTC (rev 35514)
+++ mmbase/trunk/src/org/mmbase/util/transformers/RegexpReplacerFactory.java
2009-05-29 13:32:32 UTC (rev 35515)
@@ -54,6 +54,7 @@
{
addPatterns(parameters.get(PATTERNS), patterns);
}
+ @Override
public Collection<Entry<Pattern,String>> getPatterns() {
return patterns;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
