Refactoring: Replacing Enums with the Strategy Pattern

Here's a simple way to remove all of those ugly switch statements and enums and to buy yourself a little more flexibility and testability as an added bonus!