You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/03/28 19:35:58 UTC
svn commit: r1306487 - in /commons/proper/codec/trunk/src:
main/java/org/apache/commons/codec/
main/java/org/apache/commons/codec/binary/
main/java/org/apache/commons/codec/language/
main/java/org/apache/commons/codec/language/bm/ main/java/org/apache/...
Author: sebb
Date: Wed Mar 28 17:35:58 2012
New Revision: 1306487
URL: http://svn.apache.org/viewvc?rev=1306487&view=rev
Log:
Add missing @Override now we are using Java 1.6
Modified:
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Hex.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/AbstractCaverphone.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone1.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone2.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Nysiis.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/BCodec.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QCodec.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/URLCodec.java
commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java Wed Mar 28 17:35:58 2012
@@ -68,6 +68,7 @@ public class StringEncoderComparator imp
* @return the Comparable.compareTo() return code or 0 if an encoding error was caught.
* @see Comparable
*/
+ @Override
public int compare(Object o1, Object o2) {
int compareCode = 0;
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Hex.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Hex.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Hex.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Hex.java Wed Mar 28 17:35:58 2012
@@ -225,6 +225,7 @@ public class Hex implements BinaryEncode
* Thrown if an odd number of characters is supplied to this function
* @see #decodeHex(char[])
*/
+ @Override
public byte[] decode(byte[] array) throws DecoderException {
return decodeHex(new String(array, getCharset()).toCharArray());
}
@@ -242,6 +243,7 @@ public class Hex implements BinaryEncode
* char[]
* @see #decodeHex(char[])
*/
+ @Override
public Object decode(Object object) throws DecoderException {
try {
char[] charArray = object instanceof String ? ((String) object).toCharArray() : (char[]) object;
@@ -266,6 +268,7 @@ public class Hex implements BinaryEncode
* @since 1.7 No longer throws IllegalStateException if the charsetName is invalid.
* @see #encodeHex(byte[])
*/
+ @Override
public byte[] encode(byte[] array) {
return encodeHexString(array).getBytes(this.getCharset());
}
@@ -286,6 +289,7 @@ public class Hex implements BinaryEncode
* Thrown if the given object is not a String or byte[]
* @see #encodeHex(byte[])
*/
+ @Override
public Object encode(Object object) throws EncoderException {
try {
byte[] byteArray = object instanceof String ? ((String) object).getBytes(this.getCharset()) : (byte[]) object;
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/AbstractCaverphone.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/AbstractCaverphone.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/AbstractCaverphone.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/AbstractCaverphone.java Wed Mar 28 17:35:58 2012
@@ -51,6 +51,7 @@ public abstract class AbstractCaverphone
* @throws EncoderException
* if the parameter supplied is not of type java.lang.String
*/
+ @Override
public Object encode(Object source) throws EncoderException {
if (!(source instanceof String)) {
throw new EncoderException("Parameter supplied to Caverphone encode is not of type java.lang.String");
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone.java Wed Mar 28 17:35:58 2012
@@ -70,6 +70,7 @@ public class Caverphone implements Strin
* @throws EncoderException
* if the parameter supplied is not of type java.lang.String
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (!(obj instanceof String)) {
throw new EncoderException("Parameter supplied to Caverphone encode is not of type java.lang.String");
@@ -84,6 +85,7 @@ public class Caverphone implements Strin
* String object to encode
* @return The caverphone code corresponding to the String supplied
*/
+ @Override
public String encode(String str) {
return this.caverphone(str);
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone1.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone1.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone1.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone1.java Wed Mar 28 17:35:58 2012
@@ -40,6 +40,7 @@ public class Caverphone1 extends Abstrac
* String the source string
* @return A caverphone code for the given String
*/
+ @Override
public String encode(String source) {
String txt = source;
if (txt == null || txt.length() == 0) {
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone2.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone2.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone2.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Caverphone2.java Wed Mar 28 17:35:58 2012
@@ -40,6 +40,7 @@ public class Caverphone2 extends Abstrac
* String the source string
* @return A caverphone code for the given String
*/
+ @Override
public String encode(String source) {
String txt = source;
if (txt == null || txt.length() == 0) {
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/ColognePhonetic.java Wed Mar 28 17:35:58 2012
@@ -387,6 +387,7 @@ public class ColognePhonetic implements
return output.toString();
}
+ @Override
public Object encode(Object object) throws EncoderException {
if (!(object instanceof String)) {
throw new EncoderException("This method's parameter was expected to be of the type " +
@@ -398,6 +399,7 @@ public class ColognePhonetic implements
return encode((String) object);
}
+ @Override
public String encode(String text) {
return colognePhonetic(text);
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java Wed Mar 28 17:35:58 2012
@@ -194,6 +194,7 @@ public class DoubleMetaphone implements
* @return An encoded Object (will be of type String)
* @throws EncoderException encode parameter is not of type String
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (!(obj instanceof String)) {
throw new EncoderException("DoubleMetaphone encode parameter is not of type String");
@@ -207,6 +208,7 @@ public class DoubleMetaphone implements
* @param value String to encode
* @return An encoded String
*/
+ @Override
public String encode(String value) {
return doubleMetaphone(value);
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Metaphone.java Wed Mar 28 17:35:58 2012
@@ -363,6 +363,7 @@ public class Metaphone implements String
* @throws EncoderException if the parameter supplied is not
* of type java.lang.String
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (!(obj instanceof String)) {
throw new EncoderException("Parameter supplied to Metaphone encode is not of type java.lang.String");
@@ -376,6 +377,7 @@ public class Metaphone implements String
* @param str String object to encode
* @return The metaphone code corresponding to the String supplied
*/
+ @Override
public String encode(String str) {
return metaphone(str);
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Nysiis.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Nysiis.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Nysiis.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Nysiis.java Wed Mar 28 17:35:58 2012
@@ -206,6 +206,7 @@ public class Nysiis implements StringEnc
* @throws IllegalArgumentException
* if a character is not mapped
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (!(obj instanceof String)) {
throw new EncoderException("Parameter supplied to Nysiis encode is not of type java.lang.String");
@@ -222,6 +223,7 @@ public class Nysiis implements StringEnc
* @throws IllegalArgumentException
* if a character is not mapped
*/
+ @Override
public String encode(String str) {
return this.nysiis(str);
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/RefinedSoundex.java Wed Mar 28 17:35:58 2012
@@ -128,6 +128,7 @@ public class RefinedSoundex implements S
* @throws EncoderException
* if the parameter supplied is not of type java.lang.String
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (!(obj instanceof String)) {
throw new EncoderException("Parameter supplied to RefinedSoundex encode is not of type java.lang.String");
@@ -142,6 +143,7 @@ public class RefinedSoundex implements S
* A String object to encode
* @return A Soundex code corresponding to the String supplied
*/
+ @Override
public String encode(String str) {
return soundex(str);
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/Soundex.java Wed Mar 28 17:35:58 2012
@@ -143,6 +143,7 @@ public class Soundex implements StringEn
* @throws IllegalArgumentException
* if a character is not mapped
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (!(obj instanceof String)) {
throw new EncoderException("Parameter supplied to Soundex encode is not of type java.lang.String");
@@ -159,6 +160,7 @@ public class Soundex implements StringEn
* @throws IllegalArgumentException
* if a character is not mapped
*/
+ @Override
public String encode(String str) {
return soundex(str);
}
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/BeiderMorseEncoder.java Wed Mar 28 17:35:58 2012
@@ -84,6 +84,7 @@ public class BeiderMorseEncoder implemen
// a cached object
private PhoneticEngine engine = new PhoneticEngine(NameType.GENERIC, RuleType.APPROX, true);
+ @Override
public Object encode(Object source) throws EncoderException {
if (!(source instanceof String)) {
throw new EncoderException("BeiderMorseEncoder encode parameter is not of type String");
@@ -91,6 +92,7 @@ public class BeiderMorseEncoder implemen
return encode((String) source);
}
+ @Override
public String encode(String source) throws EncoderException {
if (source == null) {
return null;
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java Wed Mar 28 17:35:58 2012
@@ -256,14 +256,17 @@ public class PhoneticEngine {
// return cached;
final CharSequence[][] cache = new CharSequence[cached.length()][cached.length()];
return new CharSequence() {
+ @Override
public char charAt(int index) {
return cached.charAt(index);
}
+ @Override
public int length() {
return cached.length();
}
+ @Override
public CharSequence subSequence(int start, int end) {
if (start == end) {
return "";
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java Wed Mar 28 17:35:58 2012
@@ -83,6 +83,7 @@ public class Rule {
public static final class Phoneme implements PhonemeExpr {
public static final Comparator<Phoneme> COMPARATOR = new Comparator<Phoneme>() {
+ @Override
public int compare(Phoneme o1, Phoneme o2) {
for (int i = 0; i < o1.phonemeText.length(); i++) {
if (i >= o2.phonemeText.length()) {
@@ -118,6 +119,7 @@ public class Rule {
return this.languages;
}
+ @Override
public Iterable<Phoneme> getPhonemes() {
return Collections.singleton(this);
}
@@ -142,6 +144,7 @@ public class Rule {
this.phonemes = phonemes;
}
+ @Override
public List<Phoneme> getPhonemes() {
return this.phonemes;
}
@@ -155,6 +158,7 @@ public class Rule {
}
public static final RPattern ALL_STRINGS_RMATCHER = new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return true;
}
@@ -414,12 +418,14 @@ public class Rule {
if (content.length() == 0) {
// empty
return new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return input.length() == 0;
}
};
} else {
return new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return input.equals(content);
}
@@ -431,6 +437,7 @@ public class Rule {
} else if (startsWith) {
// matches from start
return new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return startsWith(input, content);
}
@@ -438,6 +445,7 @@ public class Rule {
} else if (endsWith) {
// matches from start
return new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return endsWith(input, content);
}
@@ -461,6 +469,7 @@ public class Rule {
if (startsWith && endsWith) {
// exact match
return new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return input.length() == 1 && contains(bContent, input.charAt(0)) == shouldMatch;
}
@@ -468,6 +477,7 @@ public class Rule {
} else if (startsWith) {
// first char
return new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return input.length() > 0 && contains(bContent, input.charAt(0)) == shouldMatch;
}
@@ -475,6 +485,7 @@ public class Rule {
} else if (endsWith) {
// last char
return new RPattern() {
+ @Override
public boolean isMatch(CharSequence input) {
return input.length() > 0 && contains(bContent, input.charAt(input.length() - 1)) == shouldMatch;
}
@@ -488,6 +499,7 @@ public class Rule {
return new RPattern() {
Pattern pattern = Pattern.compile(regex);
+ @Override
public boolean isMatch(CharSequence input) {
Matcher matcher = pattern.matcher(input);
return matcher.find();
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/BCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/BCodec.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/BCodec.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/BCodec.java Wed Mar 28 17:35:58 2012
@@ -159,6 +159,7 @@ public class BCodec extends RFC1522Codec
* @throws EncoderException
* thrown if a failure condition is encountered during the encoding process.
*/
+ @Override
public String encode(String value) throws EncoderException {
if (value == null) {
return null;
@@ -176,6 +177,7 @@ public class BCodec extends RFC1522Codec
* @throws DecoderException
* A decoder exception is thrown if a failure condition is encountered during the decode process.
*/
+ @Override
public String decode(String value) throws DecoderException {
if (value == null) {
return null;
@@ -197,6 +199,7 @@ public class BCodec extends RFC1522Codec
* @throws EncoderException
* thrown if a failure condition is encountered during the encoding process.
*/
+ @Override
public Object encode(Object value) throws EncoderException {
if (value == null) {
return null;
@@ -222,6 +225,7 @@ public class BCodec extends RFC1522Codec
* Thrown if the argument is not a <code>String</code>. Thrown if a failure condition is
* encountered during the decode process.
*/
+ @Override
public Object decode(Object value) throws DecoderException {
if (value == null) {
return null;
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QCodec.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QCodec.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QCodec.java Wed Mar 28 17:35:58 2012
@@ -242,6 +242,7 @@ public class QCodec extends RFC1522Codec
* @throws EncoderException
* thrown if a failure condition is encountered during the encoding process.
*/
+ @Override
public String encode(String str) throws EncoderException {
if (str == null) {
return null;
@@ -261,6 +262,7 @@ public class QCodec extends RFC1522Codec
* @throws DecoderException
* A decoder exception is thrown if a failure condition is encountered during the decode process.
*/
+ @Override
public String decode(String str) throws DecoderException {
if (str == null) {
return null;
@@ -282,6 +284,7 @@ public class QCodec extends RFC1522Codec
* @throws EncoderException
* thrown if a failure condition is encountered during the encoding process.
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (obj == null) {
return null;
@@ -307,6 +310,7 @@ public class QCodec extends RFC1522Codec
* Thrown if the argument is not a <code>String</code>. Thrown if a failure condition is
* encountered during the decode process.
*/
+ @Override
public Object decode(Object obj) throws DecoderException {
if (obj == null) {
return null;
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/QuotedPrintableCodec.java Wed Mar 28 17:35:58 2012
@@ -225,6 +225,7 @@ public class QuotedPrintableCodec implem
* array of bytes to be encoded
* @return array of bytes containing quoted-printable data
*/
+ @Override
public byte[] encode(byte[] bytes) {
return encodeQuotedPrintable(PRINTABLE_CHARS, bytes);
}
@@ -244,6 +245,7 @@ public class QuotedPrintableCodec implem
* @throws DecoderException
* Thrown if quoted-printable decoding is unsuccessful
*/
+ @Override
public byte[] decode(byte[] bytes) throws DecoderException {
return decodeQuotedPrintable(bytes);
}
@@ -265,6 +267,7 @@ public class QuotedPrintableCodec implem
*
* @see #getCharset()
*/
+ @Override
public String encode(String str) throws EncoderException {
return this.encode(str, getCharset());
}
@@ -321,6 +324,7 @@ public class QuotedPrintableCodec implem
* Thrown if charset is not supported.
* @see #getCharset()
*/
+ @Override
public String decode(String str) throws DecoderException {
return this.decode(str, this.getCharset());
}
@@ -335,6 +339,7 @@ public class QuotedPrintableCodec implem
* Thrown if quoted-printable encoding is not applicable to objects of this type or if encoding is
* unsuccessful
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (obj == null) {
return null;
@@ -360,6 +365,7 @@ public class QuotedPrintableCodec implem
* Thrown if the argument is not a <code>String</code> or <code>byte[]</code>. Thrown if a failure condition is
* encountered during the decode process.
*/
+ @Override
public Object decode(Object obj) throws DecoderException {
if (obj == null) {
return null;
Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/URLCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/URLCodec.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/URLCodec.java (original)
+++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/net/URLCodec.java Wed Mar 28 17:35:58 2012
@@ -193,6 +193,7 @@ public class URLCodec implements BinaryE
* @param bytes array of bytes to convert to URL safe characters
* @return array of bytes containing URL safe characters
*/
+ @Override
public byte[] encode(byte[] bytes) {
return encodeUrl(WWW_FORM_URL, bytes);
}
@@ -207,6 +208,7 @@ public class URLCodec implements BinaryE
* @return array of original bytes
* @throws DecoderException Thrown if URL decoding is unsuccessful
*/
+ @Override
public byte[] decode(byte[] bytes) throws DecoderException {
return decodeUrl(bytes);
}
@@ -239,6 +241,7 @@ public class URLCodec implements BinaryE
*
* @see #getDefaultCharset()
*/
+ @Override
public String encode(String str) throws EncoderException {
if (str == null) {
return null;
@@ -281,6 +284,7 @@ public class URLCodec implements BinaryE
*
* @see #getDefaultCharset()
*/
+ @Override
public String decode(String str) throws DecoderException {
if (str == null) {
return null;
@@ -302,6 +306,7 @@ public class URLCodec implements BinaryE
* applicable to objects of this type or
* if encoding is unsuccessful
*/
+ @Override
public Object encode(Object obj) throws EncoderException {
if (obj == null) {
return null;
@@ -327,6 +332,7 @@ public class URLCodec implements BinaryE
* Thrown if the argument is not a <code>String</code> or <code>byte[]</code>. Thrown if a failure condition is
* encountered during the decode process.
*/
+ @Override
public Object decode(Object obj) throws DecoderException {
if (obj == null) {
return null;
Modified: commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java?rev=1306487&r1=1306486&r2=1306487&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java (original)
+++ commons/proper/codec/trunk/src/test/java/org/apache/commons/codec/language/bm/RuleTest.java Wed Mar 28 17:35:58 2012
@@ -31,10 +31,12 @@ import org.junit.Test;
*/
public class RuleTest {
private static class NegativeIntegerBaseMatcher extends BaseMatcher<Integer> {
+ @Override
public void describeTo(Description description) {
description.appendText("value should be negative");
}
+ @Override
public boolean matches(Object item) {
return (Integer) item < 0;
}