You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2020/04/10 22:42:53 UTC
[sis] 01/02: Removed unecessary calls to
super.succeeded()/cancelled()/failed().
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 f938b540ab8d58b6ef42b2653fafe03e7a26321f
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Apr 10 20:31:57 2020 +0200
Removed unecessary calls to super.succeeded()/cancelled()/failed().
---
.../src/main/java/org/apache/sis/gui/coverage/CoverageView.java | 2 --
.../sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java | 3 ---
.../src/main/java/org/apache/sis/gui/coverage/ImageLoader.java | 2 --
.../src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java | 3 ---
.../src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java | 2 --
.../src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java | 2 --
.../src/main/java/org/apache/sis/gui/referencing/WKTPane.java | 3 ---
7 files changed, 17 deletions(-)
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageView.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageView.java
index 8857c60..2b9c06f 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageView.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/CoverageView.java
@@ -256,7 +256,6 @@ final class CoverageView extends MapCanvas {
/** Invoked in JavaFX thread on success. */
@Override protected void succeeded() {
- super.succeeded();
if (coverage.equals(getCoverage()) && Objects.equals(sliceExtent, getSliceExtent())) {
setImage(getValue(), coverage.getGridGeometry(), sliceExtent);
}
@@ -290,7 +289,6 @@ final class CoverageView extends MapCanvas {
/** Invoked in JavaFX thread on success. */
@Override protected void succeeded() {
- super.succeeded();
if (source.equals(getSourceData())) {
setImage(rangeType, getValue());
}
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java
index 2780296..664d87e 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/GridTile.java
@@ -161,7 +161,6 @@ final class GridTile {
* (if the image has changed) we ignore the result.
*/
@Override protected void succeeded() {
- super.succeeded();
clear();
if (view.getImage() == image) {
tile = getValue();
@@ -174,7 +173,6 @@ final class GridTile {
* if {@link GridView} is still showing the image for which we failed to load a tile.
*/
@Override protected void failed() {
- super.failed();
clear();
if (view.getImage() == image) {
error = new GridError(view, GridTile.this, getException());
@@ -188,7 +186,6 @@ final class GridTile {
* process, but we currently have no API for that.
*/
@Override protected void cancelled() {
- super.cancelled();
clear();
}
});
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageLoader.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageLoader.java
index b62b52d..7ea130c 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageLoader.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/coverage/ImageLoader.java
@@ -147,7 +147,6 @@ final class ImageLoader extends Task<RenderedImage> {
*/
@Override
protected void failed() {
- super.failed();
fireFinished(null);
final GridCoverageResource resource = request.resource;
if (resource instanceof StoreListeners) {
@@ -162,7 +161,6 @@ final class ImageLoader extends Task<RenderedImage> {
*/
@Override
protected void cancelled() {
- super.cancelled();
fireFinished(null);
}
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java
index 2165b3a..d829057 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureLoader.java
@@ -224,7 +224,6 @@ final class FeatureLoader extends Task<Boolean> implements Consumer<Feature> {
*/
@Override
protected void succeeded() {
- super.succeeded();
final FeatureList addTo = table.getFeatureList();
if (addTo.isCurrentLoader(this)) {
final boolean hasMore = getValue();
@@ -257,7 +256,6 @@ final class FeatureLoader extends Task<Boolean> implements Consumer<Feature> {
*/
@Override
protected void cancelled() {
- super.cancelled();
stop("cancelled");
}
@@ -266,7 +264,6 @@ final class FeatureLoader extends Task<Boolean> implements Consumer<Feature> {
*/
@Override
protected void failed() {
- super.failed();
stop("failed");
}
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java
index 920fcb5..c74a539 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/metadata/MetadataSummary.java
@@ -218,7 +218,6 @@ public class MetadataSummary {
/** Shows the result in JavaFX thread. */
@Override protected void succeeded() {
- super.succeeded();
setMetadata(getValue());
for (final MetadataTree view : nativeMetadataViews) {
view.setContent(nativeMetadata);
@@ -227,7 +226,6 @@ public class MetadataSummary {
/** Invoked in JavaFX thread if metadata loading failed. */
@Override protected void failed() {
- super.failed();
setError(getException());
}
}
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java
index 266da64..ac6f0bc 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/AuthorityCodes.java
@@ -401,7 +401,6 @@ final class AuthorityCodes extends ObservableListBase<Code>
@Override
@SuppressWarnings("unchecked")
protected void succeeded() {
- super.succeeded();
Object[] newCodes = null;
Map<Code,String> updated = null;
final Object result = getValue();
@@ -424,7 +423,6 @@ final class AuthorityCodes extends ObservableListBase<Code>
*/
@Override
protected void failed() {
- super.failed();
final Throwable e = getException();
if (error == null) {
final Code code = new Code(Vocabulary.getResources(locale).getString(Vocabulary.Keys.Errors));
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java
index c39051f..c09ebac 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/referencing/WKTPane.java
@@ -161,19 +161,16 @@ final class WKTPane extends StringConverter<Convention> implements ChangeListene
/** Invoked in JavaFX thread on success. */
@Override protected void succeeded() {
- super.succeeded();
setContent(getValue());
}
/** Invoked in JavaFX thread on cancellation. */
@Override protected void cancelled() {
- super.cancelled();
text.setText(null);
}
/** Invoked in JavaFX thread on failure. */
@Override protected void failed() {
- super.failed();
text.setDisable(false);
text.setEditable(false);
text.setText(Exceptions.getLocalizedMessage(getException(), source.locale));