--- old/modules/javafx.graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	2016-09-21 19:11:50.000000000 +0200
+++ new/modules/javafx.graphics/src/main/java/com/sun/javafx/embed/EmbeddedSceneInterface.java	2016-09-21 19:11:50.000000000 +0200
@@ -31,9 +31,7 @@
 import javafx.collections.ObservableList;
 import javafx.event.EventType;
 import javafx.scene.image.PixelFormat;
-import javafx.scene.input.InputMethodEvent;
-import javafx.scene.input.InputMethodRequests;
-import javafx.scene.input.InputMethodTextRun;
+import javafx.scene.input.*;
 
 /**
  * An interface for embedded FX scene peer. It is used by HostInterface
@@ -67,7 +65,7 @@
     /*
      * A notification about mouse event received by host container.
      */
-    public void mouseEvent(int type, int button,
+    public void mouseEvent(EventType<MouseEvent> type, MouseButton button,
                            boolean primaryBtnDown, boolean middleBtnDown, boolean secondaryBtnDown,
                            int x, int y, int xAbs, int yAbs,
                            boolean shift, boolean ctrl, boolean alt, boolean meta,
@@ -75,7 +73,7 @@
     /*
      * A notification about mouse wheel scroll events received by the host container;
      */
-    public void scrollEvent(int type, double scrollX, double scrollY,
+    public void scrollEvent(EventType<ScrollEvent> type, double scrollX, double scrollY,
                             double totalScrollX, double totalScrollY,
                             double xMultiplier, double yMultiplier,
                             double x, double y, double screenX, double screenY,
@@ -84,26 +82,27 @@
     /*
      * A notification about key event received by host container.
      */
-    public void keyEvent(int type, int key, char[] chars, int modifiers);
+    public void keyEvent(EventType<KeyEvent> type, int key, char[] chars, boolean shift, boolean ctrl,
+                         boolean alt, boolean meta);
 
     /*
      * A notification about zoom events received by the host container.
      */
-    public void zoomEvent(final int type, final double zoomFactor, final double totalZoomFactor,
-                          final double x, final double y, final double screenX, final double screenY,
+    public void zoomEvent(EventType<ZoomEvent> type, double zoomFactor, double totalZoomFactor,
+                          double x, double y, double screenX, double screenY,
                           boolean shift, boolean ctrl, boolean alt, boolean meta, boolean inertia);
 
     /*
      * A notification about rotate events received by the host container.
      */
-    public void rotateEvent(final int type, final double angle, final double totalAngle,
-                          final double x, final double y, final double screenX, final double screenY,
-                          boolean shift, boolean ctrl, boolean alt, boolean meta, boolean inertia);
+    public void rotateEvent(EventType<RotateEvent> type, double angle, double totalAngle,
+                            double x, double y, double screenX, double screenY,
+                            boolean shift, boolean ctrl, boolean alt, boolean meta, boolean inertia);
 
     /*
      * A notification about swipe events received by the host container.
      */
-    public void swipeEvent(final int type, final double x, final double y, final double screenX, final double screenY,
+    public void swipeEvent(EventType<SwipeEvent> type, double x, double y, double screenX, double screenY,
                            boolean shift, boolean ctrl, boolean alt, boolean meta);
 
     /*