--- old/modules/javafx.swt/src/main/java/javafx/embed/swt/SWTEvents.java	2016-09-21 19:11:57.000000000 +0200
+++ new/modules/javafx.swt/src/main/java/javafx/embed/swt/SWTEvents.java	2016-09-21 19:11:56.000000000 +0200
@@ -26,12 +26,9 @@
 package javafx.embed.swt;
 
 import org.eclipse.swt.SWT;
-//import org.eclipse.swt.events.MouseEvent;
 
 import java.lang.reflect.Method;
 
-//import com.sun.glass.events.KeyEvent;
-import com.sun.javafx.embed.AbstractEvents;
 import org.eclipse.swt.widgets.Event;
 
 import java.lang.reflect.InvocationTargetException;
@@ -43,36 +40,6 @@
  */
 class SWTEvents {
 
-/*
-    static int mouseIDToEmbedMouseType(int id) {
-        switch (id) {
-            case MouseEvent.MOUSE_PRESSED:
-                return AbstractEvents.MOUSEEVENT_PRESSED;
-            case MouseEvent.MOUSE_RELEASED:
-                return AbstractEvents.MOUSEEVENT_RELEASED;
-            case MouseEvent.MOUSE_CLICKED:
-                return AbstractEvents.MOUSEEVENT_CLICKED;
-            case MouseEvent.MOUSE_MOVED:
-                return AbstractEvents.MOUSEEVENT_MOVED;
-            case MouseEvent.MOUSE_DRAGGED:
-                return AbstractEvents.MOUSEEVENT_DRAGGED;
-            case MouseEvent.MOUSE_ENTERED:
-                return AbstractEvents.MOUSEEVENT_ENTERED;
-            case MouseEvent.MOUSE_EXITED:
-                return AbstractEvents.MOUSEEVENT_EXITED;
-        }
-        return 0;
-    }
-*/
-    static int mouseButtonToEmbedMouseButton(int button, int extModifiers) {
-        switch (button) {
-            case 1: return AbstractEvents.MOUSEEVENT_PRIMARY_BUTTON;
-            case 2: return AbstractEvents.MOUSEEVENT_MIDDLE_BUTTON;
-            case 3: return AbstractEvents.MOUSEEVENT_SECONDARY_BUTTON;
-        }
-        return AbstractEvents.MOUSEEVENT_NONE_BUTTON;
-    }
-
     static double getWheelRotation(Event e) {
         int divisor = 1;
         if ("win32".equals(SWT.getPlatform()) && e.type == SWT.MouseVerticalWheel) {
@@ -100,18 +67,6 @@
         return e.count / (double) Math.max(1, divisor);
     }
 
-    static int keyIDToEmbedKeyType(int id) {
-        switch (id) {
-            case SWT.KeyDown:
-                return AbstractEvents.KEYEVENT_PRESSED;
-            case SWT.KeyUp:
-                return AbstractEvents.KEYEVENT_RELEASED;
-//            case KeyEvent.KEY_TYPED:
-//                return AbstractEvents.KEYEVENT_TYPED;
-        }
-        return 0;
-    }
-
     static final int [] [] KeyTable = {
 
         {0x0 /*KeyEvent.VK_UNDEFINED*/,     SWT.NULL},
@@ -283,22 +238,4 @@
         }
         return 0;
     }
-
-    static int keyModifiersToEmbedKeyModifiers(int extModifiers) {
-        int embedModifiers = 0;
-        if ((extModifiers & SWT.SHIFT) != 0) {
-            embedModifiers |= AbstractEvents.MODIFIER_SHIFT;
-        }
-        if ((extModifiers & SWT.CTRL) != 0) {
-            embedModifiers |= AbstractEvents.MODIFIER_CONTROL;
-        }
-        if ((extModifiers & SWT.ALT) != 0) {
-            embedModifiers |= AbstractEvents.MODIFIER_ALT;
-        }
-        // NOTE: can't get Windows key from SWT
-        if ((extModifiers & SWT.COMMAND) != 0) {
-            embedModifiers |= AbstractEvents.MODIFIER_META;
-        }
-        return embedModifiers;
-    }
 }