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 8fd4428d3b6d58540aef106c29e5b19c9a1b5d32 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Aug 6 12:25:15 2022 +0200 Rename `GridEvaluator` as `DefaultEvaluator` as a consequence of the replacement of `GridEvaluator` by an interface. --- .../apache/sis/coverage/grid/BufferedGridCoverage.java | 2 +- .../grid/{GridEvaluator.java => DefaultEvaluator.java} | 16 +++++++++------- .../java/org/apache/sis/coverage/grid/GridCoverage.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage2D.java | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java index ec53dc5663..1be0b6faa6 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java +++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/BufferedGridCoverage.java @@ -289,7 +289,7 @@ public class BufferedGridCoverage extends GridCoverage { /** * Implementation of evaluator returned by {@link #evaluator()}. */ - private static class CellAccessor extends GridEvaluator { + private static final class CellAccessor extends DefaultEvaluator { /** * A copy of {@link BufferedGridCoverage#data} reference. */ diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridEvaluator.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java similarity index 99% rename from core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridEvaluator.java rename to core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java index 85014e7280..aede5d3ed7 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridEvaluator.java +++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/DefaultEvaluator.java @@ -31,8 +31,6 @@ import org.opengis.referencing.operation.TransformException; import org.opengis.referencing.operation.CoordinateOperation; import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.operation.NoninvertibleTransformException; -import org.opengis.coverage.CannotEvaluateException; -import org.opengis.coverage.PointOutsideCoverageException; import org.apache.sis.coverage.SampleDimension; import org.apache.sis.internal.feature.Resources; import org.apache.sis.internal.util.CollectionsExt; @@ -51,13 +49,17 @@ import org.apache.sis.util.logging.Logging; import static java.util.logging.Logger.getLogger; +// Branch-dependent imports +import org.opengis.coverage.CannotEvaluateException; +import org.opengis.coverage.PointOutsideCoverageException; + /** * Default implementation of {@link GridCoverage.Evaluator} for interpolating values at given positions. * Values are computed by calls to {@link #apply(DirectPosition)} and are returned as {@code double[]}. * * <h2>Multi-threading</h2> - * Evaluators are not thread-safe. An instance of {@code GridEvaluator} should be created + * Evaluators are not thread-safe. An instance of {@code DefaultEvaluator} should be created * for each thread that need to compute sample values. * * <h2>Limitations</h2> @@ -72,7 +74,7 @@ import static java.util.logging.Logger.getLogger; * @since 1.1 * @module */ -class GridEvaluator implements GridCoverage.Evaluator { +class DefaultEvaluator implements GridCoverage.Evaluator { /** * The coverage in which to evaluate sample values. */ @@ -156,14 +158,14 @@ class GridEvaluator implements GridCoverage.Evaluator { /** * Creates a new evaluator for the given coverage. This constructor is protected for allowing - * {@link GridCoverage} subclasses to provide their own {@code GridEvaluator} implementations. + * {@link GridCoverage} subclasses to provide their own {@code DefaultEvaluator} implementations. * For using an evaluator, invoke {@link GridCoverage#evaluator()} instead. * * @param coverage the coverage for which to create an evaluator. * * @see GridCoverage#evaluator() */ - protected GridEvaluator(final GridCoverage coverage) { + protected DefaultEvaluator(final GridCoverage coverage) { ArgumentChecks.ensureNonNull("coverage", coverage); this.coverage = coverage; } @@ -652,6 +654,6 @@ class GridEvaluator implements GridCoverage.Evaluator { * @param exception the exception that occurred. */ private static void recoverableException(final String caller, final TransformException exception) { - Logging.recoverableException(getLogger(Modules.RASTER), GridEvaluator.class, caller, exception); + Logging.recoverableException(getLogger(Modules.RASTER), DefaultEvaluator.class, caller, exception); } } diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java index f6de832713..1feabdbf5c 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java +++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage.java @@ -313,7 +313,7 @@ public abstract class GridCoverage extends BandedCoverage { */ @Override public Evaluator evaluator() { - return new GridEvaluator(this); + return new DefaultEvaluator(this); } /** diff --git a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java index 82e2e81127..c5d9337fa3 100644 --- a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java +++ b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridCoverage2D.java @@ -515,7 +515,7 @@ public class GridCoverage2D extends GridCoverage { /** * Implementation of evaluator returned by {@link #evaluator()}. */ - private final class PixelAccessor extends GridEvaluator { + private final class PixelAccessor extends DefaultEvaluator { /** * Creates a new evaluator for the enclosing coverage. */
