remove inner class to deal with http://jira.codehaus.org/browse/GRECLIPSE-1519