Remove switch(String) so we have Java 6 support