Allow f3 to look up java files, and some refactor related to this
Merge pull request #1 from richardpopple/development

Allow f3 to look up java files, and some refactor related to this