[Java] Warnings cleanup.

Author: mjpt777

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

@@ -2912,6 +2912,9 @@ private void generateEncoderFields(
  generateCompositeProperty(
  sb, false, ENCODER, propertyName, fieldToken, typeToken, indent, typeName);
  break;
+
+ default:
+ break;
  }
  });
  }

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

@@ -98,8 +98,8 @@ public EncodedDataType(final Node node, final String givenName, final String ref
  }
  else
  {
- final String characterEncoding = getAttributeValueOrNull(node, "characterEncoding");
- this.characterEncoding = characterEncoding == null ? null : characterEncoding.trim();
+ final String configuredCharacterEncoding = getAttributeValueOrNull(node, "characterEncoding");
+ characterEncoding = configuredCharacterEncoding == null ? null : configuredCharacterEncoding.trim();
  }
 
  if (presence() == CONSTANT)

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

@@ -63,8 +63,8 @@ public class MessageSchema
  this.typeByNameMap = typeByNameMap;
  this.messageByIdMap = messageByIdMap;
 
- final String headerType = getAttributeValueOrNull(schemaNode, "headerType");
- this.headerType = null == headerType ? HEADER_TYPE_DEFAULT : headerType;
+ final String configuredHeaderType = getAttributeValueOrNull(schemaNode, "headerType");
+ headerType = null == configuredHeaderType ? HEADER_TYPE_DEFAULT : configuredHeaderType;
  Verify.present(typeByNameMap, this.headerType, "Message header");
 
  final Node messageHeaderNode = findNode(schemaNode, "types/composite[@name='" + this.headerType + "']");