This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 6027cd3d711be5f54548b4c441eae42923c545d8 Merge: 03f1b25080 715d2bf6ff Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu May 16 19:13:43 2024 +0200 Merge branch 'geoapi-3.1' .../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/portrayal/Canvas.java | 6 ++++-- .../main/org/apache/sis/geometry/DirectPosition2D.java | 4 +++- .../main/org/apache/sis/geometry/Envelope2D.java | 4 +++- .../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 +++- .../main/org/apache/sis/referencing/internal/RTreeNode.java | 2 +- .../apache/sis/referencing/operation/TransformedCoordinateSet.java | 4 +++- .../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/referencing/Assertions.java | 2 +- .../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 | 4 +++- .../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 +++- 46 files changed, 111 insertions(+), 46 deletions(-) diff --cc endorsed/src/org.apache.sis.console/main/org/apache/sis/console/TransformCommand.java index bd7b447d36,7d8773423d..810cfc1c32 --- 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,9 -79,11 +79,12 @@@ 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; +// Specific to the main branch: +import org.apache.sis.referencing.DefaultObjectDomain; +import org.apache.sis.referencing.internal.Legacy; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BufferedGridCoverage.java index 8e8b14eca9,179aade90e..e5f3dbdb1b --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BufferedGridCoverage.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/BufferedGridCoverage.java @@@ -38,9 -37,10 +37,10 @@@ import org.apache.sis.util.resources.Er import org.apache.sis.util.collection.Cache; import org.apache.sis.image.DataType; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.CannotEvaluateException; -import org.opengis.coverage.PointOutsideCoverageException; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.coverage.CannotEvaluateException; +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java index eabaec842e,cf62d7a246..41eab72e6e --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/DimensionalityReduction.java @@@ -45,8 -44,9 +44,9 @@@ import org.apache.sis.referencing.opera import org.apache.sis.referencing.operation.transform.TransformSeparator; import org.apache.sis.referencing.operation.transform.PassThroughTransform; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.PointOutsideCoverageException; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java index 24d03e4e27,80e9c721b3..b5bbaff5a1 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/FractionalGridCoordinates.java @@@ -28,9 -27,10 +27,10 @@@ import org.apache.sis.util.StringBuilde import org.apache.sis.util.privy.Strings; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.PointOutsideCoverageException; -import org.opengis.coverage.grid.GridCoordinates; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java index a57d1f5cb5,5ea04a79e4..5a8692232c --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage.java @@@ -45,8 -44,9 +44,9 @@@ import org.apache.sis.util.collection.T import org.apache.sis.util.collection.TreeTable; import org.apache.sis.util.resources.Vocabulary; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.CannotEvaluateException; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.coverage.CannotEvaluateException; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java index b522072f0d,d4de192ee5..f51715231a --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridCoverage2D.java @@@ -56,9 -55,10 +55,10 @@@ import org.apache.sis.util.collection.T import org.apache.sis.util.resources.Vocabulary; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.CannotEvaluateException; -import org.opengis.coverage.PointOutsideCoverageException; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.coverage.CannotEvaluateException; +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java index bd4a23af4c,5eb048d988..768202f057 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridExtent.java @@@ -68,9 -67,12 +67,10 @@@ import org.apache.sis.util.iso.Types import org.apache.sis.util.logging.Logging; import org.apache.sis.system.Modules; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.CannotEvaluateException; -import org.opengis.coverage.PointOutsideCoverageException; -import org.opengis.coverage.grid.GridEnvelope; -import org.opengis.coverage.grid.GridCoordinates; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.coverage.CannotEvaluateException; +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java index f58c0b2fd1,38c4c7019d..47f48cbfe1 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/grid/GridGeometry.java @@@ -85,6 -84,9 +84,9 @@@ import org.apache.sis.xml.NilObject import org.apache.sis.xml.NilReason; import static org.apache.sis.referencing.CRS.findOperation; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Valid extent of grid coordinates together with the transform from those grid coordinates diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/CommonDomainFinder.java index bc7e23ebe4,97e50fb4d9..c50d34acc8 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/CommonDomainFinder.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/coverage/privy/CommonDomainFinder.java @@@ -37,6 -36,9 +36,9 @@@ import org.apache.sis.feature.internal. import org.apache.sis.util.Numbers; import org.apache.sis.util.privy.Numerics; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Helper class for building a combined domain from a list of grid geometries. diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryConverter.java index 8b80384473,fbdff72b61..9ef6b01901 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryConverter.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/internal/GeometryConverter.java @@@ -32,8 -31,10 +31,9 @@@ import org.apache.sis.geometry.wrapper. import org.apache.sis.geometry.wrapper.GeometryWrapper; import org.apache.sis.filter.Optimization; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.filter.Expression; -import org.opengis.filter.InvalidFilterValueException; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.filter.Expression; /** diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java index 7f309e14d9,04429ce828..8848e27fa4 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/GridCoverage2DTest.java @@@ -45,8 -44,10 +44,9 @@@ import org.apache.sis.referencing.crs.H import static org.apache.sis.test.Assertions.assertMessageContains; import static org.apache.sis.feature.Assertions.assertPixelsEqual; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.PointOutsideCoverageException; -import static org.opengis.test.Assertions.assertSampleValuesEqual; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/JTSTest.java index 0aaff39f9f,6c488a1238..c9bce935e6 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/JTSTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/geometry/wrapper/jts/JTSTest.java @@@ -37,6 -36,9 +36,9 @@@ import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.*; import org.apache.sis.test.TestCase; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Tests {@link JTS} implementation. diff --cc endorsed/src/org.apache.sis.portrayal/main/org/apache/sis/portrayal/Canvas.java index 24bde4eb5d,7dd5650a1f..e5970cfd7d --- 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,9 -56,12 +56,12 @@@ import org.apache.sis.coverage.grid.Inc import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridExtent; - // Specific to the main branch: + // 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 main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.coverage.CannotEvaluateException; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/DirectPosition2D.java index 9033f1b811,b8f692a131..93c57c120c --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/DirectPosition2D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/DirectPosition2D.java @@@ -27,6 -26,9 +26,9 @@@ import org.apache.sis.util.ArraysExt import org.apache.sis.util.resources.Errors; import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * A two-dimensional position on top of Java2D point. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java index ad00bc1f73,e676c4ecb1..f1596226fd --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/Envelope2D.java @@@ -41,6 -40,10 +40,9 @@@ import static org.apache.sis.geometry.A import static org.apache.sis.geometry.AbstractEnvelope.isWrapAround; import static org.apache.sis.geometry.AbstractEnvelope.isNegativeUnsafe; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coordinate.MismatchedCoordinateMetadataException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * A two-dimensional envelope on top of Java2D rectangle. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/parameter/ParameterTableRow.java index d4d929128d,a98e17d96b..8cacca37c3 --- 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,9 -45,9 +45,12 @@@ 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; + +// Specific to the main branch: +import org.opengis.referencing.ReferenceIdentifier; + /** * 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 1dce136985,2e03edc7db..1edcd58c06 --- 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 @@@ -44,10 -43,11 +43,11 @@@ import org.apache.sis.util.ComparisonMo 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; +// Specific to the main branch: +import org.opengis.referencing.ReferenceIdentifier; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java index d49e8518b6,fb1ab0c6d3..19f8409a1e --- 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 @@@ -48,6 -47,9 +47,9 @@@ import org.apache.sis.util.resources.Er // 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 main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * 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/DefaultDerivedCRS.java index d7390110f7,189405174f..7551b8a41f --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultDerivedCRS.java @@@ -60,9 -59,12 +59,10 @@@ import org.apache.sis.io.wkt.Formatter import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.collection.Containers; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.referencing.datum.DatumEnsemble; -import org.opengis.referencing.datum.ParametricDatum; -import org.opengis.referencing.crs.ParametricCRS; -import org.opengis.referencing.cs.ParametricCS; -import org.opengis.coordinate.MismatchedDimensionException; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import org.apache.sis.referencing.cs.DefaultParametricCS; +import org.apache.sis.referencing.datum.DefaultParametricDatum; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java index 8f886f7d28,df474db879..c0946ffa8e --- 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 @@@ -45,6 -44,9 +44,9 @@@ import org.apache.sis.util.Workaround 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; ++// Specific to the main branch: ++import org.opengis.geometry.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/internal/PositionTransformer.java index 8b66a6eea0,5604b1889c..af0bbe82bb --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/PositionTransformer.java @@@ -31,6 -30,9 +30,9 @@@ import org.apache.sis.referencing.opera import org.apache.sis.geometry.GeneralDirectPosition; import org.apache.sis.util.Utilities; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * A direct position capable to {@linkplain #transform transform} another position from its arbitrary CRS to diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/TransformedCoordinateSet.java index e4d8347df7,e51b2228f8..68ff144099 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/TransformedCoordinateSet.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/TransformedCoordinateSet.java @@@ -34,6 -33,11 +33,9 @@@ import org.apache.sis.util.collection.B import org.apache.sis.coordinate.DefaultCoordinateMetadata; import org.apache.sis.coordinate.AbstractCoordinateSet; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coordinate.CoordinateSet; -import org.opengis.coordinate.CoordinateMetadata; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * The result of transforming coordinate tuples using the math transform of a given coordinate operation. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java index 17feb8d042,84584194eb..1a5a128d82 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java @@@ -63,6 -62,9 +62,9 @@@ import org.apache.sis.util.privy.String import org.apache.sis.util.resources.Vocabulary; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Creates an affine transform which will map approximately the given source positions to the given target positions. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java index 33bed8a709,7e139648cf..5bdce7780c --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/builder/LocalizationGridBuilder.java @@@ -52,6 -51,9 +51,9 @@@ import org.apache.sis.math.StatisticsFo import org.apache.sis.math.Vector; import static org.apache.sis.referencing.operation.builder.ResidualGrid.SOURCE_DIMENSION; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Creates an "almost linear" transform mapping the given source points to the given target points. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java index bc30866ab5,f058efe7bf..712fac37dd --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/Matrices.java @@@ -41,6 -40,9 +40,9 @@@ import org.apache.sis.referencing.inter import org.apache.sis.referencing.internal.Arithmetic; import org.apache.sis.referencing.operation.transform.MathTransforms; // For javadoc -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * {@link Matrix} factory methods and utilities. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java index cd2e2d9d87,7c2775be18..ae4b6a9083 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/matrix/MismatchedMatrixSizeException.java @@@ -16,7 -16,8 +16,8 @@@ */ package org.apache.sis.referencing.operation.matrix; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: +import org.opengis.geometry.MismatchedDimensionException; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java index 2849fc7d94,f755ea0d31..855e6cebe7 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java @@@ -51,6 -50,9 +50,9 @@@ import org.apache.sis.util.LenientCompa import org.apache.sis.util.resources.Errors; import org.apache.sis.util.logging.Logging; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Provides a default implementation for most methods required by the {@link MathTransform} interface. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform1D.java index c8af715057,8b083019b4..4551bcdfb2 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform1D.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/AbstractMathTransform1D.java @@@ -25,6 -24,9 +24,9 @@@ import org.opengis.referencing.operatio import org.apache.sis.referencing.operation.matrix.Matrix1; import static org.apache.sis.util.ArgumentChecks.ensureDimensionMatches; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Base class for math transforms that are known to be one-dimensional in all cases. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java index 6b2faf88f2,ec41fceea5..27d7a3d084 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransforms.java @@@ -44,6 -43,9 +43,9 @@@ import org.apache.sis.util.ArraysExt import org.apache.sis.util.Static; import org.apache.sis.util.privy.DoubleDouble; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Utility methods creating or working on {@link MathTransform} instances. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java index 6dce64a115,8fedcff370..93c3736642 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/PassThroughTransform.java @@@ -41,6 -40,9 +40,9 @@@ import org.apache.sis.geometry.GeneralD import org.apache.sis.io.wkt.Formatter; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Transform which passes through a subset of coordinates to another transform. diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java index 2525e3e4c8,6866fb0fa5..dc8e1d035a --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/MathTransformWrapper.java @@@ -29,6 -28,9 +28,9 @@@ import org.apache.sis.io.wkt.Formatter import org.apache.sis.io.wkt.FormattableObject; import org.apache.sis.io.wkt.UnformattableObjectException; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * The base class of math transform wrappers. This can be used as an opaque object for hiding the fact diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformResultComparator.java index 34b567f6a6,c7e56545b8..845f21013f --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformResultComparator.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/TransformResultComparator.java @@@ -29,8 -28,9 +28,9 @@@ import org.opengis.referencing.operatio // Test dependencies import static org.junit.jupiter.api.Assertions.*; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import static org.opengis.test.Assertions.assertMatrixEquals; +// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; +import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridCoverage.java index 511cdce4dc,522f2f3e38..968bb22b7e --- 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,8 -47,11 +47,11 @@@ 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; +// Specific to the main branch: +import org.apache.sis.coverage.CannotEvaluateException; /** diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java index f4cbf9b9cd,0b1c196888..51246bac37 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Line.java @@@ -27,6 -26,9 +26,9 @@@ import org.apache.sis.util.privy.Numeri import org.apache.sis.util.privy.Strings; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Equation of a line in a two dimensional space (<var>x</var>,<var>y</var>). diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java index 4b994c6937,dedfb852c8..aa1ee48607 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/math/Plane.java @@@ -31,6 -30,9 +30,9 @@@ import org.apache.sis.util.privy.Numeri import org.apache.sis.util.privy.Strings; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Equation of a plane in a three-dimensional space (<var>x</var>,<var>y</var>,<var>z</var>). diff --cc endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java index 70194cb2d5,391a52b982..42b3731c66 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/ArgumentChecks.java @@@ -27,7 -27,10 +27,9 @@@ import org.opengis.geometry.DirectPosit import org.apache.sis.util.privy.Strings; import org.apache.sis.util.resources.Errors; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; -import org.opengis.coverage.grid.GridEnvelope; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * Static methods for performing argument checks. diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java index 72375715dc,7034a2fe80..fb76a9ed3b --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/MapCanvas.java @@@ -92,6 -91,9 +91,9 @@@ import org.apache.sis.portrayal.Transfo import static org.apache.sis.gui.internal.LogHandler.LOGGER; import static org.apache.sis.util.privy.StandardDateFormat.NANOS_PER_MILLISECOND; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * A canvas for maps to be rendered on screen in a JavaFX application. diff --cc optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java index ce31075f07,f1f113766a..82f17d9c47 --- a/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java +++ b/optional/src/org.apache.sis.gui/main/org/apache/sis/gui/map/StatusBar.java @@@ -100,6 -99,9 +99,9 @@@ import org.apache.sis.gui.internal.Styl import org.apache.sis.referencing.gazetteer.ReferencingByIdentifiers; import static org.apache.sis.gui.internal.LogHandler.LOGGER; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; ++// Specific to the main branch: ++import org.opengis.geometry.MismatchedDimensionException; + /** * A status bar showing geographic or projected coordinates under mouse cursor.
