UIMA-3441
- more refactoring

git-svn-id: https://svn.apache.org/repos/asf/uima/ruta/trunk@1565209 13f79535-47bb-0310-9956-ffa450edef68