Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 71709D407 for ; Sat, 19 Jan 2013 14:10:20 +0000 (UTC) Received: (qmail 54030 invoked by uid 500); 19 Jan 2013 14:10:20 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 53775 invoked by uid 500); 19 Jan 2013 14:10:19 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 53760 invoked by uid 99); 19 Jan 2013 14:10:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jan 2013 14:10:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Jan 2013 14:10:14 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4657D23888D2; Sat, 19 Jan 2013 14:09:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1435550 - in /commons/proper/codec/trunk/src/main/java/org/apache/commons/codec: ./ binary/ digest/ language/ language/bm/ Date: Sat, 19 Jan 2013 14:09:52 -0000 To: commits@commons.apache.org From: tn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130119140953.4657D23888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tn Date: Sat Jan 19 14:09:52 2013 New Revision: 1435550 URL: http://svn.apache.org/viewvc?rev=1435550&view=rev Log: Fix checkstyle warnings. Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/StringUtils.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/B64.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/StringEncoderComparator.java Sat Jan 19 14:09:52 2013 @@ -28,6 +28,7 @@ import java.util.Comparator; * * @version $Id$ */ +@SuppressWarnings("rawtypes") public class StringEncoderComparator implements Comparator { /** @@ -69,6 +70,7 @@ public class StringEncoderComparator imp * @return the Comparable.compareTo() return code or 0 if an encoding error was caught. * @see Comparable */ + @SuppressWarnings("unchecked") @Override public int compare(final Object o1, final Object o2) { Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32.java Sat Jan 19 14:09:52 2013 @@ -281,7 +281,9 @@ public class Base32 extends BaseNCodec { * Output is written to {@link Context#buffer} as 8-bit octets, using {@link Context#pos} as the buffer position */ @Override - void decode(final byte[] in, int inPos, final int inAvail, final Context context) { // package protected for access from I/O streams + void decode(final byte[] in, int inPos, final int inAvail, final Context context) { + // package protected for access from I/O streams + if (context.eof) { return; } @@ -375,7 +377,9 @@ public class Base32 extends BaseNCodec { * @param context the context to be used */ @Override - void encode(final byte[] in, int inPos, final int inAvail, final Context context) { // package protected for access from I/O streams + void encode(final byte[] in, int inPos, final int inAvail, final Context context) { + // package protected for access from I/O streams + if (context.eof) { return; } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32InputStream.java Sat Jan 19 14:09:52 2013 @@ -77,7 +77,8 @@ public class Base32InputStream extends B * If doEncode is true, each line of encoded data will be terminated with this byte sequence (e.g. \r\n). * If lineLength <= 0, the lineSeparator is not used. If doEncode is false lineSeparator is ignored. */ - public Base32InputStream(final InputStream in, final boolean doEncode, final int lineLength, final byte[] lineSeparator) { + public Base32InputStream(final InputStream in, final boolean doEncode, + final int lineLength, final byte[] lineSeparator) { super(in, new Base32(lineLength, lineSeparator), doEncode); } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base32OutputStream.java Sat Jan 19 14:09:52 2013 @@ -77,7 +77,8 @@ public class Base32OutputStream extends * If doEncode is true, each line of encoded data will be terminated with this byte sequence (e.g. \r\n). * If lineLength <= 0, the lineSeparator is not used. If doEncode is false lineSeparator is ignored. */ - public Base32OutputStream(final OutputStream out, final boolean doEncode, final int lineLength, final byte[] lineSeparator) { + public Base32OutputStream(final OutputStream out, final boolean doEncode, + final int lineLength, final byte[] lineSeparator) { super(out, new Base32(lineLength, lineSeparator), doEncode); } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64.java Sat Jan 19 14:09:52 2013 @@ -654,7 +654,8 @@ public class Base64 extends BaseNCodec { * Thrown when the input array needs an output array bigger than maxResultSize * @since 1.4 */ - public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked, final boolean urlSafe, final int maxResultSize) { + public static byte[] encodeBase64(final byte[] binaryData, final boolean isChunked, + final boolean urlSafe, final int maxResultSize) { if (binaryData == null || binaryData.length == 0) { return binaryData; } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64InputStream.java Sat Jan 19 14:09:52 2013 @@ -81,7 +81,8 @@ public class Base64InputStream extends B * If doEncode is true, each line of encoded data will be terminated with this byte sequence (e.g. \r\n). * If lineLength <= 0, the lineSeparator is not used. If doEncode is false lineSeparator is ignored. */ - public Base64InputStream(final InputStream in, final boolean doEncode, final int lineLength, final byte[] lineSeparator) { + public Base64InputStream(final InputStream in, final boolean doEncode, + final int lineLength, final byte[] lineSeparator) { super(in, new Base64(lineLength, lineSeparator), doEncode); } } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/Base64OutputStream.java Sat Jan 19 14:09:52 2013 @@ -81,7 +81,8 @@ public class Base64OutputStream extends * If doEncode is true, each line of encoded data will be terminated with this byte sequence (e.g. \r\n). * If lineLength <= 0, the lineSeparator is not used. If doEncode is false lineSeparator is ignored. */ - public Base64OutputStream(final OutputStream out, final boolean doEncode, final int lineLength, final byte[] lineSeparator) { + public Base64OutputStream(final OutputStream out, final boolean doEncode, + final int lineLength, final byte[] lineSeparator) { super(out, new Base64(lineLength, lineSeparator), doEncode); } } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/BaseNCodec.java Sat Jan 19 14:09:52 2013 @@ -179,7 +179,8 @@ public abstract class BaseNCodec impleme * @param lineLength if > 0, use chunking with a length lineLength * @param chunkSeparatorLength the chunk separator length, if relevant */ - protected BaseNCodec(final int unencodedBlockSize, final int encodedBlockSize, final int lineLength, final int chunkSeparatorLength) { + protected BaseNCodec(final int unencodedBlockSize, final int encodedBlockSize, + final int lineLength, final int chunkSeparatorLength) { this.unencodedBlockSize = unencodedBlockSize; this.encodedBlockSize = encodedBlockSize; final boolean useChunking = lineLength > 0 && chunkSeparatorLength > 0; Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/StringUtils.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/StringUtils.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/StringUtils.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/binary/StringUtils.java Sat Jan 19 14:09:52 2013 @@ -192,7 +192,8 @@ public class StringUtils { return getBytes(string, Charsets.UTF_8); } - private static IllegalStateException newIllegalStateException(final String charsetName, final UnsupportedEncodingException e) { + private static IllegalStateException newIllegalStateException(final String charsetName, + final UnsupportedEncodingException e) { return new IllegalStateException(charsetName + ": " + e); } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/B64.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/B64.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/B64.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/B64.java Sat Jan 19 14:09:52 2013 @@ -51,7 +51,8 @@ class B64 { * @param buffer * Where the output chars is appended to. */ - static void b64from24bit(final byte b2, final byte b1, final byte b0, final int outLen, final StringBuilder buffer) { + static void b64from24bit(final byte b2, final byte b1, final byte b0, final int outLen, + final StringBuilder buffer) { // The bit masking is necessary because the JVM byte type is signed! int w = ((b2 << 16) & 0x00ffffff) | ((b1 << 8) & 0x00ffff) | (b0 & 0xff); // It's effectively a "for" loop but kept to resemble the original C code. Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/digest/Sha2Crypt.java Sat Jan 19 14:09:52 2013 @@ -122,7 +122,8 @@ public class Sha2Crypt { * when a {@link NoSuchAlgorithmException} is caught * @see MessageDigestAlgorithms */ - private static String sha2Crypt(final byte[] keyBytes, final String salt, final String saltPrefix, final int blocksize, final String algorithm) { + private static String sha2Crypt(final byte[] keyBytes, final String salt, final String saltPrefix, + final int blocksize, final String algorithm) { final int keyLen = keyBytes.length; Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java Sat Jan 19 14:09:52 2013 @@ -404,7 +404,8 @@ public class DoubleMetaphone implements /** * Handles 'G' cases. */ - private int handleG(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) { + private int handleG(final String value, final DoubleMetaphoneResult result, int index, + final boolean slavoGermanic) { if (charAt(value, index + 1) == 'H') { index = handleGH(value, result, index); } else if (charAt(value, index + 1) == 'N') { @@ -509,7 +510,8 @@ public class DoubleMetaphone implements /** * Handles 'J' cases. */ - private int handleJ(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) { + private int handleJ(final String value, final DoubleMetaphoneResult result, int index, + final boolean slavoGermanic) { if (contains(value, index, 4, "JOSE") || contains(value, 0, 4, "SAN ")) { //-- obvious Spanish, "Jose", "San Jacinto" --// if ((index == 0 && (charAt(value, index + 4) == ' ') || @@ -576,7 +578,8 @@ public class DoubleMetaphone implements /** * Handles 'R' cases. */ - private int handleR(final String value, final DoubleMetaphoneResult result, final int index, final boolean slavoGermanic) { + private int handleR(final String value, final DoubleMetaphoneResult result, final int index, + final boolean slavoGermanic) { if (index == value.length() - 1 && !slavoGermanic && contains(value, index - 2, 2, "IE") && !contains(value, index - 4, 2, "ME", "MA")) { @@ -590,7 +593,8 @@ public class DoubleMetaphone implements /** * Handles 'S' cases. */ - private int handleS(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) { + private int handleS(final String value, final DoubleMetaphoneResult result, int index, + final boolean slavoGermanic) { if (contains(value, index - 1, 3, "ISL", "YSL")) { //-- special cases "island", "isle", "carlisle", "carlysle" --// index++; @@ -750,7 +754,8 @@ public class DoubleMetaphone implements /** * Handles 'Z' cases. */ - private int handleZ(final String value, final DoubleMetaphoneResult result, int index, final boolean slavoGermanic) { + private int handleZ(final String value, final DoubleMetaphoneResult result, int index, + final boolean slavoGermanic) { if (charAt(value, index + 1) == 'H') { //-- Chinese pinyin e.g. "zhao" or Angelina "Zhang" --// result.append('J'); Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/MatchRatingApproachEncoder.java Sat Jan 19 14:09:52 2013 @@ -6,7 +6,7 @@ * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -36,31 +36,34 @@ public class MatchRatingApproachEncoder /** * Constants used mainly for the min rating value. */ - private static final int ONE = 1, TWO = 2, THREE = 3, FOUR = 4, FIVE = 5, SIX = 6, SEVEN = 7, EIGHT = 8, ELEVEN = 11, TWELVE = 12; + private static final int ONE = 1, TWO = 2, THREE = 3, FOUR = 4, FIVE = 5, SIX = 6, SEVEN = 7, EIGHT = 8, + ELEVEN = 11, TWELVE = 12; /** * The plain letter equivalent of the accented letters. */ - private static final String PLAIN_ASCII = "AaEeIiOoUu" // grave - + "AaEeIiOoUuYy" // acute - + "AaEeIiOoUuYy" // circumflex - + "AaOoNn" // tilde - + "AaEeIiOoUuYy" // umlaut - + "Aa" // ring - + "Cc" // cedilla - + "OoUu"; // double acute + private static final String PLAIN_ASCII = "AaEeIiOoUu" + // grave + "AaEeIiOoUuYy" + // acute + "AaEeIiOoUuYy" + // circumflex + "AaOoNn" + // tilde + "AaEeIiOoUuYy" + // umlaut + "Aa" + // ring + "Cc" + // cedilla + "OoUu"; // double acute /** * Unicode characters corresponding to various accented letters. For example: \u00DA is U acute etc... */ - private static final String UNICODE = "\u00C0\u00E0\u00C8\u00E8\u00CC\u00EC\u00D2\u00F2\u00D9\u00F9" - + "\u00C1\u00E1\u00C9\u00E9\u00CD\u00ED\u00D3\u00F3\u00DA\u00FA\u00DD\u00FD" - + "\u00C2\u00E2\u00CA\u00EA\u00CE\u00EE\u00D4\u00F4\u00DB\u00FB\u0176\u0177" + "\u00C3\u00E3\u00D5\u00F5\u00D1\u00F1" - + "\u00C4\u00E4\u00CB\u00EB\u00CF\u00EF\u00D6\u00F6\u00DC\u00FC\u0178\u00FF" + "\u00C5\u00E5" + "\u00C7\u00E7" - + "\u0150\u0151\u0170\u0171"; - - private static final String[] DOUBLE_CONSONANT = new String[] { "BB", "CC", "DD", "FF", "GG", "HH", "JJ", "KK", "LL", "MM", "NN", "PP", "QQ", "RR", "SS", "TT", "VV", - "WW", "XX", "YY", "ZZ" }; + private static final String UNICODE = "\u00C0\u00E0\u00C8\u00E8\u00CC\u00EC\u00D2\u00F2\u00D9\u00F9" + + "\u00C1\u00E1\u00C9\u00E9\u00CD\u00ED\u00D3\u00F3\u00DA\u00FA\u00DD\u00FD" + + "\u00C2\u00E2\u00CA\u00EA\u00CE\u00EE\u00D4\u00F4\u00DB\u00FB\u0176\u0177" + + "\u00C3\u00E3\u00D5\u00F5\u00D1\u00F1" + + "\u00C4\u00E4\u00CB\u00EB\u00CF\u00EF\u00D6\u00F6\u00DC\u00FC\u0178\u00FF" + + "\u00C5\u00E5" + "\u00C7\u00E7" + "\u0150\u0151\u0170\u0171"; + + private static final String[] DOUBLE_CONSONANT = + new String[] { "BB", "CC", "DD", "FF", "GG", "HH", "JJ", "KK", "LL", "MM", "NN", "PP", "QQ", "RR", "SS", + "TT", "VV", "WW", "XX", "YY", "ZZ" }; /** * Cleans up a name: 1. Upper-cases everything 2. Removes some common punctuation 3. Removes accents 4. Removes any @@ -103,7 +106,8 @@ public class MatchRatingApproachEncoder @Override public final Object encode(final Object pObject) throws EncoderException { if (!(pObject instanceof String)) { - throw new EncoderException("Parameter supplied to Match Rating Approach encoder is not of type java.lang.String"); + throw new EncoderException( + "Parameter supplied to Match Rating Approach encoder is not of type java.lang.String"); } return encode((String) pObject); } @@ -268,8 +272,8 @@ public class MatchRatingApproachEncoder * @return True if a vowel, else false */ boolean isVowel(final String letter) { - return letter.equalsIgnoreCase("E") || letter.equalsIgnoreCase("A") || letter.equalsIgnoreCase("O") || letter.equalsIgnoreCase("I") || - letter.equalsIgnoreCase("U"); + return letter.equalsIgnoreCase("E") || letter.equalsIgnoreCase("A") || letter.equalsIgnoreCase("O") || + letter.equalsIgnoreCase("I") || letter.equalsIgnoreCase("U"); } /** Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/PhoneticEngine.java Sat Jan 19 14:09:52 2013 @@ -337,7 +337,8 @@ public class PhoneticEngine { * the maximum number of phonemes that will be handled * @since 1.7 */ - public PhoneticEngine(final NameType nameType, final RuleType ruleType, final boolean concat, final int maxPhonemes) { + public PhoneticEngine(final NameType nameType, final RuleType ruleType, final boolean concat, + final int maxPhonemes) { if (ruleType == RuleType.RULES) { throw new IllegalArgumentException("ruleType must not be " + RuleType.RULES); } Modified: commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java?rev=1435550&r1=1435549&r2=1435550&view=diff ============================================================================== --- commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java (original) +++ commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/language/bm/Rule.java Sat Jan 19 14:09:52 2013 @@ -174,7 +174,8 @@ public class Rule { static { for (final NameType s : NameType.values()) { - final Map>> rts = new EnumMap>>(RuleType.class); + final Map>> rts = + new EnumMap>>(RuleType.class); for (final RuleType rt : RuleType.values()) { final Map> rs = new HashMap>(); @@ -257,7 +258,8 @@ public class Rule { * the set of languages to consider * @return a list of Rules that apply */ - public static List getInstance(final NameType nameType, final RuleType rt, final Languages.LanguageSet langs) { + public static List getInstance(final NameType nameType, final RuleType rt, + final Languages.LanguageSet langs) { return langs.isSingleton() ? getInstance(nameType, rt, langs.getAny()) : getInstance(nameType, rt, Languages.ANY); }