Bug 502425 - Refactor code for Java 7

Change-Id: I64d3a28a743a0292db27fd421294421dc51eb2e1
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
124 files changed