move to JDK 11.0.9.1 and hack up downloader to support 9.1 as the suffix

Author: benfry

build/build.xml

@@ -79,49 +79,28 @@
     </and>
   </condition>
 
-  <!-- could prompt here to download the necessary JRE
-       (Windows/Linux) or JDK (on Mac OS X) -->
+  <!-- Could prompt here to download the necessary JDK... -->
 
   <property name="examples.dir"
             value="../../processing-docs/content/examples" />
 
   <property name="jdk.train" value="11" />
   <property name="jdk.version" value="0" />
-  <property name="jdk.update" value="8" />
-  <property name="jdk.build" value="10" />
+  <property name="jdk.update" value="9.1" />
+  <property name="jdk.build" value="1" />
 
   <property name="jdk.prefix" value="jdk" />
   <property name="jdk.esoteric" value="${jdk.train}.${jdk.version}.${jdk.update}" />
 
-  <!-- as of 200815, gluon is currently working on 14.0, and has 11.0.8 available for
-       commercial clients as an LTS release, but 11.0.2 is the latest public version -->
+  <!-- As of 210117, Gluon has 11.0.8 available for commercial clients
+       as an LTS release, but 11.0.2 is the latest free/public version -->
   <property name="jfx.train" value="11" />
   <property name="jfx.version" value="0" />
   <property name="jfx.update" value="2" />
   <property name="jfx.build" value="0" />
 
   <property name="jfx.name" value="${jfx.train}.${jfx.version}.${jfx.update}" />
 
-
-  <!-- Figure out the JRE download location for Linux and Windows. -->
-  <!--
-  <condition property="jdk.file"
-             value="jdk-${jdk.short}-${target-platform}-i586.tar.gz">
-    <equals arg1="${jdk.data.model}" arg2="32" />
-  </condition>
-  <condition property="jdk.file"
-             value="jdk-${jdk.short}-${target-platform}-x64.tar.gz">
-    <equals arg1="${jdk.data.model}" arg2="64" />
-  </condition>
-  -->
-
-  <!-- JDK location for Mac OS X -->
-  <!--
-  <condition property="jdk.file" value="jdk-${jdk.short}-macosx-x64.dmg">
-    <equals arg1="${target-platform}" arg2="macosx" />
-  </condition>
-  -->
-
   <!-- These lists haven't been updated since Java 6. The new list:
        http://www.oracle.com/technetwork/java/javase/jdk-8-readme-2095710.html
        Please help: https://github.com/processing/processing/issues/3288 -->

build/jre/src/Downloader.java

@@ -34,7 +34,7 @@ public class Downloader extends Task {
   private String platform; // macos
   private int train;  // Java 11 (was 1 through Java 8)
   private int version;  // 0 (was 8 prior to Java 9)
-  private int update;  // Update 131
+  private String update;  // Update 131
   private int build;  // Build 11
 
   private String component;  // "jdk" or "jfx"
@@ -80,7 +80,7 @@ public void setVersion(int version) {
    *
    * @param update The update within the version to use like 1 for "11.0.1_13".
    */
-  public void setUpdate(int update) {
+  public void setUpdate(String update) {
     this.update = update;
   }
 
@@ -250,9 +250,9 @@ void download() throws IOException {
 
 
   static private String adoptOpenJdkUrl(String platform, String component,
-                                        int train, int version, int update,
+                                        int train, int version, String update,
                                         int build, String flavor) {
-    final String URL_FORMAT = "https://github.com/AdoptOpenJDK/openjdk%d-binaries/releases/download/jdk-%d.%d.%d%%2B%d/OpenJDK%dU-%s_%d.%d.%d_%d.%s";
+    final String URL_FORMAT = "https://github.com/AdoptOpenJDK/openjdk%d-binaries/releases/download/jdk-%d.%d.%s%%2B%d/OpenJDK%dU-%s_%d.%d.%s_%d.%s";
 
     String filename = null;
     switch (platform) {
@@ -286,9 +286,9 @@ static private String adoptOpenJdkUrl(String platform, String component,
 
 
   static private String gluonHqUrl(String platform, String component,
-                                   int train, int version, int update) {
+                                   int train, int version, String update) {
     final String URL_FORMAT =
-      "https://gluonhq.com/download/javafx-%d-%d-%d-sdk-%s/";
+      "https://gluonhq.com/download/javafx-%d-%d-%s-sdk-%s/";
 
     String platformShort;
     if (platform.contains("linux")) {
@@ -317,12 +317,12 @@ static private String gluonHqUrl(String platform, String component,
    * @param flavor The flavor like "macosx-x64.dmg".
    */
   static private String getLocalFilename(String component, int version,
-                                         int update, String flavor) {
+                                         String update, String flavor) {
     String versionStr;
-    if (update == 0) {
+    if (update.equals("0")) {
       versionStr = String.format("-%d-%s", version, flavor);
     } else {
-      versionStr = String.format("-%du%d-%s", version, update, flavor);
+      versionStr = String.format("-%du%s-%s", version, update, flavor);
     }
     return component + versionStr;
   }

todo.txt

@@ -59,6 +59,9 @@ already fixed in 4.x? (confirm/close on release)
 _ HDPI support GNOME desktop
 _   https://github.com/processing/processing/issues/6059
 
+file issues
+_ update the splash screen to say 2021
+_ remove the JRE Downloader
 
 _ disable "notifications" prompt on startup for macOS
 _   (we're not posting any notifications, at least for now)
@@ -86,6 +89,9 @@ _   i.e. all the things that rely on preferences can be inited separately (later
 decisions before final 4.0 release
 X Shutting off VAqua due to interface ugliness and Contribution Manager freezing
 _   https://github.com/processing/processing4/issues/129
+_   now with a release 9 to cover Big Sur
+_     https://violetlib.org/vaqua/downloads.html
+_   make the final call to remove, or put the libs on download.processing.org
 _ Some 3.x Tools not working because JavaFX isn't on the classpath
 _   https://github.com/processing/processing4/issues/110
 _ Friendly Names for new Sketches (includes UI for switching it back)