Make code less twisty.

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

Author: garydgregory

src/java/org/apache/commons/codec/binary/Base64.java

@@ -31,7 +31,7 @@
  * @see <a href="http://www.ietf.org/rfc/rfc2045.txt">RFC 2045</a>
  * @author Apache Software Foundation
  * @since 1.0-dev
- * @version $Id: Base64.java,v 1.19 2004/03/24 18:37:25 ggregory Exp $
+ * @version $Id: Base64.java,v 1.20 2004/05/24 00:21:24 ggregory Exp $
  */
 public class Base64 implements BinaryEncoder, BinaryDecoder {
 
@@ -203,17 +203,10 @@ public static byte[] encodeBase64Chunked(byte[] binaryData) {
      *                          of type byte[]
      */
     public Object decode(Object pObject) throws DecoderException {
-
-        Object result;
-
         if (!(pObject instanceof byte[])) {
             throw new DecoderException("Parameter supplied to Base64 decode is not a byte[]");
-        } else {
-            result = decode((byte[]) pObject);
         }
-
-        return result;
-
+        return decode((byte[]) pObject);
     }
 
     /**
@@ -510,18 +503,11 @@ static byte[] discardNonBase64(byte[] data) {
      *                          of type byte[]
      */
     public Object encode(Object pObject) throws EncoderException {
-
-        Object result;
-
         if (!(pObject instanceof byte[])) {
             throw new EncoderException(
                 "Parameter supplied to Base64 encode is not a byte[]");
-        } else {
-            result = encode((byte[]) pObject);
         }
-
-        return result;
-
+        return encode((byte[]) pObject);
     }
 
     /**

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

@@ -31,7 +31,7 @@
  * </ul>
  * 
  * @author Apache Software Foundation
- * @version $Id: DoubleMetaphone.java,v 1.20 2004/02/29 04:08:31 tobrien Exp $
+ * @version $Id: DoubleMetaphone.java,v 1.21 2004/05/24 00:25:22 ggregory Exp $
  */
 public class DoubleMetaphone implements StringEncoder {
 
@@ -198,12 +198,10 @@ public String doubleMetaphone(String value, boolean alternate) {
      * @throws EncoderException encode parameter is not of type String
      */
     public Object encode(Object obj) throws EncoderException {
-
         if (!(obj instanceof String)) {
             throw new EncoderException("DoubleMetaphone encode parameter is not of type String"); 
-        } else {
-            return doubleMetaphone((String) obj);
-        }
+        } 
+        return doubleMetaphone((String) obj);
     }
 
     /**

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.17 2004/05/24 00:19:13 ggregory Exp $
+ * @version $Id: Metaphone.java,v 1.18 2004/05/24 00:22:45 ggregory Exp $
  */
 public class Metaphone implements StringEncoder {
 
@@ -354,13 +354,10 @@ private boolean isLastChar(int wdsz, int n) {
      *                          of type java.lang.String
      */
     public Object encode(Object pObject) throws EncoderException {
-        Object result;
         if (!(pObject instanceof java.lang.String)) {
             throw new EncoderException("Parameter supplied to Metaphone encode is not of type java.lang.String"); 
-        } else {
-            result = metaphone((String) pObject);
         }
-        return result;
+        return metaphone((String) pObject);
     }
 
     /**

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.18 2004/04/18 21:31:46 tobrien Exp $
+ * @version $Id: RefinedSoundex.java,v 1.19 2004/05/24 00:23:17 ggregory Exp $
  */
 public class RefinedSoundex implements StringEncoder {
 
@@ -110,13 +110,10 @@ public int difference(String s1, String s2) throws EncoderException {
 	 *                  if the parameter supplied is not of type java.lang.String
 	 */
     public Object encode(Object pObject) throws EncoderException {
-        Object result;
         if (!(pObject instanceof java.lang.String)) {
             throw new EncoderException("Parameter supplied to RefinedSoundex encode is not of type java.lang.String");
-        } else {
-            result = soundex((String) pObject);
         }
-        return result;
+        return soundex((String) pObject);
     }
 
     /**

src/java/org/apache/commons/codec/net/QCodec.java

@@ -42,7 +42,7 @@
  * 
  * @author Apache Software Foundation
  * @since 1.3
- * @version $Id: QCodec.java,v 1.5 2004/04/13 22:46:37 ggregory Exp $
+ * @version $Id: QCodec.java,v 1.6 2004/05/24 00:24:32 ggregory Exp $
  */
 public class QCodec extends RFC1522Codec implements StringEncoder, StringDecoder {
     /**
@@ -166,9 +166,8 @@ protected byte[] doDecoding(byte[] bytes) throws DecoderException {
                 }
             }
             return QuotedPrintableCodec.decodeQuotedPrintable(tmp);
-        } else {
-            return QuotedPrintableCodec.decodeQuotedPrintable(bytes);
-        }
+        } 
+        return QuotedPrintableCodec.decodeQuotedPrintable(bytes);       
     }
 
     /**