Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 1227:2cece98933c8
8075623: Temporary patch to get fx imports working interim
Reviewed-by: lagergren
Contributed-by: james.laskey@oracle.com
| author | jlaskey |
|---|---|
| date | Mon, 23 Mar 2015 09:04:59 -0300 |
| parents | 2e640036000d |
| children | 433a6c109350 |
| files | src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js |
| diffstat | 1 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js Fri Mar 20 20:04:18 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/fx/base.js Mon Mar 23 09:04:59 2015 -0300 @@ -45,11 +45,19 @@ 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();