Switched to using ShapeType enum in ShapeAnnotation interface. References #2525