This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 9ce2bc304217beac87c79fcb80d80dab289b2c4d Merge: 91b3d93094 11d079adf9 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Oct 1 13:52:27 2026 +0200 Merge of automatic reorganization of imports order. .../test/org/apache/sis/metadata/xml/TestUsingFile.java | 2 +- .../test/org/apache/sis/xml/ReferenceResolverTest.java | 2 +- .../sis/referencing/operation/transform/MathTransformBuilder.java | 2 +- .../sis/referencing/operation/transform/InterpolatedTransformTest.java | 2 +- .../main/org/apache/sis/storage/internal/shared/AggregationEvent.java | 1 + .../main/org/apache/sis/storage/internal/shared/ContentEvent.java | 1 + .../org/apache/sis/storage/internal/shared/FeatureSetContentEvent.java | 1 + .../org/apache/sis/storage/internal/shared/FeatureSetModelEvent.java | 1 + .../main/org/apache/sis/storage/internal/shared/ModelEvent.java | 1 + .../main/org/apache/sis/storage/internal/shared/StorageEvent.java | 3 ++- .../org/apache/sis/storage/internal/shared/TilingContentEvent.java | 1 + .../main/org/apache/sis/storage/internal/shared/TilingModelEvent.java | 3 ++- .../org/apache/sis/storage/shapefile/ShapefileStoreEventsTest.java | 2 +- 13 files changed, 15 insertions(+), 7 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java index 4a6c4c844e,96a16c62c7..a4ff5c1945 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/MathTransformBuilder.java @@@ -31,12 -31,6 +31,12 @@@ import org.apache.sis.io.Authorization import org.apache.sis.util.Classes; import org.apache.sis.util.internal.shared.Strings; +// Specific to the main branch: ++import org.opengis.parameter.ParameterValueGroup; +import org.opengis.util.FactoryException; +import org.opengis.referencing.datum.Ellipsoid; +import org.opengis.referencing.cs.CoordinateSystem; - import org.opengis.parameter.ParameterValueGroup; + /** * Builder of a parameterized math transform using a method identified by a name or code. diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/internal/shared/FeatureSetContentEvent.java index 650edf2e3f,66ba916842..5703d22e6f --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/internal/shared/FeatureSetContentEvent.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/internal/shared/FeatureSetContentEvent.java @@@ -21,10 -21,12 +21,11 @@@ import org.apache.sis.filter.DefaultFil import org.apache.sis.storage.FeatureSet; import org.apache.sis.storage.Resource; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.Feature; -import org.opengis.filter.Filter; -import org.opengis.filter.ResourceId; +// Specific to the main branch: +import org.apache.sis.filter.Filter; +import org.apache.sis.feature.AbstractFeature; + /** * FeatureSet content event. * diff --cc incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/internal/shared/FeatureSetModelEvent.java index 19ee226d64,71af9d1e28..cb27f6afe8 --- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/internal/shared/FeatureSetModelEvent.java +++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/internal/shared/FeatureSetModelEvent.java @@@ -20,9 -20,10 +20,10 @@@ import org.apache.sis.storage.FeatureSe import org.apache.sis.storage.Resource; import static org.apache.sis.util.ArgumentChecks.*; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.feature.FeatureType; +// Specific to the main branch: +import org.apache.sis.feature.DefaultFeatureType; + /** * FeatureSet management event. * diff --cc incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreEventsTest.java index 3786b33727,4c0010f82c..d0bf98c9f6 --- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreEventsTest.java +++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreEventsTest.java @@@ -40,12 -40,13 +40,12 @@@ import static org.junit.jupiter.api.Ass import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -// 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.FilterFactory; -import org.opengis.filter.LogicalOperator; -import org.opengis.filter.ResourceId; +// 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.ResourceId; +import org.apache.sis.pending.geoapi.filter.LogicalOperator; /**
