Fix the java import tool to correctly process switch statements