diff options
| author | Tom Schindl | 2017-02-02 19:39:13 +0000 |
|---|---|---|
| committer | Tom Schindl | 2017-02-02 19:39:13 +0000 |
| commit | 4504a0fb928b0d607173dd7cd4267a5abe6c6b5c (patch) | |
| tree | cc24a144d694e9ecaf69842532d3e0359321d9b8 /bundles | |
| parent | b7500414cb0737e929be3daf0c0d05ab6dddd7c5 (diff) | |
| download | org.eclipse.efxclipse-4504a0fb928b0d607173dd7cd4267a5abe6c6b5c.tar.gz org.eclipse.efxclipse-4504a0fb928b0d607173dd7cd4267a5abe6c6b5c.tar.xz org.eclipse.efxclipse-4504a0fb928b0d607173dd7cd4267a5abe6c6b5c.zip | |
Bug 511600 - PDE-Classpath container needs to support Java9 for javafx.swt
Change-Id: Icabef54bc0e66608c493f94c1d828918f78452f8
Diffstat (limited to 'bundles')
2 files changed, 3 insertions, 3 deletions
diff --git a/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java b/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java index 18e3e760b..81ee97e69 100755 --- a/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java +++ b/bundles/tooling/org.eclipse.fx.ide.jdt.core/src/org/eclipse/fx/ide/jdt/core/internal/BuildPathSupport.java @@ -91,7 +91,8 @@ public class BuildPathSupport { IPath[] checkPaths = {
// JDK 8
new Path(installDir.getAbsolutePath()).append("jre").append("lib").append("jfxswt.jar"),
- new Path(installDir.getAbsolutePath()).append("lib").append("jfxswt.jar") // JRE
+ new Path(installDir.getAbsolutePath()).append("lib").append("jfxswt.jar"), // JRE
+ new Path(installDir.getAbsolutePath()).append("lib").append("javafx-swt.jar")
};
IPath jarLocationPath = null;
diff --git a/bundles/tooling/org.eclipse.fx.ide.pde.core/src/org/eclipse/fx/ide/pde/core/JavaFXClassPathExtender.java b/bundles/tooling/org.eclipse.fx.ide.pde.core/src/org/eclipse/fx/ide/pde/core/JavaFXClassPathExtender.java index bb6b38d0e..1c77b11c1 100755 --- a/bundles/tooling/org.eclipse.fx.ide.pde.core/src/org/eclipse/fx/ide/pde/core/JavaFXClassPathExtender.java +++ b/bundles/tooling/org.eclipse.fx.ide.pde.core/src/org/eclipse/fx/ide/pde/core/JavaFXClassPathExtender.java @@ -188,7 +188,7 @@ public class JavaFXClassPathExtender implements IClasspathContributor { }
// FX8 classpath
- if (version == FXVersion.FX8) {
+ if (version == FXVersion.FX8 || version == FXVersion.FX9) {
if( DEBUG ) {
System.err.println("JavaFXClasspathExtender - This is FX8 only add the SWT-Lib ");
}
@@ -200,7 +200,6 @@ public class JavaFXClassPathExtender implements IClasspathContributor { }
entries.add(swtFxEntry);
}
-
}
// FX2 classpath
|