finished migration to JavaFX