Author: ggregory
Date: Fri Mar 11 00:52:03 2011
New Revision: 1080414
URL: http://svn.apache.org/viewvc?rev=1080414&view=rev
Log:
Keep these files in UTF-8 encoding for proper Javadoc processing.
Modified:
commons/proper/codec/trunk/pom.xml
commons/proper/codec/trunk/src/java/org/apache/commons/codec/language/ColognePhonetic.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/DoubleMetaphoneTest.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/language/SoundexTest.java
Modified: commons/proper/codec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/codec/trunk/pom.xml?rev=1080414&r1=1080413&r2=1080414&view=diff
==============================================================================
--- commons/proper/codec/trunk/pom.xml (original)
+++ commons/proper/codec/trunk/pom.xml Fri Mar 11 00:52:03 2011
@@ -329,6 +329,9 @@
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.7</version>
<configuration>
+ <charset>UTF-8</charset>
+ <docencoding>UTF-8</docencoding>
+ <encoding>UTF-8</encoding>
<linksource>true</linksource>
<links>
<link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
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=1080414&r1=1080413&r2=1080414&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 Mar 11 00:52:03 2011
@@ -24,7 +24,7 @@ import org.apache.commons.codec.StringEn
/**
* <p>
- * Implements of the <a
href="http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik";>âKölner
Phoneticâ</a> (cologne
+ * Implements of 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>
*
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=1080414&r1=1080413&r2=1080414&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 Mar 11 00:52:03 2011
@@ -22,6 +22,13 @@ import org.apache.commons.codec.EncoderE
import org.apache.commons.codec.StringEncoder;
import org.apache.commons.codec.StringEncoderAbstractTest;
+/**
+ * Tests the deprecated class {@link ColognePhonetic}.
+ *
+ * <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
+ *
+ * @author ggregory
+ */
public class ColognePhoneticTest extends StringEncoderAbstractTest {
public ColognePhoneticTest(String name) {
@@ -110,7 +117,7 @@ public class ColognePhoneticTest extends
public void testHyphen() throws EncoderException {
String[][] data = {{"bergisch-gladbach", "174845214"},
{"Müller-Lüdenscheidt", "65752682"},
// From the Javadoc example:
- {"Müller-Lüdenscheidt", "65752682"}};
+ {"M�ller-L�denscheidt", "65752682"}};
this.checkEncodings(data);
}
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=1080414&r1=1080413&r2=1080414&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 Mar 11 00:52:03 2011
@@ -24,6 +24,8 @@ import org.apache.commons.codec.StringEn
/**
* Tests {@link DoubleMetaphone}.
*
+ * <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
+ *
* @see "http://www.cuj.com/documents/s=8038/cuj0006philips/";
* @author Apache Software Foundation
* @version $Id$
@@ -1157,7 +1159,7 @@ public class DoubleMetaphoneTest extends
/**
* Used to generate the MATCHES array and test possible matches from the
- * FIXTURE arrary.
+ * FIXTURE array.
*/
public void testIsDoubleMetaphoneEqualExtended3() {
this.validateFixture(FIXTURE);
@@ -1209,11 +1211,11 @@ public class DoubleMetaphoneTest extends
}
public void testCCedilla() {
- this.getDoubleMetaphone().isDoubleMetaphoneEqual("ç", "S");
+ this.getDoubleMetaphone().isDoubleMetaphoneEqual("�", "S");
}
public void testNTilde() {
- this.getDoubleMetaphone().isDoubleMetaphoneEqual("ñ", "N");
+ this.getDoubleMetaphone().isDoubleMetaphoneEqual("�", "N");
}
public void validateFixture(String[][] pairs) {
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=1080414&r1=1080413&r2=1080414&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 Mar 11 00:52:03 2011
@@ -26,7 +26,9 @@ import org.apache.commons.codec.StringEn
import org.apache.commons.codec.StringEncoderAbstractTest;
/**
- * Tests {@link Soundex}
+ * Tests {@link Soundex}.
+ *
+ * <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
*
* @author Apache Software Foundation
* @version $Id$
@@ -353,15 +355,15 @@ public class SoundexTest extends StringE
*/
public void testUsMappingEWithAcute() {
Assert.assertEquals("E000", this.getSoundexEncoder().encode("e"));
- if (Character.isLetter('é')) {
+ if (Character.isLetter('�')) {
try {
- Assert.assertEquals("É000",
this.getSoundexEncoder().encode("é"));
+ Assert.assertEquals("�000",
this.getSoundexEncoder().encode("�"));
Assert.fail("Expected IllegalArgumentException not thrown");
} catch (IllegalArgumentException e) {
// expected
}
} else {
- Assert.assertEquals("", this.getSoundexEncoder().encode("é"));
+ Assert.assertEquals("", this.getSoundexEncoder().encode("�"));
}
}
@@ -372,15 +374,15 @@ public class SoundexTest extends StringE
*/
public void testUsMappingOWithDiaeresis() {
Assert.assertEquals("O000", this.getSoundexEncoder().encode("o"));
- if (Character.isLetter('ö')) {
+ if (Character.isLetter('�')) {
try {
- Assert.assertEquals("Ö000",
this.getSoundexEncoder().encode("ö"));
+ Assert.assertEquals("�000",
this.getSoundexEncoder().encode("�"));
Assert.fail("Expected IllegalArgumentException not thrown");
} catch (IllegalArgumentException e) {
// expected
}
} else {
- Assert.assertEquals("", this.getSoundexEncoder().encode("ö"));
+ Assert.assertEquals("", this.getSoundexEncoder().encode("�"));
}
}
}
