[Java]: issue aeron-io#670. Check field token for constant encoding on enum.

Author: tmontgomery

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -1323,7 +1323,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
 
                     case BEGIN_ENUM:
                         out.append(sb).append(generateEnumEncoder(
-                            encoderName, propertyName, encodingToken, BASE_INDENT));
+                            encoderName, encodingToken, propertyName, encodingToken, BASE_INDENT));
                         break;
 
                     case BEGIN_SET:
@@ -2615,7 +2615,8 @@ private CharSequence generateEncoderFields(
                         break;
 
                     case BEGIN_ENUM:
-                        sb.append(generateEnumEncoder(containingClassName, propertyName, typeToken, indent));
+                        sb.append(generateEnumEncoder(
+                            containingClassName, fieldToken, propertyName, typeToken, indent));
                         break;
 
                     case BEGIN_SET:
@@ -2792,16 +2793,20 @@ private CharSequence generateEnumDecoder(
     }
 
     private CharSequence generateEnumEncoder(
-        final String containingClassName, final String propertyName, final Token token, final String indent)
+        final String containingClassName,
+        final Token fieldToken,
+        final String propertyName,
+        final Token typeToken,
+        final String indent)
     {
-        if (token.isConstantEncoding())
+        if (fieldToken.isConstantEncoding())
         {
             return "";
         }
 
-        final String enumName = formatClassName(token.applicableTypeName());
-        final Encoding encoding = token.encoding();
-        final int offset = token.offset();
+        final String enumName = formatClassName(typeToken.applicableTypeName());
+        final Encoding encoding = typeToken.encoding();
+        final int offset = typeToken.offset();
 
         return String.format("\n" +
             indent + "    public %s %s(final %s value)\n" +