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 f2c76983431999b190b8ff5a8a53c9e2b7fac812 Merge: f034daa245 e447260eea Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Jan 26 23:03:31 2026 +0100 Merge of automatic reorganization of imports order. .../main/org/apache/sis/filter/base/BinaryFunctionWidening.java | 4 +--- .../test/org/apache/sis/coverage/grid/DefaultEvaluatorTest.java | 2 +- .../main/org/apache/sis/metadata/PropertyAccessor.java | 2 +- .../main/org/apache/sis/xml/bind/lan/LocaleAndCharset.java | 4 ++-- .../main/org/apache/sis/xml/internal/shared/InputFactory.java | 4 ++-- .../main/org/apache/sis/geometry/ImmutableDirectPosition.java | 4 +++- .../main/org/apache/sis/parameter/MatrixParameters.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 2 +- .../apache/sis/referencing/factory/ConcurrentAuthorityFactory.java | 2 +- .../sis/referencing/operation/MissingSourceDimensionsException.java | 2 +- .../operation/matrix/UnderdeterminedMatrixException.java | 2 +- .../referencing/operation/transform/WraparoundTransformTest.java | 4 ++-- .../main/org/apache/sis/storage/netcdf/NetcdfStore.java | 4 ++-- .../main/org/apache/sis/storage/netcdf/base/GridMapping.java | 6 ++---- .../main/org/apache/sis/storage/FeatureSubset.java | 2 +- .../main/org/apache/sis/converter/SystemRegistry.java | 2 +- .../main/org/apache/sis/pending/jdk/ScopedValue.java | 1 + .../main/org/apache/sis/gui/coverage/CoverageCanvas.java | 2 +- 18 files changed, 25 insertions(+), 26 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/base/BinaryFunctionWidening.java index 035f9852c9,09150331b8..2b965b63c3 --- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/base/BinaryFunctionWidening.java +++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/base/BinaryFunctionWidening.java @@@ -28,11 -29,8 +29,8 @@@ import org.apache.sis.feature.internal. import org.apache.sis.feature.internal.shared.FeatureProjectionBuilder; import org.apache.sis.filter.Optimization; --// Specific to the geoapi-3.1 and geoapi-4.0 branches: - import org.opengis.util.ScopedName; - -import org.opengis.filter.Expression; +// Specific to the main branch: +import org.apache.sis.filter.Expression; /** diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DefaultEvaluatorTest.java index 4ec9c1f085,5c3fb02c2f..410b60b343 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DefaultEvaluatorTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/coverage/grid/DefaultEvaluatorTest.java @@@ -41,10 -42,9 +42,9 @@@ import org.apache.sis.test.TestCase import org.apache.sis.test.TestUtilities; import org.apache.sis.image.TiledImageMock; import org.apache.sis.referencing.crs.HardCodedCRS; - import org.junit.jupiter.api.TestInstance; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coverage.PointOutsideCoverageException; +// Specific to the main branch: +import org.apache.sis.coverage.PointOutsideCoverageException; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/ImmutableDirectPosition.java index fe5c1f9292,e7260f07c0..3e4c9ccd6a --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/ImmutableDirectPosition.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/geometry/ImmutableDirectPosition.java @@@ -25,6 -24,9 +24,9 @@@ import org.opengis.referencing.crs.Coor import org.apache.sis.util.ArgumentChecks; import org.apache.sis.util.ArraysExt; -// 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; + /** * An immutable {@code DirectPosition} (the coordinates of a position) of arbitrary dimension. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java index eb28070e2d,3c9eac8e41..0ab5c18752 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java @@@ -96,17 -97,15 +96,17 @@@ import org.apache.sis.util.Utilities import org.apache.sis.util.internal.shared.Constants; import org.apache.sis.util.resources.Errors; import org.apache.sis.util.logging.Logging; ++import org.apache.sis.coordinate.DefaultCoordinateMetadata; // 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.referencing.ObjectDomain; -import org.opengis.referencing.crs.DerivedCRS; -import org.opengis.referencing.datum.DynamicReferenceFrame; -import org.opengis.coordinate.CoordinateMetadata; +// Specific to the main branch: +import org.apache.sis.referencing.DefaultObjectDomain; +import org.apache.sis.referencing.crs.AbstractCRS; +import org.apache.sis.referencing.datum.DefaultGeodeticDatum; +import org.apache.sis.referencing.datum.DefaultVerticalDatum; - import org.apache.sis.coordinate.DefaultCoordinateMetadata; +import static org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble; /** diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java index b9671019fd,69861caf8f..e6d5edf0c5 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/transform/WraparoundTransformTest.java @@@ -31,11 -33,9 +33,9 @@@ import org.junit.jupiter.api.Test import static org.junit.jupiter.api.Assertions.*; import org.apache.sis.test.TestCase; import org.apache.sis.referencing.crs.HardCodedCRS; - import org.apache.sis.referencing.operation.matrix.Matrices; - import org.apache.sis.referencing.operation.matrix.MatrixSIS; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import static org.opengis.test.Assertions.assertMatrixEquals; +// Specific to the main branch: +import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals; /** diff --cc endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java index 24ec1325fd,253642a975..93de6bf0a8 --- a/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java +++ b/endorsed/src/org.apache.sis.storage.netcdf/main/org/apache/sis/storage/netcdf/base/GridMapping.java @@@ -57,8 -57,9 +57,9 @@@ import org.apache.sis.referencing.Ident import org.apache.sis.referencing.crs.AbstractCRS; import org.apache.sis.referencing.cs.AxesConvention; import org.apache.sis.referencing.cs.CoordinateSystems; -import org.apache.sis.referencing.datum.DatumOrEnsemble; import org.apache.sis.referencing.datum.BursaWolfParameters; import org.apache.sis.referencing.datum.DefaultGeodeticDatum; ++import org.apache.sis.referencing.datum.DatumOrEnsemble; import org.apache.sis.referencing.operation.matrix.Matrix3; import org.apache.sis.referencing.operation.matrix.Matrices; import org.apache.sis.referencing.operation.matrix.MatrixSIS; @@@ -87,9 -88,9 +88,6 @@@ import org.apache.sis.io.wkt.Warnings import org.apache.sis.math.NumberType; import org.apache.sis.measure.Units; - // Specific to the main branch: - import org.apache.sis.referencing.datum.DatumOrEnsemble; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.referencing.datum.DatumEnsemble; -- /** * Helper object for creating a {@link GridGeometry} instance defined by attributes on a variable. diff --cc endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureSubset.java index 53ebafc964,df9e4468e4..15fe4c7061 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureSubset.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/FeatureSubset.java @@@ -25,11 -25,11 +25,11 @@@ import org.apache.sis.storage.base.Meta import org.apache.sis.storage.base.StoreUtilities; import org.apache.sis.storage.internal.Resources; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; -import org.opengis.feature.FeatureType; -import org.opengis.filter.Filter; -import org.opengis.filter.SortBy; +// Specific to the main branch: ++import org.apache.sis.filter.Filter; +import org.apache.sis.feature.AbstractFeature; +import org.apache.sis.feature.DefaultFeatureType; - import org.apache.sis.filter.Filter; +import org.apache.sis.pending.geoapi.filter.SortBy; /**
