Merge pull request #378 from apache/geertjanw-patch-12

Adding Java editor enhancements