Author: bayard
Date: Sat Mar 8 01:32:51 2008
New Revision: 634916
URL: http://svn.apache.org/viewvc?rev=634916&view=rev
Log:
Checkstyle fixes
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/DoubleMetaphone.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java?rev=634916&r1=634915&r2=634916&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
Sat Mar 8 01:32:51 2008
@@ -575,8 +575,8 @@
bitlen = ((bitlen + 7) >> 3) << 3;
byte[] bigBytes = bigInt.toByteArray();
- if(((bigInt.bitLength() % 8) != 0)
- && (((bigInt.bitLength() / 8) + 1) == (bitlen / 8))) {
+ if(((bigInt.bitLength() % 8) != 0) &&
+ (((bigInt.bitLength() / 8) + 1) == (bitlen / 8))) {
return bigBytes;
}
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/DoubleMetaphone.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/DoubleMetaphone.java?rev=634916&r1=634915&r2=634916&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/DoubleMetaphone.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/DoubleMetaphone.java
Sat Mar 8 01:32:51 2008
@@ -817,8 +817,8 @@
return false;
} else {
char c = charAt(value, index + 2);
- return (c != 'I' && c != 'E')
- || contains(value, index - 2, 6,
"BACHER", "MACHER");
+ return (c != 'I' && c != 'E') ||
+ contains(value, index - 2, 6, "BACHER",
"MACHER");
}
}
@@ -873,8 +873,8 @@
if (charAt(value, index + 1) == 'M') {
return true;
}
- return contains(value, index - 1, 3, "UMB")
- && ((index + 1) == value.length() - 1 ||
contains(value,
+ return contains(value, index - 1, 3, "UMB") &&
+ ((index + 1) == value.length() - 1 ||
contains(value,
index + 2, 2, "ER"));
}
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java?rev=634916&r1=634915&r2=634916&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/BCodec.java
Sat Mar 8 01:32:51 2008
@@ -168,9 +168,9 @@
} else if (value instanceof String) {
return encode((String) value);
} else {
- throw new EncoderException("Objects of type "
- + value.getClass().getName()
- + " cannot be encoded using BCodec");
+ throw new EncoderException("Objects of type " +
+ value.getClass().getName() +
+ " cannot be encoded using BCodec");
}
}
@@ -193,9 +193,9 @@
} else if (value instanceof String) {
return decode((String) value);
} else {
- throw new DecoderException("Objects of type "
- + value.getClass().getName()
- + " cannot be decoded using BCodec");
+ throw new DecoderException("Objects of type " +
+ value.getClass().getName() +
+ " cannot be decoded using BCodec");
}
}
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java?rev=634916&r1=634915&r2=634916&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QCodec.java
Sat Mar 8 01:32:51 2008
@@ -250,9 +250,9 @@
} else if (pObject instanceof String) {
return encode((String) pObject);
} else {
- throw new EncoderException("Objects of type "
- + pObject.getClass().getName()
- + " cannot be encoded using Q codec");
+ throw new EncoderException("Objects of type " +
+ pObject.getClass().getName() +
+ " cannot be encoded using Q codec");
}
}
@@ -275,9 +275,9 @@
} else if (pObject instanceof String) {
return decode((String) pObject);
} else {
- throw new DecoderException("Objects of type "
- + pObject.getClass().getName()
- + " cannot be decoded using Q codec");
+ throw new DecoderException("Objects of type " +
+ pObject.getClass().getName() +
+ " cannot be decoded using Q codec");
}
}
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java?rev=634916&r1=634915&r2=634916&view=diff
==============================================================================
---
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
(original)
+++
commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
Sat Mar 8 01:32:51 2008
@@ -322,9 +322,9 @@
} else if (pObject instanceof String) {
return encode((String) pObject);
} else {
- throw new EncoderException("Objects of type "
- + pObject.getClass().getName()
- + " cannot be quoted-printable encoded");
+ throw new EncoderException("Objects of type " +
+ pObject.getClass().getName() +
+ " cannot be quoted-printable encoded");
}
}
@@ -347,9 +347,9 @@
} else if (pObject instanceof String) {
return decode((String) pObject);
} else {
- throw new DecoderException("Objects of type "
- + pObject.getClass().getName()
- + " cannot be quoted-printable decoded");
+ throw new DecoderException("Objects of type " +
+ pObject.getClass().getName() +
+ " cannot be quoted-printable decoded");
}
}
