Merge pull request #5186 from JakubValtar/fx-runtime

benfry · web-flow · commit ef2933d4b9e6 · 2017-08-22T09:59:00.000-04:00
Add JavaFX runtime to error checker class path
diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java
@@ -524,6 +524,7 @@ public String preprocess(File srcFolder,
   protected boolean ignorableImport(String pkg) {
     if (pkg.startsWith("java.")) return true;
     if (pkg.startsWith("javax.")) return true;
+    if (pkg.startsWith("javafx.")) return true;
 
     if (pkg.startsWith("processing.core.")) return true;
     if (pkg.startsWith("processing.data.")) return true;
diff --git a/java/src/processing/mode/java/pdex/PreprocessingService.java b/java/src/processing/mode/java/pdex/PreprocessingService.java
@@ -596,16 +596,31 @@ static private List<String> buildSketchLibraryClassPath(JavaMode mode,
   static private List<String> buildJavaRuntimeClassPath() {
     StringBuilder classPath = new StringBuilder();
 
-    // Java runtime
-    String rtPath = System.getProperty("java.home") +
-        File.separator + "lib" + File.separator + "rt.jar";
-    if (new File(rtPath).exists()) {
-      classPath.append(File.pathSeparator).append(rtPath);
-    } else {
-      rtPath = System.getProperty("java.home") + File.separator + "jre" +
+    { // Java runtime
+      String rtPath = System.getProperty("java.home") +
           File.separator + "lib" + File.separator + "rt.jar";
       if (new File(rtPath).exists()) {
         classPath.append(File.pathSeparator).append(rtPath);
+      } else {
+        rtPath = System.getProperty("java.home") + File.separator + "jre" +
+            File.separator + "lib" + File.separator + "rt.jar";
+        if (new File(rtPath).exists()) {
+          classPath.append(File.pathSeparator).append(rtPath);
+        }
+      }
+    }
+
+    { // JavaFX runtime
+      String jfxrtPath = System.getProperty("java.home") +
+          File.separator + "lib" + File.separator + "ext" + File.separator + "jfxrt.jar";
+      if (new File(jfxrtPath).exists()) {
+        classPath.append(File.pathSeparator).append(jfxrtPath);
+      } else {
+        jfxrtPath = System.getProperty("java.home") + File.separator + "jre" +
+            File.separator + "lib" + File.separator + "ext" + File.separator + "jfxrt.jar";
+        if (new File(jfxrtPath).exists()) {
+          classPath.append(File.pathSeparator).append(jfxrtPath);
+        }
       }
     }
 
