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 871fa337446d8c50bab67de92fe9bcb83a4c03c4 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Jan 21 22:49:34 2020 +0100 Minor documentation fixes and interrupt loading when the FeatureSet is discarded. --- .../src/main/java/org/apache/sis/gui/dataset/FeatureList.java | 4 ++-- .../src/main/java/org/apache/sis/gui/dataset/FeatureTable.java | 4 +++- 2 files changed, 5 insertions(+), 3 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 256a01f..ab8b9cc 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 @@ -42,10 +42,10 @@ import org.apache.sis.util.ArraysExt; * <p>This list does not accept null elements; any attempt to add a null feature is silently ignored. * The null value is reserved for meaning that the element is in process of being loaded.</p> * - * <p>All methods in this class shall be invoked from JavaFX thread.</p> + * <p>All methods in this class shall be invoked from JavaFX thread only.</p> * * @todo Current implementation does not release previously loaded features. - * We could do that in a previous version if memory usage is a problem, + * We could do that in a future version if memory usage is a problem, * provided that {@link Spliterator#ORDERED} is set. * * @author Martin Desruisseaux (Geomatys) diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java index 044c3a6..9902559 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureTable.java @@ -59,7 +59,8 @@ import org.apache.sis.internal.gui.ExceptionReporter; * * <h2>Limitations</h2> * <ul> - * <li>The {@link #itemsProperty() itemsProperty} should be considered read-only. + * <li>The {@link #itemsProperty() itemsProperty} should be considered read-only, + * and {@link #setItems(ObservableList)} should never be invoked explicitly. * For changing content, use the {@link #featuresProperty} instead.</li> * <li>The list returned by {@link #getItems()} should be considered read-only.</li> * </ul> @@ -223,6 +224,7 @@ public class FeatureTable extends TableView<Feature> { setItems(items); } else { items = getFeatureList(); + items.interrupt(); } if (!items.startFeaturesLoading(this, features)) { featureType = null;
