EJPLUGIN-157;  more changes yes to use direct RWT class