DrawGraphic.java updates
Xlint fixes
Updates