Make code less twisty.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/codec/trunk@130372 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

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

@@ -31,7 +31,7 @@
  * </ul>
  * 
  * @author Apache Software Foundation
- * @version $Id: DoubleMetaphone.java,v 1.22 2004/05/24 00:28:10 ggregory Exp $
+ * @version $Id: DoubleMetaphone.java,v 1.23 2004/05/24 04:55:33 ggregory Exp $
  */
 public class DoubleMetaphone implements StringEncoder {
 
@@ -869,21 +869,20 @@ private boolean conditionL0(String value, int index) {
      * Complex condition 0 for 'M'
      */
     private boolean conditionM0(String value, int index) {
-        if (charAt(value, index + 1) == 'M') {
-            return true;
-        } else {
-            return contains(value, index - 1, 3, "UMB") &&
-                ((index + 1) == value.length() - 1 || 
-                 contains(value, index + 2, 2, "ER"));
-        }
-    }
+		if (charAt(value, index + 1) == 'M') {
+			return true;
+		}
+		return contains(value, index - 1, 3, "UMB")
+				&& ((index + 1) == value.length() - 1 || contains(value,
+						index + 2, 2, "ER"));
+	}
 
     //-- BEGIN HELPER FUNCTIONS --//
 
     /**
-     * Determines whether or not a value is of slavo-germanic orgin.  A value is
-     * of slavo-germanic origin if it contians any of 'W', 'K', 'CZ', or 'WITZ'.
-     */
+	 * Determines whether or not a value is of slavo-germanic orgin. A value is
+	 * of slavo-germanic origin if it contians any of 'W', 'K', 'CZ', or 'WITZ'.
+	 */
     private boolean isSlavoGermanic(String value) {
         return value.indexOf('W') > -1 || value.indexOf('K') > -1 || 
             value.indexOf("CZ") > -1 || value.indexOf("WITZ") > -1;
@@ -916,29 +915,26 @@ private boolean isSilentStart(String value) {
      * Cleans the input
      */    
     private String cleanInput(String input) {
-        if (input == null) {
-            return null;
-        } else {
-            input = input.trim();
-            if (input.length() == 0) {
-                return null;
-            } else {
-                return input.toUpperCase();
-            }
-        }
-    }
+		if (input == null) {
+			return null;
+		}
+		input = input.trim();
+		if (input.length() == 0) {
+			return null;
+		}
+		return input.toUpperCase();
+	}
 
     /**
-     * Gets the character at index <code>index</code> if available, otherwise it
-     * returns <code>Character.MIN_VALUE</code> so that there is some sort of a
-     * default
-     */    
+	 * Gets the character at index <code>index</code> if available, otherwise
+	 * it returns <code>Character.MIN_VALUE</code> so that there is some sort
+	 * of a default
+	 */    
     protected char charAt(String value, int index) {
         if (index < 0 || index >= value.length()) {
             return Character.MIN_VALUE;
-        } else {
-            return value.charAt(index);
-        }
+        } 
+        return value.charAt(index);
     }
 
     /**

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

@@ -28,7 +28,7 @@
  *      <i>Computer Language</i> of Dec. 1990, p 39   
  * 
  * @author Apache Software Foundation
- * @version $Id: Metaphone.java,v 1.18 2004/05/24 00:22:45 ggregory Exp $
+ * @version $Id: Metaphone.java,v 1.19 2004/05/24 04:56:29 ggregory Exp $
  */
 public class Metaphone implements StringEncoder {
 
@@ -141,9 +141,8 @@ public String metaphone(String txt) {
                     if ( isPreviousChar(local, n, 'M') && 
                          isLastChar(wdsz, n) ) { // B is silent if word ends in MB
 						break;
-                    } else {
-                        code.append(symb);
                     }
+                    code.append(symb);
                     break;
                 case 'C' : // lots of C special cases
                     /* discard if SCI, SCE or SCY */

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

@@ -25,7 +25,7 @@
  * Margaret Odell and Robert Russell
  * 
  * @author Apache Software Foundation
- * @version $Id: RefinedSoundex.java,v 1.19 2004/05/24 00:23:17 ggregory Exp $
+ * @version $Id: RefinedSoundex.java,v 1.20 2004/05/24 04:57:24 ggregory Exp $
  */
 public class RefinedSoundex implements StringEncoder {
 
@@ -139,9 +139,8 @@ public String encode(String pString) {
     char getMappingCode(char c) {
         if (!Character.isLetter(c)) {
             return 0;
-        } else {
-            return this.soundexMapping[Character.toUpperCase(c) - 'A'];
         }
+        return this.soundexMapping[Character.toUpperCase(c) - 'A'];
     }
 
     /**