Geowave 141

the file wasn't formatted previously (actually eclipse clean-up) so there are a lot of automated changes, but the significant bit regarding this issue is lines 231-236 and 273-278