[Java] Carry forward sinceVersion and description in IR for valid values and bit set choices. Issue aeron-io#414.

Author: mjpt777

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/IrGenerator.java

@@ -278,31 +278,27 @@ private void add(final EnumType type, final int offset, final Field field)
 
  for (final EnumType.ValidValue validValue : type.validValues())
  {
- add(validValue, encodingType, field);
+ add(validValue, encodingType);
  }
 
  builder.signal(Signal.END_ENUM);
 
  tokenList.add(builder.build());
  }
 
- private void add(final EnumType.ValidValue value, final PrimitiveType encodingType, final Field field)
+ private void add(final EnumType.ValidValue value, final PrimitiveType encodingType)
  {
  final Token.Builder builder = new Token.Builder()
  .signal(Signal.VALID_VALUE)
  .name(value.name())
+ .version(value.sinceVersion())
+ .description(value.description())
  .encoding(new Encoding.Builder()
  .byteOrder(byteOrder)
  .primitiveType(encodingType)
  .constValue(value.primitiveValue())
  .build());
 
- if (field != null)
- {
- builder.version(field.sinceVersion());
- builder.description(field.description());
- }
-
  tokenList.add(builder.build());
  }
 
@@ -330,30 +326,27 @@ private void add(final SetType type, final int offset, final Field field)
 
  for (final SetType.Choice choice : type.choices())
  {
- add(choice, encodingType, field);
+ add(choice, encodingType);
  }
 
  builder.signal(Signal.END_SET);
 
  tokenList.add(builder.build());
  }
 
- private void add(final SetType.Choice value, final PrimitiveType encodingType, final Field field)
+ private void add(final SetType.Choice value, final PrimitiveType encodingType)
  {
  final Token.Builder builder = new Token.Builder()
  .signal(Signal.CHOICE)
  .name(value.name())
+ .description(value.description())
+ .version(value.sinceVersion())
  .encoding(new Encoding.Builder()
  .constValue(value.primitiveValue())
  .byteOrder(byteOrder)
  .primitiveType(encodingType)
  .build());
 
- if (field != null)
- {
- builder.version(field.sinceVersion());
- }
-
  tokenList.add(builder.build());
  }