Applying Sebb's fix from CODEC-56, along with a test

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

Author: hen

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

@@ -30,13 +30,7 @@
  */
 public class RefinedSoundex implements StringEncoder {
 
-    /**
-	 * This static variable contains an instance of the RefinedSoundex using
-	 * the US_ENGLISH mapping.
-	 */
-    public static final RefinedSoundex US_ENGLISH = new RefinedSoundex();
-
-    /**
+   /**
 	 * RefinedSoundex is *refined* for a number of reasons one being that the
 	 * mappings have been altered. This implementation contains default
 	 * mappings for US English.
@@ -51,6 +45,12 @@ public class RefinedSoundex implements StringEncoder {
     private final char[] soundexMapping;
 
     /**
+	 * This static variable contains an instance of the RefinedSoundex using
+	 * the US_ENGLISH mapping.
+	 */
+    public static final RefinedSoundex US_ENGLISH = new RefinedSoundex();
+
+     /**
 	 * Creates an instance of the RefinedSoundex object using the default US
 	 * English mapping.
 	 */

src/test/org/apache/commons/codec/language/RefinedSoundexTest.java

@@ -104,10 +104,13 @@ public void testEncode() {
         assertEquals("T60", this.getEncoder().encode("the"));
         assertEquals("L7050", this.getEncoder().encode("lazy"));
         assertEquals("D6043", this.getEncoder().encode("dogs"));
+
+        // Testing CODEC-56
+        assertEquals("D6043", RefinedSoundex.US_ENGLISH.encode("dogs"));
     }
 
 	public void testGetMappingCodeNonLetter() {
 		char code = this.getEncoder().getMappingCode('#');
 		assertEquals("Code does not equals zero", 0, code);
 	}
-}
+}