Update switch statements to be compliant with Oracle standards.

See section 7.8 on http://www.oracle.com/technetwork/java/javase/documentation/codeconventions-142311.html#468
Merge pull request #5 from macguy8/master

Update switch statements to be compliant with Oracle standards.