stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8075623: Temporary patch to get fx imports working interim

Browse Source 
Reviewed-by: lagergren
This commit is contained in:
James Laskey 2015-03-23 09:04:59 -03:00 committed by Jim Laskey
parent 3251eb7210
commit bc29dd414c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js
View File

@ -45,11 +45,19 @@ function LOAD_FX_CLASSES(clsList) {
var SUFFIX_LENGTH = ".class".length;
// TODO - temporary patch until fx is moved to module system.
// <patch>
var jfxrtJar;
try {
var jfxrtJar = new ZipFile(System.getProperty("java.home") + "/lib/ext/jfxrt.jar");
} catch (ex) {
throw new Error("JavaFX runtime not found");
jfxrtJar = new ZipFile(System.getProperty("java.home") + "/lib/jfxrt.jar");
} catch (ex1) {
try {
jfxrtJar = new ZipFile(System.getProperty("java.home") + "/lib/ext/jfxrt.jar");
} catch (ex2) {
throw new Error("JavaFX runtime not found");
}
}
// </patch>
var entries = jfxrtJar.entries();