Final JGraphXAdapter changes