Google Git
Sign in
eclipse/gerrit/efxclipse/org.eclipse.efxclipse/0766adced9c608608f6a7d552b3e6ab23d03ec5c^!/.
commit
0766adced9c608608f6a7d552b3e6ab23d03ec5c
[log]
author
Tom Schindl <tom.schindl@bestsolution.at>
Fri Jan 20 11:09:11 2017 +0100
committer
Tom Schindl <tom.schindl@bestsolution.at>
Fri Jan 20 11:09:11 2017 +0100
tree
4e522ef57df12e40007b8aba869d84087a4fe7f6
parent
c7339fbcfafe6998495339864fbe1d0be38047b3 [diff]
Bug 510656 - Make e(fx)clipse applications run on Java9

Change-Id: Ie3e8c97f83922f85bf2fce113e3eb33ed2947d98

diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF
index e9dfbc3..8b9b813 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/META-INF/MANIFEST.MF

@@ -9,6 +9,7 @@
  org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)";resolution:=optional
 Service-Component: OSGI-INF/services/org.eclipse.fx.ui.keybindings.generic.BindingFactoryImpl.xml
 Bundle-Vendor: Eclipse.org
-Import-Package: org.eclipse.fx.ui.keybindings;version="3.0.0",
+Import-Package: org.eclipse.fx.ui.controls;version="3.0.0",
+ org.eclipse.fx.ui.keybindings;version="3.0.0",
  org.eclipse.fx.ui.keybindings.service;version="3.0.0",
  org.osgi.service.component.annotations;version="1.2.0";resolution:=optional

diff --git a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/src/org/eclipse/fx/ui/keybindings/generic/KeyStrokeImpl.java b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/src/org/eclipse/fx/ui/keybindings/generic/KeyStrokeImpl.java
index 36b63d2..f41e243 100755
--- a/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/src/org/eclipse/fx/ui/keybindings/generic/KeyStrokeImpl.java
+++ b/bundles/runtime/org.eclipse.fx.ui.keybindings.generic/src/org/eclipse/fx/ui/keybindings/generic/KeyStrokeImpl.java

@@ -14,6 +14,7 @@
 
 import javafx.scene.input.KeyCode;
 
+import org.eclipse.fx.ui.controls.JavaFXCompatUtil;
 import org.eclipse.fx.ui.keybindings.KeyLookup;
 import org.eclipse.fx.ui.keybindings.KeyStroke;
 import org.eclipse.fx.ui.keybindings.ParseException;
@@ -76,7 +77,7 @@
 							if (naturalKey == NO_KEY) {
 								 KeyCode fxKeyCode = KeyCode.valueOf(token);
 								 if (fxKeyCode != null)
-									 naturalKey = fxKeyCode.impl_getCode();
+									 naturalKey = JavaFXCompatUtil.getCode(fxKeyCode);
 							}
 						}