java
Merge pull request #1 from fengxuan-fx/master

java from fx