Java 1.6 compatibility

Remove switch statements involving strings