tests and javadoc review for drawcontroller and drawobject
merge