ggregory 2004/05/23 17:28:10
Modified: codec/src/java/org/apache/commons/codec/language
DoubleMetaphone.java
Log:
Make code less twisty.
Revision Changes Path
1.22 +17 -21
jakarta-commons/codec/src/java/org/apache/commons/codec/language/DoubleMetaphone.java
Index: DoubleMetaphone.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/codec/src/java/org/apache/commons/codec/language/DoubleMetaphone.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DoubleMetaphone.java 24 May 2004 00:25:22 -0000 1.21
+++ DoubleMetaphone.java 24 May 2004 00:28:10 -0000 1.22
@@ -806,28 +806,24 @@
* Complex condition 0 for 'C'
*/
private boolean conditionC0(String value, int index) {
- if (contains(value, index, 4, "CHIA")) {
- return true;
- } else if (index <= 1) {
- return false;
- } else if (isVowel(charAt(value, index - 2))) {
- return false;
- } else if (!contains(value, index - 1, 3, "ACH")) {
- return false;
- } else {
- char c = charAt(value, index + 2);
- if ((c != 'I' && c != 'E') || contains(value, index - 2,
- 6, "BACHER", "MACHER" )) {
- return true;
- } else {
- return false;
- }
- }
- }
+ if (contains(value, index, 4, "CHIA")) {
+ return true;
+ } else if (index <= 1) {
+ return false;
+ } else if (isVowel(charAt(value, index - 2))) {
+ return false;
+ } else if (!contains(value, index - 1, 3, "ACH")) {
+ return false;
+ } else {
+ char c = charAt(value, index + 2);
+ return (c != 'I' && c != 'E')
+ || contains(value, index - 2, 6, "BACHER",
"MACHER");
+ }
+ }
/**
- * Complex condition 0 for 'CH'
- */
+ * Complex condition 0 for 'CH'
+ */
private boolean conditionCH0(String value, int index) {
if (index != 0) {
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
