Cleaned

Author: rijnb

src/main/java/com/mapcode/Decoder.java

@@ -645,25 +645,8 @@ static String decodeUTF16(final String mapcode) {
         return result;
     }
 
-    static String encodeUTF16(final String string, final int alphabet) {
-        final StringBuilder sb = new StringBuilder();
-        for (char ch : string.toCharArray()) {
-            ch = Character.toUpperCase(ch);
-            if (ch > 'Z') {
-                // Not in any valid range?
-                sb.append('?');
-            } else if (ch < 'A') {
-                // Valid but not a letter (e.g. a dot, a space...).
-                // Leave untranslated.
-                sb.append(ch);
-            } else {
-                sb.append((char) ASCII2LANGUAGE[alphabet][(int) ch - (int) 'A']);
-            }
-        }
-        return sb.toString();
-    }
-
-    static String encodeToAlphabetCode(final String mapcode, int alphabetCode) {
+    static String encodeUTF16(final String mapcode, int alphabetCode) {
+        final String mapcodeToEncode;
         if (ASCII2LANGUAGE[alphabetCode][4] == 0x003f) {
 
             // Alphabet does not contain 'E'.
@@ -673,11 +656,29 @@ static String encodeToAlphabetCode(final String mapcode, int alphabetCode) {
                     throw new AssertionError("encodeToAlphabetCode: cannot encode '" + mapcode +
                             "' to alphabet " + alphabetCode + ' ' + Alphabet.fromCode(alphabetCode));
                 }
-                final String packed = Encoder.aeuPack(unpacked, true);
-                return encodeUTF16(packed, alphabetCode);
+                mapcodeToEncode = Encoder.aeuPack(unpacked, true);
             }
+            else {
+                mapcodeToEncode = mapcode;
+            }
+        }
+        else {
+            mapcodeToEncode = mapcode;
         }
-        return encodeUTF16(mapcode, alphabetCode);
+        final StringBuilder sb = new StringBuilder();
+        for (char ch : mapcodeToEncode.toCharArray()) {
+            ch = Character.toUpperCase(ch);
+            if (ch > 'Z') {
+                // Not in any valid range?
+                sb.append('?');
+            } else if (ch < 'A') {
+                // Valid but not a letter (e.g. a dot, a space...). Leave untranslated.
+                sb.append(ch);
+            } else {
+                sb.append((char) ASCII2LANGUAGE[alphabetCode][(int) ch - (int) 'A']);
+            }
+        }
+        return sb.toString();
     }
 
     @Nonnull

src/main/java/com/mapcode/Mapcode.java

@@ -394,7 +394,7 @@ static String convertMapcodeToPlainAscii(@Nonnull final String mapcode) {
     @Nonnull
     static String convertMapcodeToAlphabet(@Nonnull final String mapcode, @Nullable final Alphabet alphabet) throws IllegalArgumentException {
         checkMapcodeCode("mapcode", mapcode);
-        return (alphabet != null) ? Decoder.encodeToAlphabetCode(mapcode.toUpperCase(), alphabet.code) : mapcode.toUpperCase();
+        return (alphabet != null) ? Decoder.encodeUTF16(mapcode.toUpperCase(), alphabet.code) : mapcode.toUpperCase();
     }
 
     /**