openjdk · nlisker · Jul 14, 2022 · Jul 15, 2022 · Jul 19, 2022 · Jul 21, 2022
diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
@@ -140,7 +140,7 @@ jobs:
   macos_x64_build:
     name: macOS x64
     needs: validation
-    runs-on: "macos-10.15"
+    runs-on: "macos-11"
 
     env:
       # FIXME: read this information from a property file
@@ -199,7 +199,7 @@ jobs:
           java -version
           which ant
           ant -version
-          sudo xcode-select --switch /Applications/Xcode_11.3.1.app/Contents/Developer
+          sudo xcode-select --switch /Applications/Xcode_12.4.app/Contents/Developer
           xcodebuild -version
 
       - name: Build JavaFX artifacts

diff --git a/.jcheck/conf b/.jcheck/conf
@@ -24,7 +24,7 @@
 [general]
 project=openjfx
 jbs=jdk
-version=openjfx19
+version=openjfx20
 
 [repository]
 tags=(jdk-){0,1}([1-9]([0-9]*)(\.(0|[1-9][0-9]*)){0,3})(\+(([0-9]+))|(-ga))|[1-9]((\.\d{1,3}){0,2})-((b\d{2,3})|(ga))|[1-9]u(\d{1,3})-((b\d{2,3})|(ga))

diff --git a/apps/.classpath b/apps/.classpath
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry combineaccessrules="false" kind="src" path="/base"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/controls"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/fxml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/media"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/swing"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/apps/.settings/org.eclipse.core.resources.prefs b/apps/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/apps/samples/.classpath b/apps/samples/.classpath
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="3DViewer/src/main/java"/>
-    <classpathentry kind="src" path="3DViewer/src/test/java"/>
-    <classpathentry kind="src" path="3DViewer/src/main/resources"/>
-    <classpathentry kind="src" path="3DViewer/src/test/resources"/>
-    <classpathentry kind="src" path="Ensemble8/src/app/java"/>
-    <classpathentry kind="src" path="Ensemble8/src/app/resources"/>
-    <classpathentry kind="src" path="Ensemble8/src/samples/java"/>
-    <classpathentry kind="src" path="Ensemble8/src/samples/resources"/>
-    <classpathentry kind="src" path="Ensemble8/src/compiletime/java"/>
-    <classpathentry kind="src" path="Ensemble8/src/generated/java"/>
-    <classpathentry kind="src" path="Ensemble8/src/generated/resources"/>
-    <classpathentry kind="lib" path="Ensemble8/lib/lucene-core-7.7.3.jar"/>
-    <classpathentry kind="lib" path="Ensemble8/lib/lucene-grouping-7.7.3.jar"/>
-    <classpathentry kind="lib" path="Ensemble8/lib/lucene-queryparser-7.7.3.jar"/>
-    <classpathentry kind="src" path="MandelbrotSet/src"/>
-    <classpathentry kind="src" path="Modena/src/main/java"/>
-    <classpathentry kind="src" path="Modena/src/main/resources"/>
-    <classpathentry combineaccessrules="false" kind="src" path="/rt">
-    <attributes>
-        <attribute name="optional" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="3DViewer/src/main/java"/>
+	<classpathentry kind="src" path="3DViewer/src/main/resources"/>
+	<classpathentry kind="src" path="Ensemble8/src/app/java"/>
+	<classpathentry kind="src" path="Ensemble8/src/app/resources"/>
+	<classpathentry kind="src" path="Ensemble8/src/samples/java"/>
+	<classpathentry kind="src" path="Ensemble8/src/samples/resources"/>
+	<classpathentry kind="src" path="Ensemble8/src/compiletime/java"/>
+	<classpathentry kind="src" path="Ensemble8/src/generated/java"/>
+	<classpathentry kind="src" path="Ensemble8/src/generated/resources"/>
+	<classpathentry kind="lib" path="Ensemble8/lib/lucene-core-7.7.3.jar"/>
+	<classpathentry kind="lib" path="Ensemble8/lib/lucene-grouping-7.7.3.jar"/>
+	<classpathentry kind="lib" path="Ensemble8/lib/lucene-queryparser-7.7.3.jar"/>
+	<classpathentry kind="src" path="MandelbrotSet/src"/>
+	<classpathentry kind="src" path="Modena/src/main/java"/>
+	<classpathentry kind="src" path="Modena/src/main/resources"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/web"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/media"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/base"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/controls"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/fxml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/swing"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/apps/samples/.settings/org.eclipse.core.resources.prefs b/apps/samples/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/...samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/TimelineController.java b/...samples/3DViewer/src/main/java/com/javafx/experiments/jfx3dviewer/TimelineController.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates.
  * All rights reserved. Use is subject to license terms.
  *
  * This file is available and licensed under the following license:
@@ -76,7 +76,7 @@ public class TimelineController {
                 endBtn.setDisable(false);
                 loopBtn.setDisable(false);
                 playBtn.setSelected(t.getCurrentRate() != 0);
-                loopBtn.setSelected(t.getCycleDuration().equals(Timeline.INDEFINITE));
+                loopBtn.setSelected(t.getCycleCount() == Timeline.INDEFINITE);
                 t.currentRateProperty().addListener(rateListener);
             }
             old = t;

diff --git a/apps/toys/.classpath b/apps/toys/.classpath
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="src" path="FX8-3DFeatures/src"/>
-    <classpathentry kind="src" path="Hello/src/main/java"/>
-    <classpathentry combineaccessrules="false" kind="src" path="/rt">
-    <attributes>
-        <attribute name="optional" value="true"/>
-        </attributes>
-    </classpathentry>
-    <classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="FX8-3DFeatures/src"/>
+	<classpathentry kind="src" path="Hello/src/main/java"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/web"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/controls"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/base"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/fxml"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/media"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/apps/toys/.settings/org.eclipse.core.resources.prefs b/apps/toys/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/apps/toys/ColorCube/.classpath b/apps/toys/ColorCube/.classpath
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/graphics">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/controls">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/base">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/swing">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/buildSrc/.project → apps/toys/ColorCube/.project b/buildSrc/.project → apps/toys/ColorCube/.project
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>buildSrc</name>
-	<comment></comment>
+	<name>ColorCube</name>
 	<projects>
 	</projects>
 	<buildSpec>

diff --git a/apps/toys/ColorCube/.settings/org.eclipse.core.resources.prefs b/apps/toys/ColorCube/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/build.gradle b/build.gradle
@@ -2489,6 +2489,17 @@ project(":graphics") {
         }
     }
 
+    task initShaderDirs() {
+        doLast {
+            // Create empty hlsl dirs on all platforms for IDE support
+            file("$project.buildDir/hlsl/Decora").mkdirs()
+            file("$project.buildDir/hlsl/Prism").mkdirs()
+            file("$project.buildDir/gensrc/jsl-prism").mkdirs()
+            file("$project.buildDir/gensrc/jsl-decora").mkdirs()
+        }
+    }
+    project.processShaders.dependsOn(initShaderDirs)
+
     nativePrism.dependsOn compilePrismHLSLShaders;
 
     project.nativeAllTask.dependsOn nativeDecora

diff --git a/build.properties b/build.properties
@@ -39,7 +39,7 @@
 jfx.release.suffix=-ea
 
 # UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
-jfx.release.major.version=19
+jfx.release.major.version=20
 jfx.release.minor.version=0
 jfx.release.security.version=0
 jfx.release.patch.version=0
@@ -56,8 +56,8 @@ jfx.release.patch.version=0
 
 javadoc.bottom=<small><a href="http://bugreport.java.com/bugreport/">Report a bug or suggest an enhancement</a><br> Copyright &copy; 2008, 2022, Oracle and/or its affiliates. All rights reserved.</small>
 
-javadoc.title=JavaFX 19
-javadoc.header=JavaFX&nbsp;19
+javadoc.title=JavaFX 20
+javadoc.header=JavaFX&nbsp;20
 
 ##############################################################################
 #

diff --git a/buildSrc/.classpath b/buildSrc/.classpath
diff --git a/modules/javafx.base/src/main/java/com/sun/javafx/collections/ObservableSetWrapper.java b/modules/javafx.base/src/main/java/com/sun/javafx/collections/ObservableSetWrapper.java
@@ -321,11 +321,11 @@ public boolean addAll(Collection<?extends E> c) {
     }
 
     /**
-     * Keeps only elements that are included the specified collection.
+     * Keeps only elements that are included in the specified collection.
      * All other elements are removed. For each removed element all the
      * observers are called.
      *
-     * @see java.util.Set in JDK API documentation
+     * @see java.util.Set
      * @param c collection containing elements to be kept in this set
      * @return true if this set changed as a result of the call
      */

diff --git a/modules/javafx.base/src/main/java/javafx/beans/binding/ObjectBinding.java b/modules/javafx.base/src/main/java/javafx/beans/binding/ObjectBinding.java
@@ -167,9 +167,8 @@ public final T get() {
     }
 
     /**
-     * The method onInvalidating() can be overridden by extending classes to
-     * react, if this binding becomes invalid. The default implementation is
-     * empty.
+     * Called when this binding becomes invalid. Can be overridden by extending classes to react to the invalidation.
+     * The default implementation is empty.
      */
     protected void onInvalidating() {
     }

diff --git a/modules/javafx.base/src/main/java/javafx/beans/property/Property.java b/modules/javafx.base/src/main/java/javafx/beans/property/Property.java
@@ -30,8 +30,7 @@
 
 /**
  * Generic interface that defines the methods common to all (writable)
- * properties independent of their type.
- *
+ * properties, independent of their type.
  *
  * @param <T>
  *            the type of the wrapped value
@@ -91,7 +90,7 @@ public interface Property<T> extends ReadOnlyProperty<T>, WritableValue<T> {
     void bindBidirectional(Property<T> other);
 
     /**
-     * Remove a bidirectional binding between this {@code Property} and another
+     * Removes a bidirectional binding between this {@code Property} and another
      * one.
      *
      * If no bidirectional binding between the properties exists, calling this
@@ -100,7 +99,7 @@ public interface Property<T> extends ReadOnlyProperty<T>, WritableValue<T> {
      * It is possible to unbind by a call on the second property. This code will work:
      *
      * <blockquote><pre>
-     *     property1.bindBirectional(property2);
+     *     property1.bindBicirectional(property2);
      *     property2.unbindBidirectional(property1);
      * </pre></blockquote>
      *

diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalBindingTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalBindingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -208,6 +208,7 @@ public void testHashCode() {
         assertEquals(hc1, hc2);
     }
 
+    @SuppressWarnings("unlikely-arg-type")
     @Test
     public void testEquals() {
         final BidirectionalBinding golden = BidirectionalBinding.bind(op1, op2);

diff --git a/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java b/modules/javafx.base/src/test/java/test/com/sun/javafx/runtime/VersionInfoTest.java
@@ -89,7 +89,7 @@ public void testMajorVersion() {
         String version = VersionInfo.getVersion();
         // Need to update major version number when we develop the next
         // major release.
-        assertTrue(version.startsWith("19"));
+        assertTrue(version.startsWith("20"));
         String runtimeVersion = VersionInfo.getRuntimeVersion();
         assertTrue(runtimeVersion.startsWith(version));
     }

diff --git a/modules/javafx.base/src/test/java/test/javafx/collections/ObservableSubListTest.java b/modules/javafx.base/src/test/java/test/javafx/collections/ObservableSubListTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -133,6 +133,7 @@ public void testClear() {
         mlo.check1AddRemove(list, Arrays.asList("b", "c", "d", "e"), 1, 1);
     }
 
+    @SuppressWarnings("unlikely-arg-type")
     @Test
     public void testContains() {
         assertTrue(sublist.contains("c"));
@@ -154,6 +155,7 @@ public void testContainsNull() {
         assertTrue(sublist.contains(null));
     }
 
+    @SuppressWarnings("unlikely-arg-type")
     @Test
     public void testEqualsOnAnotherType() {
         assertFalse(sublist.equals(Integer.valueOf(7)));

diff --git a/modules/javafx.controls/.classpath b/modules/javafx.controls/.classpath
@@ -31,7 +31,7 @@
 			<attribute name="add-exports" value="javafx.base/test.com.sun.javafx.binding=javafx.controls:javafx.base/test.util.memory=javafx.controls:javafx.base/test.javafx.collections=javafx.controls"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4">
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/5">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>

diff --git a/modules/javafx.controls/src/main/java/javafx/scene/control/TextFormatter.java b/modules/javafx.controls/src/main/java/javafx/scene/control/TextFormatter.java
@@ -37,17 +37,18 @@
  * A Formatter describes a format of a {@code TextInputControl} text by using two distinct mechanisms:
  * <ul>
  *     <li>A filter ({@link #getFilter()}) that can intercept and modify user input. This helps to keep the text
- *     in the desired format. A default text supplier can be used to provide the intial text.</li>
+ *     in the desired format. A default text supplier can be used to provide the initial text.</li>
  *     <li>A value converter ({@link #getValueConverter()}) and value ({@link #valueProperty()})
  *     can be used to provide special format that represents a value of type {@code V}.
- *     If the control is editable and the text is changed by the user, the value is then updated to correspond to the text.
+ *     If the control is editable and the text is changed by the user, the value is then updated to correspond to the
+ *     text.
  * </ul>
  * <p>
- * It's possible to have a formatter with just filter or value converter. If value converter is not provided however, setting a value will
- * result in an {@code IllegalStateException} and the value is always null.
+ * It's possible to have a formatter with just filter or value converter. If value converter is not provided however,
+ * setting a value will result in an {@code IllegalStateException} and the value is always {#code null}.
  * <p>
- * Since {@code Formatter} contains a value which represents the state of the {@code TextInputControl} to which it is currently assigned, a single
- * {@code Formatter} instance can be used only in one {@code TextInputControl} at a time.
+ * Since {@code Formatter} contains a value which represents the state of the {@code TextInputControl} to which it is
+ * currently assigned, a single {@code Formatter} instance can be used only in one {@code TextInputControl} at a time.
  *
  * @param <V> The type of the value
  * @since JavaFX 8u40
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		eclipse.preferences.version=1
		encoding/<project>=UTF-8