Skip to content

Commit d6c0529

Browse files
committed
Keep these files in UTF-8 encoding for proper Javadoc processing.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1080414 13f79535-47bb-0310-9956-ffa450edef68
1 parent 4829849 commit d6c0529

5 files changed

Lines changed: 26 additions & 12 deletions

File tree

pom.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,9 @@
329329
<artifactId>maven-javadoc-plugin</artifactId>
330330
<version>2.7</version>
331331
<configuration>
332+
<charset>UTF-8</charset>
333+
<docencoding>UTF-8</docencoding>
334+
<encoding>UTF-8</encoding>
332335
<linksource>true</linksource>
333336
<links>
334337
<link>http://java.sun.com/j2se/1.4.2/docs/api/</link>

src/java/org/apache/commons/codec/language/ColognePhonetic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/**
2626
* <p>
27-
* Implements of the <a href="http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik">“Kölner Phonetic”</a> (cologne
27+
* Implements of the <a href="http://de.wikipedia.org/wiki/K%C3%B6lner_Phonetik">“Kölner Phonetic”</a> (Cologne
2828
* phonetic) algorithm issued by Hans Joachim Postel in 1969.
2929
* </p>
3030
*

src/test/org/apache/commons/codec/language/ColognePhoneticTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@
2222
import org.apache.commons.codec.StringEncoder;
2323
import org.apache.commons.codec.StringEncoderAbstractTest;
2424

25+
/**
26+
* Tests the deprecated class {@link ColognePhonetic}.
27+
*
28+
* <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
29+
*
30+
* @author ggregory
31+
*/
2532
public class ColognePhoneticTest extends StringEncoderAbstractTest {
2633

2734
public ColognePhoneticTest(String name) {
@@ -110,7 +117,7 @@ public void testExamples() throws EncoderException {
110117
public void testHyphen() throws EncoderException {
111118
String[][] data = {{"bergisch-gladbach", "174845214"}, {"Müller-Lüdenscheidt", "65752682"},
112119
// From the Javadoc example:
113-
{"Müller-Lüdenscheidt", "65752682"}};
120+
{"M�ller-L�denscheidt", "65752682"}};
114121
this.checkEncodings(data);
115122
}
116123

src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
/**
2525
* Tests {@link DoubleMetaphone}.
2626
*
27+
* <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
28+
*
2729
* @see "http://www.cuj.com/documents/s=8038/cuj0006philips/"
2830
* @author Apache Software Foundation
2931
* @version $Id$
@@ -1157,7 +1159,7 @@ public void testIsDoubleMetaphoneEqualExtended2() {
11571159

11581160
/**
11591161
* Used to generate the MATCHES array and test possible matches from the
1160-
* FIXTURE arrary.
1162+
* FIXTURE array.
11611163
*/
11621164
public void testIsDoubleMetaphoneEqualExtended3() {
11631165
this.validateFixture(FIXTURE);
@@ -1209,11 +1211,11 @@ public void testIsDoubleMetaphoneNotEqual() {
12091211
}
12101212

12111213
public void testCCedilla() {
1212-
this.getDoubleMetaphone().isDoubleMetaphoneEqual("ç", "S");
1214+
this.getDoubleMetaphone().isDoubleMetaphoneEqual("", "S");
12131215
}
12141216

12151217
public void testNTilde() {
1216-
this.getDoubleMetaphone().isDoubleMetaphoneEqual("ñ", "N");
1218+
this.getDoubleMetaphone().isDoubleMetaphoneEqual("", "N");
12171219
}
12181220

12191221
public void validateFixture(String[][] pairs) {

src/test/org/apache/commons/codec/language/SoundexTest.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@
2626
import org.apache.commons.codec.StringEncoderAbstractTest;
2727

2828
/**
29-
* Tests {@link Soundex}
29+
* Tests {@link Soundex}.
30+
*
31+
* <p>Keep this file in UTF-8 encoding for proper Javadoc processing.</p>
3032
*
3133
* @author Apache Software Foundation
3234
* @version $Id$
@@ -353,15 +355,15 @@ public void testUsEnglishStatic() {
353355
*/
354356
public void testUsMappingEWithAcute() {
355357
Assert.assertEquals("E000", this.getSoundexEncoder().encode("e"));
356-
if (Character.isLetter('é')) {
358+
if (Character.isLetter('')) {
357359
try {
358-
Assert.assertEquals("É000", this.getSoundexEncoder().encode("é"));
360+
Assert.assertEquals("�000", this.getSoundexEncoder().encode(""));
359361
Assert.fail("Expected IllegalArgumentException not thrown");
360362
} catch (IllegalArgumentException e) {
361363
// expected
362364
}
363365
} else {
364-
Assert.assertEquals("", this.getSoundexEncoder().encode("é"));
366+
Assert.assertEquals("", this.getSoundexEncoder().encode(""));
365367
}
366368
}
367369

@@ -372,15 +374,15 @@ public void testUsMappingEWithAcute() {
372374
*/
373375
public void testUsMappingOWithDiaeresis() {
374376
Assert.assertEquals("O000", this.getSoundexEncoder().encode("o"));
375-
if (Character.isLetter('ö')) {
377+
if (Character.isLetter('')) {
376378
try {
377-
Assert.assertEquals("Ö000", this.getSoundexEncoder().encode("ö"));
379+
Assert.assertEquals("�000", this.getSoundexEncoder().encode(""));
378380
Assert.fail("Expected IllegalArgumentException not thrown");
379381
} catch (IllegalArgumentException e) {
380382
// expected
381383
}
382384
} else {
383-
Assert.assertEquals("", this.getSoundexEncoder().encode("ö"));
385+
Assert.assertEquals("", this.getSoundexEncoder().encode(""));
384386
}
385387
}
386388
}

0 commit comments

Comments
 (0)