You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2011/04/01 23:17:23 UTC
svn commit: r1087901 - in /commons/proper/codec/trunk: ./
src/java/org/apache/commons/codec/ src/java/org/apache/commons/codec/binary/
src/java/org/apache/commons/codec/language/
src/java/org/apache/commons/codec/net/ src/test/org/apache/commons/codec/...
Author: ggregory
Date: Fri Apr 1 21:17:22 2011
New Revision: 1087901
URL: http://svn.apache.org/viewvc?rev=1087901&view=rev
Log:
Annotate with @Override and @Deprecated.
Modified:
commons/proper/codec/trunk/pom.xml
commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Hex.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.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/URLCodec.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone1Test.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/MetaphoneTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java
Modified: commons/proper/codec/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Fri Apr 1 21:17:22 2011
@@ -265,6 +265,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>2.5</version>
+ <configuration>
+ <targetJdk>1.5</targetJdk>
+ </configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/StringEncoderComparator.java Fri Apr 1 21:17:22 2011
@@ -40,6 +40,7 @@ public class StringEncoderComparator imp
* @deprecated Creating an instance without a {@link StringEncoder} leads to a {@link NullPointerException}. Will be
* removed in 2.0.
*/
+ @Deprecated
public StringEncoderComparator() {
this.stringEncoder = null; // Trying to use this will cause things to break
}
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base32.java Fri Apr 1 21:17:22 2011
@@ -278,6 +278,7 @@ public class Base32 extends BaseNCodec {
*
* Output is written to {@link #buffer} as 8-bit octets, using {@link #pos} as the buffer position
*/
+ @Override
void decode(byte[] in, int inPos, int inAvail) { // package protected for access from I/O streams
if (eof) {
return;
@@ -366,6 +367,7 @@ public class Base32 extends BaseNCodec {
* @param inAvail
* Amount of bytes available from input for encoding.
*/
+ @Override
void encode(byte[] in, int inPos, int inAvail) { // package protected for access from I/O streams
if (eof) {
return;
@@ -464,6 +466,7 @@ public class Base32 extends BaseNCodec {
* The value to test
* @return <code>true</code> if the value is defined in the the Base32 alphabet <code>false</code> otherwise.
*/
+ @Override
public boolean isInAlphabet(byte octet) {
return octet >= 0 && octet < decodeTable.length && decodeTable[octet] != -1;
}
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=1087901&r1=1087900&r2=1087901&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 Fri Apr 1 21:17:22 2011
@@ -323,6 +323,7 @@ public class Base64 extends BaseNCodec {
* @param inAvail
* Amount of bytes available from input for encoding.
*/
+ @Override
void encode(byte[] in, int inPos, int inAvail) {
if (eof) {
return;
@@ -411,6 +412,7 @@ public class Base64 extends BaseNCodec {
* @param inAvail
* Amount of bytes available from input for encoding.
*/
+ @Override
void decode(byte[] in, int inPos, int inAvail) {
if (eof) {
return;
@@ -501,6 +503,7 @@ public class Base64 extends BaseNCodec {
* <code>false</code>, otherwise
* @deprecated 1.5 Use {@link #isBase64(byte[])}, will be removed in 2.0.
*/
+ @Deprecated
public static boolean isArrayByteBase64(byte[] arrayOctet) {
return isBase64(arrayOctet);
}
@@ -748,6 +751,7 @@ public class Base64 extends BaseNCodec {
* The value to test
* @return <code>true</code> if the value is defined in the the Base32 alphabet <code>false</code> otherwise.
*/
+ @Override
protected boolean isInAlphabet(byte octet) {
return octet >= 0 && octet < decodeTable.length && decodeTable[octet] != -1;
}
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecInputStream.java Fri Apr 1 21:17:22 2011
@@ -47,6 +47,7 @@ public class BaseNCodecInputStream exten
* @throws IOException
* if an I/O error occurs.
*/
+ @Override
public int read() throws IOException {
int r = read(singleByte, 0, 1);
while (r == 0) {
@@ -77,6 +78,7 @@ public class BaseNCodecInputStream exten
* @throws IndexOutOfBoundsException
* if offset, len or buffer size are invalid
*/
+ @Override
public int read(byte b[], int offset, int len) throws IOException {
if (b == null) {
throw new NullPointerException();
@@ -124,6 +126,7 @@ public class BaseNCodecInputStream exten
*
* @return false
*/
+ @Override
public boolean markSupported() {
return false; // not an easy job to support marks
}
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java Fri Apr 1 21:17:22 2011
@@ -48,6 +48,7 @@ public class BaseNCodecOutputStream exte
* @throws IOException
* if an I/O error occurs.
*/
+ @Override
public void write(int i) throws IOException {
singleByte[0] = (byte) i;
write(singleByte, 0, 1);
@@ -71,6 +72,7 @@ public class BaseNCodecOutputStream exte
* @throws IndexOutOfBoundsException
* if offset, len or buffer size are invalid
*/
+ @Override
public void write(byte b[], int offset, int len) throws IOException {
if (b == null) {
throw new NullPointerException();
@@ -117,6 +119,7 @@ public class BaseNCodecOutputStream exte
* @throws IOException
* if an I/O error occurs.
*/
+ @Override
public void flush() throws IOException {
flush(true);
}
@@ -127,6 +130,7 @@ public class BaseNCodecOutputStream exte
* @throws IOException
* if an I/O error occurs.
*/
+ @Override
public void close() throws IOException {
// Notify encoder of EOF (-1).
if (doEncode) {
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Hex.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Hex.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Hex.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Hex.java Fri Apr 1 21:17:22 2011
@@ -295,6 +295,7 @@ public class Hex implements BinaryEncode
*
* @return a string representation of the object.
*/
+ @Override
public String toString() {
return super.toString() + "[charsetName=" + this.charsetName + "]";
}
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Caverphone.java Fri Apr 1 21:17:22 2011
@@ -33,6 +33,7 @@ import org.apache.commons.codec.StringEn
* @since 1.4
* @deprecated 1.5 Replaced by {@link Caverphone2}, will be removed in 2.0.
*/
+@Deprecated
public class Caverphone implements StringEncoder {
/**
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.java Fri Apr 1 21:17:22 2011
@@ -27,12 +27,12 @@ import org.apache.commons.codec.StringEn
* Encodes a string into a Cologne Phonetic value.
* </p>
* <p>
- * Implements the <a href="http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik">âKölner Phoneticâ</a> (Cologne Phonetic)
+ * Implements the <a href="http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik">ââ¬ÅKölner Phoneticââ¬ï¿½</a> (Cologne Phonetic)
* algorithm issued by Hans Joachim Postel in 1969.
* </p>
*
* <p>
- * The <i>Kölner Phonetik</i> is a phonetic algorithm which is optimized for the German language. It is related to the
+ * The <i>Kölner Phonetik</i> is a phonetic algorithm which is optimized for the German language. It is related to the
* well-known soundex algorithm.
* </p>
*
@@ -151,12 +151,12 @@ import org.apache.commons.codec.StringEn
* </table>
* <p>
* <small><i>(Source: <a href= "http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik#Buchstabencodes" >Wikipedia (de):
- * Kölner Phonetik â Buchstabencodes</a>)</i></small>
+ * Kölner Phonetik ââ¬â Buchstabencodes</a>)</i></small>
* </p>
*
* <h4>Example:</h4>
*
- * {@code "Müller-Lüdenscheidt" => "MULLERLUDENSCHEIDT" => "6005507500206880022"}
+ * {@code "Müller-Lüdenscheidt" => "MULLERLUDENSCHEIDT" => "6005507500206880022"}
*
* </li>
*
@@ -168,7 +168,7 @@ import org.apache.commons.codec.StringEn
*
* <li>
* <h3>Step 3:</h3>
- * Removal of all codes â0â except at the beginning. This means that two or more identical consecutive digits can occur
+ * Removal of all codes ââ¬Å0ââ¬ï¿½ except at the beginning. This means that two or more identical consecutive digits can occur
* if they occur after removing the "0" digits.
*
* <h4>Example:</h4>
@@ -176,7 +176,7 @@ import org.apache.commons.codec.StringEn
*
* </ul>
*
- * @see <a href="http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik">Wikipedia (de): Kölner Phonetik (in German)</a>
+ * @see <a href="http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik">Wikipedia (de): Kölner Phonetik (in German)</a>
* @author Apache Software Foundation
* @since 1.5
*/
@@ -204,6 +204,7 @@ public class ColognePhonetic implements
return length;
}
+ @Override
public String toString() {
return new String(copyData(0, length));
}
@@ -220,6 +221,7 @@ public class ColognePhonetic implements
length++;
}
+ @Override
protected char[] copyData(int start, final int length) {
char[] newData = new char[length];
System.arraycopy(data, start, newData, 0, length);
@@ -238,6 +240,7 @@ public class ColognePhonetic implements
data[getNextPos()] = ch;
}
+ @Override
protected char[] copyData(int start, final int length) {
char[] newData = new char[length];
System.arraycopy(data, data.length - this.length + start, newData, 0, length);
@@ -259,10 +262,10 @@ public class ColognePhonetic implements
}
}
- private static final char[][] PREPROCESS_MAP = new char[][]{{'\u00C4', 'A'}, // Ã
- {'\u00DC', 'U'}, // Ã
- {'\u00D6', 'O'}, // Ã
- {'\u00DF', 'S'} // Ã
+ private static final char[][] PREPROCESS_MAP = new char[][]{{'\u00C4', 'A'}, // Ãâ
+ {'\u00DC', 'U'}, // ÃÅ
+ {'\u00D6', 'O'}, // Ãâ
+ {'\u00DF', 'S'} // ß
};
/*
@@ -279,14 +282,14 @@ public class ColognePhonetic implements
/**
* <p>
- * <b>colognePhonetic()</b> is the actual implementations of the <i>Kölner Phonetik</i> algorithm.
+ * <b>colognePhonetic()</b> is the actual implementations of the <i>Kölner Phonetik</i> algorithm.
* </p>
* <p>
* In contrast to the initial description of the algorithm, this implementation does the encoding in one pass.
* </p>
*
* @param text
- * @return the corresponding encoding according to the <i>Kölner Phonetik</i> algorithm
+ * @return the corresponding encoding according to the <i>Kölner Phonetik</i> algorithm
*/
public String colognePhonetic(String text) {
if (text == null) {
@@ -376,7 +379,7 @@ public class ColognePhonetic implements
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 " +
+ throw new EncoderException("This methodââ¬â¢s parameter was expected to be of the type " +
String.class.getName() +
". But actually it was of the type " +
object.getClass().getName() +
@@ -394,7 +397,7 @@ public class ColognePhonetic implements
}
/*
- * Converts the string to upper case and replaces germanic umlauts, and the âÃâ.
+ * Converts the string to upper case and replaces germanic umlauts, and the ââ¬Åßââ¬ï¿½.
*/
private String preprocess(String text) {
text = text.toUpperCase(Locale.GERMAN);
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/Soundex.java Fri Apr 1 21:17:22 2011
@@ -85,6 +85,7 @@ public class Soundex implements StringEn
*
* @deprecated This feature is not needed since the encoding size must be constant. Will be removed in 2.0.
*/
+ @Deprecated
private int maxLength = 4;
/**
@@ -199,6 +200,7 @@ public class Soundex implements StringEn
* @deprecated This feature is not needed since the encoding size must be constant. Will be removed in 2.0.
* @return int
*/
+ @Deprecated
public int getMaxLength() {
return this.maxLength;
}
@@ -236,6 +238,7 @@ public class Soundex implements StringEn
* @param maxLength
* The maxLength to set
*/
+ @Deprecated
public void setMaxLength(int maxLength) {
this.maxLength = maxLength;
}
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=1087901&r1=1087900&r2=1087901&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 Fri Apr 1 21:17:22 2011
@@ -71,10 +71,12 @@ public class BCodec extends RFC1522Codec
this.charset = charset;
}
+ @Override
protected String getEncoding() {
return "B";
}
+ @Override
protected byte[] doEncoding(byte[] bytes) {
if (bytes == null) {
return null;
@@ -82,6 +84,7 @@ public class BCodec extends RFC1522Codec
return Base64.encodeBase64(bytes);
}
+ @Override
protected byte[] doDecoding(byte[] bytes) {
if (bytes == null) {
return null;
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=1087901&r1=1087900&r2=1087901&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 Fri Apr 1 21:17:22 2011
@@ -126,10 +126,12 @@ public class QCodec extends RFC1522Codec
this.charset = charset;
}
+ @Override
protected String getEncoding() {
return "Q";
}
+ @Override
protected byte[] doEncoding(byte[] bytes) {
if (bytes == null) {
return null;
@@ -145,6 +147,7 @@ public class QCodec extends RFC1522Codec
return data;
}
+ @Override
protected byte[] doDecoding(byte[] bytes) throws DecoderException {
if (bytes == null) {
return null;
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/net/URLCodec.java Fri Apr 1 21:17:22 2011
@@ -345,6 +345,7 @@ public class URLCodec implements BinaryE
*
* @deprecated Use {@link #getDefaultCharset()}, will be removed in 2.0.
*/
+ @Deprecated
public String getEncoding() {
return this.charset;
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/BaseNCodecTest.java Fri Apr 1 21:17:22 2011
@@ -32,13 +32,16 @@ public class BaseNCodecTest {
@Before
public void setUp() {
codec = new BaseNCodec(0, 0, 0, 0) {
+ @Override
protected boolean isInAlphabet(byte b) {
return b=='O' || b == 'K'; // allow OK
}
+ @Override
void encode(byte[] pArray, int i, int length) {
}
+ @Override
void decode(byte[] pArray, int i, int length) {
}
};
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Codec105ErrorInputStream.java Fri Apr 1 21:17:22 2011
@@ -34,6 +34,7 @@ public class Codec105ErrorInputStream ex
int countdown = 3;
+ @Override
public int read() throws IOException {
if (this.countdown-- > 0) {
return '\n';
@@ -42,6 +43,7 @@ public class Codec105ErrorInputStream ex
}
}
+ @Override
public int read(byte b[], int pos, int len) throws IOException {
if (this.countdown-- > 0) {
b[pos] = '\n';
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone1Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone1Test.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone1Test.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone1Test.java Fri Apr 1 21:17:22 2011
@@ -33,6 +33,7 @@ import org.junit.Test;
*/
public class Caverphone1Test extends StringEncoderAbstractTest {
+ @Override
protected StringEncoder createStringEncoder() {
return new Caverphone1();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/Caverphone2Test.java Fri Apr 1 21:17:22 2011
@@ -28,6 +28,7 @@ import org.apache.commons.codec.StringEn
*/
public class Caverphone2Test extends CaverphoneTest {
+ @Override
protected StringEncoder createStringEncoder() {
return new Caverphone2();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/CaverphoneTest.java Fri Apr 1 21:17:22 2011
@@ -30,6 +30,7 @@ import org.junit.Test;
*/
public class CaverphoneTest extends StringEncoderAbstractTest {
+ @Override
protected StringEncoder createStringEncoder() {
return new Caverphone();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/ColognePhoneticTest.java Fri Apr 1 21:17:22 2011
@@ -31,6 +31,7 @@ import org.junit.Test;
*/
public class ColognePhoneticTest extends StringEncoderAbstractTest {
+ @Override
protected StringEncoder createStringEncoder() {
return new ColognePhonetic();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphone2Test.java Fri Apr 1 21:17:22 2011
@@ -1269,6 +1269,7 @@ public class DoubleMetaphone2Test extend
}
}
+ @Override
protected StringEncoder createStringEncoder() {
return new DoubleMetaphone();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java Fri Apr 1 21:17:22 2011
@@ -1056,6 +1056,7 @@ public class DoubleMetaphoneTest extends
return (DoubleMetaphone) this.getStringEncoder();
}
+ @Override
protected StringEncoder createStringEncoder() {
return new DoubleMetaphone();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/MetaphoneTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/MetaphoneTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/MetaphoneTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/MetaphoneTest.java Fri Apr 1 21:17:22 2011
@@ -63,6 +63,7 @@ public class MetaphoneTest extends Strin
return (Metaphone) this.getStringEncoder();
}
+ @Override
protected StringEncoder createStringEncoder() {
return new Metaphone();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/RefinedSoundexTest.java Fri Apr 1 21:17:22 2011
@@ -32,6 +32,7 @@ import org.junit.Test;
*/
public class RefinedSoundexTest extends StringEncoderAbstractTest {
+ @Override
protected StringEncoder createStringEncoder() {
return new RefinedSoundex();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java Fri Apr 1 21:17:22 2011
@@ -36,6 +36,7 @@ import org.junit.Test;
*/
public class SoundexTest extends StringEncoderAbstractTest {
+ @Override
protected StringEncoder createStringEncoder() {
return new Soundex();
}
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java?rev=1087901&r1=1087900&r2=1087901&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/net/RFC1522CodecTest.java Fri Apr 1 21:17:22 2011
@@ -34,14 +34,17 @@ public class RFC1522CodecTest {
static class RFC1522TestCodec extends RFC1522Codec {
+ @Override
protected byte[] doDecoding(byte[] bytes) {
return bytes;
}
+ @Override
protected byte[] doEncoding(byte[] bytes) {
return bytes;
}
+ @Override
protected String getEncoding() {
return "T";
}