@@ -85,6 +85,10 @@
   </condition>
   -->
 
+  <!-- These lists haven't been updated since Java 6. The new list:
+       http://www.oracle.com/technetwork/java/javase/jre-8-readme-2095710.html
+       Please help: https://github.com/processing/processing/issues/3288 -->
+
   <fileset dir="windows/work/java" id="jre-optional-windows">
     <include name="lib/ext/dnsns.jar" />
 
@@ -129,14 +133,9 @@
 
   <!-- Unused JavaFX files that can be removed from the JRE on Windows 
        and Linux. On Mac OS X, this is removed by the appbundler task.
-       www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html -->
-
-  <!-- There might be others, based on what was in the Java 6 docs, 
-       but that info isn't part of the Java 7 instructions.
-       http://www.oracle.com/technetwork/java/javase/jrereadme-182762.html -->
-
-  <!-- New list for Java 8, not updated yet here, nor in appbundler on OS X
-       http://www.oracle.com/technetwork/java/javase/jre-8-readme-2095710.html -->
+       www.oracle.com/technetwork/java/javase/jdk-7-readme-429198.html
+       However, we're now looking into using JavaFX as the default 2D
+       renderer for 3.0. So in 3.0a8, we're no longer removing javafx. -->
 
   <fileset dir="${platform}/work/java" id="javafx-basics">
     <include name="THIRDPARTYLICENSEREADME-JAVAFX.txt" />
@@ -772,9 +771,11 @@
     <delete dir="linux/jre${jdk.esoteric}" />
 
     <!-- Remove unused JRE bloat. -->
-    <delete failonerror="true"> 
+    <delete failonerror="true">
+      <!--
       <fileset refid="javafx-basics" />
       <fileset refid="javafx-linux-${sun.arch.data.model}" />
+      -->
       <fileset refid="jre-optional-linux" />
     </delete>
 
@@ -999,10 +1000,12 @@
     <move file="windows/work/jre${jdk.esoteric}" 
           tofile="windows/work/java" />
 
-    <!-- Remove space-wasting JavaFX garbage. -->
+    <!-- Remove unused JRE bloat. -->
     <delete failonerror="true">
+      <!--
       <fileset refid="javafx-basics" />
       <fileset refid="javafx-windows" />
+      -->
       <fileset refid="jre-optional-windows" />
     </delete>
 
 
@@ -31,6 +31,7 @@ javafx
 X implement blendMode
 X   https://github.com/processing/processing/issues/3275
 X hide the smooth() warnings
+X don't remove JavaFX stuff from Windows and Linux builds
 
 
 high priority
@@ -57,14 +58,14 @@ _ createGraphics() should probably create PGraphicsJava2D
 _   or is Canvas specific to the PGraphics, and we get another Context2D?
 _   http://docs.oracle.com/javafx/2/api/javafx/scene/canvas/Canvas.html
 _ loadPixels() (also 2x)
+_ text and fonts?
 _ updatePixels()
 _ save() and saveFrame()
 _ get() and set()
 _ clip/noClip
 _   https://github.com/processing/processing/issues/3274
 _ getNative() is problematic because it gives back a BufferedImage
 _   move loadImage() into PGraphics, with AWT version the default?
-_ don't remove javafx stuff from Windows build
 _ implement frameRate()
 _ implement external messages (moving the window)
 
 
@@ -182,6 +182,8 @@ _   sound is not yet supported on Windows
 _ clean out the repo
 _   https://github.com/processing/processing/issues/1898
 _ search the source for 'applet' references (i.e. SVG docs)
+_ update list of option JRE files
+_   https://github.com/processing/processing/issues/3288
 
 
 sketchbook