--- /dev/null	2018-07-04 16:38:59.000000000 +0530
+++ new/modules/javafx.swing/src/main/java/com/sun/javafx/embed/swing/oldimpl/JFXPanelInteropO.java	2018-07-04 16:38:58.455899800 +0530
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.javafx.embed.swing.oldimpl;
+
+import javafx.embed.swing.JFXPanel;
+import java.awt.AWTEvent;
+import java.awt.Toolkit;
+import java.awt.Window;
+
+import sun.awt.AppContext;
+import sun.awt.SunToolkit;
+import com.sun.javafx.embed.swing.JFXPanelInterop;
+
+public class JFXPanelInteropO extends JFXPanelInterop {
+    public void postEvent(JFXPanel panel, AWTEvent e) {
+        AppContext context = SunToolkit.targetToAppContext(panel);
+    if (context != null) {
+            SunToolkit.postEvent(context, e);
+        }
+    }
+
+    public boolean isUngrabEvent(AWTEvent event) {
+        return event instanceof sun.awt.UngrabEvent;
+    }
+
+    public long setMask() {
+        return SunToolkit.GRAB_EVENT_MASK | AWTEvent.MOUSE_EVENT_MASK;
+    }
+
+    public void grab(Toolkit toolkit, Window w) {
+        if (toolkit instanceof SunToolkit) {
+            ((SunToolkit)toolkit).grab(w);
+    }
+    }
+
+    public void ungrab(Toolkit toolkit, Window w) {
+        if (toolkit instanceof SunToolkit) {
+            ((SunToolkit)toolkit).ungrab(w);
+    }
+    }
+}