Forget trying to format stuff by hand, format with Artistic Style:
http://astyle.sourceforge.net/

Ran wit
Got astyle up and running, so I used it to format

Here's my .astylerc:

--style=java
--indent=spaces=4
--convert-tabs
--pad-oper
--pad-header
--unpad-paren
--add-brackets