[sis] 02/03: Update for compatibility with Java 19: fix an ambiguity with the new Future.State enumeration.

[desruisseaux]

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 09ed02f6314a46a9e904b3cceb56c602192eadcc
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Oct 13 16:14:28 2022 +0200

    Update for compatibility with Java 19: fix an ambiguity with the new 
Future.State enumeration.
---
 .../src/main/java/org/apache/sis/gui/dataset/FeatureList.java          | 3 ++-
 .../sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
index 99a45768bd..f3d57a34c3 100644
--- 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
+++ 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java
@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.Spliterator;
 import javafx.application.Platform;
 import javafx.collections.ObservableListBase;
+import javafx.concurrent.Worker;
 import org.opengis.feature.Feature;
 import org.apache.sis.storage.FeatureSet;
 import org.apache.sis.internal.gui.BackgroundThreads;
@@ -316,7 +317,7 @@ final class FeatureList extends ObservableListBase<Feature> 
{
             throw new IndexOutOfBoundsException(index);
         }
         final FeatureLoader loader = nextPageLoader;
-        if (loader != null && loader.getState() == FeatureLoader.State.READY) {
+        if (loader != null && loader.getState() == Worker.State.READY) {
             BackgroundThreads.execute(loader);
         }
         return null;
diff --git 
a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java 
b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
index 41dfe18c8d..05b8ee348f 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java
@@ -44,6 +44,7 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.beans.value.WritableValue;
 import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
 import javafx.event.EventHandler;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.ToggleGroup;
@@ -1334,7 +1335,7 @@ public abstract class MapCanvas extends PlanarCanvas {
         assert Platform.isFxApplicationThread();
         assert renderingInProgress == task : "Expected " + renderingInProgress 
+ " but was " + task;
         // Keep cursor unchanged if contents changed, because caller will 
invoke `repaint()` again.
-        if (!contentsChanged() || task.getState() != Task.State.SUCCEEDED) {
+        if (!contentsChanged() || task.getState() != Worker.State.SUCCEEDED) {
             restoreCursorAfterPaint();
         }
         renderingInProgress = null;