Skip to content

Commit 1825f01

Browse files
committed
Format tweaks
1 parent 1ad76b4 commit 1825f01

File tree

1 file changed

+5
-12
lines changed

1 file changed

+5
-12
lines changed

src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,6 @@ private boolean conditionL0(final String value, final int index) {
310310
contains(value, index - 1, 4, "ALLE");
311311
}
312312

313-
//-- BEGIN HANDLERS --//
314-
315313
/**
316314
* Complex condition 0 for 'M'.
317315
*/
@@ -626,8 +624,7 @@ private int handleD(final String value, final DoubleMetaphoneResult result, int
626624
/**
627625
* Handles 'G' cases.
628626
*/
629-
private int handleG(final String value, final DoubleMetaphoneResult result, int index,
630-
final boolean slavoGermanic) {
627+
private int handleG(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) {
631628
if (charAt(value, index + 1) == 'H') {
632629
index = handleGH(value, result, index);
633630
} else if (charAt(value, index + 1) == 'N') {
@@ -733,8 +730,7 @@ private int handleH(final String value, final DoubleMetaphoneResult result, int
733730
/**
734731
* Handles 'J' cases.
735732
*/
736-
private int handleJ(final String value, final DoubleMetaphoneResult result, int index,
737-
final boolean slavoGermanic) {
733+
private int handleJ(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) {
738734
if (contains(value, index, 4, "JOSE") || contains(value, 0, 4, "SAN ")) {
739735
//-- obvious Spanish, "Jose", "San Jacinto" --//
740736
if (index == 0 && charAt(value, index + 4) == ' ' ||
@@ -801,8 +797,7 @@ private int handleP(final String value, final DoubleMetaphoneResult result, int
801797
/**
802798
* Handles 'R' cases.
803799
*/
804-
private int handleR(final String value, final DoubleMetaphoneResult result, final int index,
805-
final boolean slavoGermanic) {
800+
private int handleR(final String value, final DoubleMetaphoneResult result, final int index, final boolean slavoGermanic) {
806801
if (index == value.length() - 1 && !slavoGermanic &&
807802
contains(value, index - 2, 2, "IE") &&
808803
!contains(value, index - 4, 2, "ME", "MA")) {
@@ -816,8 +811,7 @@ private int handleR(final String value, final DoubleMetaphoneResult result, fina
816811
/**
817812
* Handles 'S' cases.
818813
*/
819-
private int handleS(final String value, final DoubleMetaphoneResult result, int index,
820-
final boolean slavoGermanic) {
814+
private int handleS(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) {
821815
if (contains(value, index - 1, 3, "ISL", "YSL")) {
822816
//-- special cases "island", "isle", "carlisle", "carlysle" --//
823817
index++;
@@ -970,8 +964,7 @@ private int handleX(final String value, final DoubleMetaphoneResult result, int
970964
/**
971965
* Handles 'Z' cases.
972966
*/
973-
private int handleZ(final String value, final DoubleMetaphoneResult result, int index,
974-
final boolean slavoGermanic) {
967+
private int handleZ(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) {
975968
if (charAt(value, index + 1) == 'H') {
976969
//-- Chinese pinyin for example "zhao" or Angelina "Zhang" --//
977970
result.append('J');

0 commit comments

Comments
 (0)