upgrading plantuml.jar to 8002, refactoring for testability