Run the Java code through a standard formatter

This change uses the Eclipse Java formatter to re-format the original code.  The main issue was tabs + spaces intermixed, and any overly-extensive changes were causing github diff's to be off.