This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 715d2bf6ffc0303b65233ac30a3618c797db67e3 Merge: 3790759e64 9638dbbb64 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu May 16 19:06:44 2024 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1: imports reorganization. .../main/org/apache/sis/console/TransformCommand.java | 4 +++- .../main/org/apache/sis/coverage/grid/BufferedGridCoverage.java | 2 +- .../main/org/apache/sis/coverage/grid/DimensionalityReduction.java | 2 +- .../org/apache/sis/coverage/grid/FractionalGridCoordinates.java | 2 +- .../main/org/apache/sis/coverage/grid/GridCoverage.java | 2 +- .../main/org/apache/sis/coverage/grid/GridCoverage2D.java | 2 +- .../main/org/apache/sis/coverage/grid/GridExtent.java | 2 +- .../main/org/apache/sis/coverage/grid/GridGeometry.java | 4 +++- .../main/org/apache/sis/coverage/grid/ImageRenderer.java | 4 +++- .../main/org/apache/sis/coverage/privy/CommonDomainFinder.java | 4 +++- .../main/org/apache/sis/filter/internal/GeometryConverter.java | 2 +- .../main/org/apache/sis/geometry/wrapper/Geometries.java | 4 +++- .../test/org/apache/sis/coverage/grid/GridCoverage2DTest.java | 2 +- .../test/org/apache/sis/geometry/wrapper/jts/JTSTest.java | 4 +++- .../main/org/apache/sis/metadata/iso/extent/Extents.java | 2 +- .../main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java | 4 +++- .../main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java | 4 ++-- .../org/apache/sis/xml/bind/metadata/replace/QualityParameter.java | 2 +- .../main/org/apache/sis/portrayal/Canvas.java | 6 ++++-- .../main/org/apache/sis/geometry/DirectPosition2D.java | 4 +++- .../main/org/apache/sis/geometry/Envelope2D.java | 2 +- .../org/apache/sis/geometry/MismatchedReferenceSystemException.java | 1 + .../main/org/apache/sis/parameter/ParameterTableRow.java | 4 +++- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 4 +++- .../main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 4 +++- .../main/org/apache/sis/referencing/cs/AbstractCS.java | 4 +++- .../org/apache/sis/referencing/internal/PositionTransformer.java | 4 +++- .../apache/sis/referencing/operation/TransformedCoordinateSet.java | 2 +- .../sis/referencing/operation/builder/LinearTransformBuilder.java | 4 +++- .../sis/referencing/operation/builder/LocalizationGridBuilder.java | 4 +++- .../sis/referencing/operation/builder/ProjectedTransformTry.java | 4 +++- .../main/org/apache/sis/referencing/operation/matrix/Matrices.java | 4 +++- .../referencing/operation/matrix/MismatchedMatrixSizeException.java | 1 + .../sis/referencing/operation/transform/AbstractMathTransform.java | 4 +++- .../referencing/operation/transform/AbstractMathTransform1D.java | 4 +++- .../sis/referencing/operation/transform/ConcatenatedTransform.java | 4 +++- .../operation/transform/InterpolatedGeocentricTransform.java | 4 +++- .../apache/sis/referencing/operation/transform/MathTransforms.java | 4 +++- .../sis/referencing/operation/transform/PassThroughTransform.java | 4 +++- .../test/org/apache/sis/parameter/ParametersTest.java | 2 +- .../test/org/apache/sis/referencing/Assertions.java | 2 +- .../referencing/operation/transform/MathTransformFactoryMock.java | 4 +++- .../sis/referencing/operation/transform/MathTransformWrapper.java | 4 +++- .../referencing/operation/transform/TransformResultComparator.java | 2 +- .../main/org/apache/sis/storage/base/TiledGridCoverage.java | 4 +++- endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java | 4 +++- .../src/org.apache.sis.util/main/org/apache/sis/math/Plane.java | 4 +++- .../main/org/apache/sis/util/ArgumentChecks.java | 2 +- .../org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java | 4 +++- .../org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java | 4 +++- 52 files changed, 116 insertions(+), 52 deletions(-) diff --cc endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java index 19bcfbcb91,9b116648f9..7d8773423d --- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java +++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java @@@ -80,6 -79,6 +79,9 @@@ import org.apache.sis.util.resources.Vo import org.apache.sis.util.resources.Errors; import org.apache.sis.util.logging.Logging; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; ++ // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.ObjectDomain; diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java index 706c6487c2,569e9b3807..bce137d03d --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/ImageRenderer.java @@@ -61,6 -60,9 +60,9 @@@ import org.apache.sis.math.Vector import static org.apache.sis.image.PlanarImage.GRID_GEOMETRY_KEY; import static org.apache.sis.image.PlanarImage.SAMPLE_DIMENSIONS_KEY; -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; + /** * A builder for the rendered image to be returned by {@link GridCoverage#render(GridExtent)}. diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java index 6a411d8fe5,f8a4d2b039..a2289c715b --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java @@@ -38,6 -37,9 +37,9 @@@ import org.apache.sis.math.Vector import org.apache.sis.setup.GeometryLibrary; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Utility methods on geometric objects defined in libraries outside Apache SIS. diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java index 5ea5599744,e254073a31..c1b001cf51 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/simple/SimpleIdentifiedObject.java @@@ -29,10 -28,9 +28,13 @@@ import org.apache.sis.util.ComparisonMo import org.apache.sis.util.privy.Constants; import static org.apache.sis.util.collection.Containers.isNullOrEmpty; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; +import org.opengis.metadata.extent.Extent; + + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import java.util.Optional; + /** * A trivial implementation of {@link IdentifiedObject} containing only a primary name. diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java index f384436080,0000000000..0687530a3e mode 100644,000000..100644 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/pending/temporal/DefaultPeriodDuration.java @@@ -1,71 -1,0 +1,71 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sis.pending.temporal; + ++import java.io.Serializable; +import java.time.temporal.TemporalAmount; +import org.opengis.temporal.PeriodDuration; + +// Specific to the geoapi-3.1 branch: - import java.util.List; - import java.io.Serializable; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalUnit; ++import java.util.List; + + +/** + * Default implementation of GeoAPI period duration. This is a temporary class; + * GeoAPI temporal interfaces are expected to change a lot in a future revision. + * + * @author Martin Desruisseaux (Geomatys) + */ +@SuppressWarnings("serial") +public final class DefaultPeriodDuration implements PeriodDuration, Serializable { + /** + * The temporal object providing the duration value. + */ + public final TemporalAmount duration; + + /** + * Creates a new duration. + */ + public DefaultPeriodDuration(final TemporalAmount duration) { + this.duration = duration; + } + + @Override public List<TemporalUnit> getUnits() {return duration.getUnits();} + @Override public long get (TemporalUnit unit) {return duration.get(unit);} + @Override public Temporal addTo (Temporal temporal) {return duration.addTo(temporal);} + @Override public Temporal subtractFrom(Temporal temporal) {return duration.subtractFrom(temporal);} + + /** String representation. */ + @Override public String toString() { + return duration.toString(); + } + + /** Hash code value of the time position. */ + @Override public int hashCode() { + return duration.hashCode() ^ 879337943; + } + + /** Compares with given object for equality. */ + @Override public boolean equals(final Object obj) { + if (obj instanceof DefaultPeriodDuration) { + duration.equals(((DefaultPeriodDuration) obj).duration); + } + return false; + } +} diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java index 7ca4142369,498d50c486..9f929399a0 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/QualityParameter.java @@@ -34,10 -33,8 +33,11 @@@ import org.apache.sis.xml.bind.gco.GO_G import org.apache.sis.util.Classes; import org.apache.sis.util.iso.Names; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import java.util.Optional; import org.opengis.coverage.Coverage; import org.opengis.metadata.quality.Description; import org.opengis.metadata.quality.ValueStructure; diff --cc endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java index fc4961c748,01cd880dbb..7dd5650a1f --- a/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java +++ b/endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java @@@ -57,10 -56,13 +56,13 @@@ import org.apache.sis.coverage.grid.Inc import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridExtent; - // Specific to the geoapi-3.1 and geoapi-4.0 branches: ++// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.geometry.MismatchedReferenceSystemException; ++ + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import org.opengis.coordinate.MismatchedDimensionException; import org.opengis.coverage.CannotEvaluateException; -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedCoordinateMetadataException; - /** * Common abstraction for implementations that manage the display and user manipulation diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java index e8c12a6908,0000000000..5bfd193c2d mode 100644,000000..100644 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/MismatchedReferenceSystemException.java @@@ -1,66 -1,0 +1,67 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.sis.geometry; + ++// Specific to the geoapi-3.1 branch: +import org.opengis.coordinate.MismatchedCoordinateMetadataException; + + +/** + * Indicates that an object cannot be constructed because of a mismatch in the + * reference systems of components. + * + * @author Martin Desruisseaux (IRD) + * @since 0.3 + * @version 0.3 + * + * @deprecated Replaced by {@link MismatchedCoordinateMetadataException}. + */ +@Deprecated(since = "2.0") // Temporary version number until this branch is released. +public class MismatchedReferenceSystemException extends MismatchedCoordinateMetadataException { + /** + * Serial number for inter-operability with different versions. + */ + private static final long serialVersionUID = 6222334569692693273L; + + /** + * Creates an exception with no message. + */ + public MismatchedReferenceSystemException() { + super(); + } + + /** + * Creates an exception with the specified message. + * + * @param message The detail message. The detail message is saved for + * later retrieval by the {@link #getMessage()} method. + */ + public MismatchedReferenceSystemException(final String message) { + super(message); + } + + /** + * Creates an exception with the specified message and cause. + * + * @param message The detail message. The detail message is saved for + * later retrieval by the {@link #getMessage()} method. + * @param cause The cause. + */ + public MismatchedReferenceSystemException(final String message, final Throwable cause) { + super(message, cause); + } +} diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java index 583077a13e,24943bf64d..a98e17d96b --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java @@@ -46,6 -45,6 +45,9 @@@ import static org.apache.sis.util.privy import static org.apache.sis.util.CharSequences.spaces; import static org.apache.sis.util.privy.Constants.DEFAULT_SEPARATOR; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.util.InternationalString; ++ /** * A row in the table to be formatted by {@link ParameterFormat}. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java index 882d41b8a8,f556b0b6a0..2e03edc7db --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java @@@ -43,9 -42,6 +42,10 @@@ import org.apache.sis.util.Utilities import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.resources.Errors; +// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; +import org.opengis.referencing.crs.GeneralDerivedCRS; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.Identifier; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java index ad04f97985,cbc24308da..fb1ab0c6d3 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java @@@ -45,9 -44,12 +44,12 @@@ import org.apache.sis.util.ArgumentChec import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.resources.Errors; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeneralDerivedCRS; + + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import org.opengis.coordinate.MismatchedDimensionException; + -// Specific to the geoapi-4.0 branch: -import org.opengis.referencing.crs.DerivedCRS; - /** * A coordinate reference system that is defined by its coordinate conversion from another CRS. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java index f2af30476c,2ae36041d7..df474db879 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java @@@ -41,10 -40,9 +40,13 @@@ import org.apache.sis.util.ArgumentChec import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Workaround; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeographicCRS; +import org.opengis.referencing.operation.Projection; + + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import org.opengis.coordinate.MismatchedDimensionException; + /** * A 2-dimensional coordinate reference system used to approximate the shape of the earth on a planar surface. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java index 1625e20723,b336ebf4c6..3ef74dd297 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/cs/AbstractCS.java @@@ -55,6 -54,9 +54,9 @@@ import org.apache.sis.io.wkt.ElementKin import org.apache.sis.io.wkt.Formatter; import static org.apache.sis.util.ArgumentChecks.*; -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; + /** * The set of {@linkplain DefaultCoordinateSystemAxis coordinate system axes} that spans a given coordinate space. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ProjectedTransformTry.java index 1823ffa35e,7ead80c4f7..32e24be164 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ProjectedTransformTry.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/ProjectedTransformTry.java @@@ -34,6 -33,9 +33,9 @@@ import org.apache.sis.referencing.opera import org.apache.sis.referencing.operation.matrix.MatrixSIS; import org.apache.sis.referencing.operation.transform.MathTransforms; -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Information about an attempt to transform coordinates to some projection before to compute a linear approximation. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java index 259f16a79b,a4140e7023..a1e5b40cfe --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java @@@ -50,6 -49,9 +49,9 @@@ import org.apache.sis.io.wkt.Formattabl import org.apache.sis.util.logging.Logging; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Base class for concatenated transforms. Instances can be created by calls to the diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java index 32ea94359c,05f730a951..0f39a1e23a --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java @@@ -40,6 -39,9 +39,9 @@@ import org.apache.sis.referencing.datum import org.apache.sis.referencing.operation.matrix.Matrices; import org.apache.sis.referencing.internal.Resources; -// Specific to the geoapi-4.0 branch: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Transforms between two geographic CRS by performing geocentric translations interpolated from a grid file. diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java index 18d92697ec,e07cb502fc..121ec08b76 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/parameter/ParametersTest.java @@@ -38,10 -37,8 +37,11 @@@ import static org.apache.sis.test.Asser import org.apache.sis.test.TestCase; import org.apache.sis.test.TestUtilities; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import java.util.Optional; import org.opengis.parameter.ParameterDirection; import org.opengis.util.TypeName; diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java index 317b7e7ee3,ad7c940e84..522f2f3e38 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java @@@ -48,6 -47,6 +47,9 @@@ import org.apache.sis.util.collection.W import org.apache.sis.util.resources.Errors; import static org.apache.sis.pending.jdk.JDK18.ceilDiv; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.geometry.MismatchedDimensionException; ++ // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.coverage.CannotEvaluateException;
