Could you take a minute to change your indentation settings? I tend to prefer 4-space indents (no tabs) for Java, and that's what I've used so far in this project.