more whitespace stuff

[Adam Heath]

My last set of whitespaces changes in java files missed a bunch of
pure whitespace lines.  I'm going to have to flood svn with 2.5M of
changes.  Sorry about this, I should have checked closer when I did it
the last time.