[Java] Fix build and tidy up after merge of PR aeron-io#575.

Author: mjpt777

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

@@ -1052,7 +1052,7 @@ private void generateBitSet(final List<Token> tokens) throws IOException
  try (Writer out = outputManager.createOutput(decoderName))
  {
  generateFixedFlyweightHeader(token, decoderName, out, readOnlyBuffer, fqReadOnlyBuffer);
- out.append(generateNoChoicesSet(token.encoding().primitiveType()));
+ out.append(generateChoiceIsEmpty(token.encoding().primitiveType()));
  out.append(generateChoiceDecoders(messageBody));
  out.append(generateChoiceDisplay(messageBody));
  out.append("}\n");
@@ -2741,16 +2741,17 @@ private String generatePut(
  throw new IllegalArgumentException("primitive type not supported: " + type);
  }
 
- private String generateNoChoicesSet(final PrimitiveType type)
+ private String generateChoiceIsEmpty(final PrimitiveType type)
  {
- return String.format(
-  "\n public boolean isEmpty()\n" +
-  " {\n" +
- "  return %1$s;\n" +
-  " }\n", generateChoiceUnsetInner(type));
+ return "\n" +
+ " public boolean isEmpty()\n" +
+ " {\n" +
+ " return " + generateChoiceIsEmptyInner(type) + ";\n" +
+ " }\n";
  }
 
- private String generateChoiceUnsetInner(PrimitiveType type) {
+ private String generateChoiceIsEmptyInner(final PrimitiveType type)
+ {
  switch (type)
  {
  case UINT8: