seems few compile errors remained in these files, because of earlier refactoring. committing fixes for them.

git-svn-id: https://svn.apache.org/repos/asf/xerces/java/branches/xml-schema-1.1-dev@1610115 13f79535-47bb-0310-9956-ffa450edef68
committing minor refactoring. doing little renaming of file.

git-svn-id: https://svn.apache.org/repos/asf/xerces/java/branches/xml-schema-1.1-dev@1610123 13f79535-47bb-0310-9956-ffa450edef68