Some refactorings of JavaFileModel
Merge pull request #131 from jsight/JavaFileModelRefactor

Some refactorings of JavaFileModel