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 73383b6907ab0dd05956b9c4644703c5a76790e0 Merge: 01e0369fc4 a175b926cf Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Mar 31 17:29:19 2026 +0200 Merge of automatic reorganization of imports order. .../test/org/apache/sis/filter/ComparisonFilterTest.java | 3 ++- .../main/org/apache/sis/map/coverage/RenderingData.java | 2 +- .../main/org/apache/sis/storage/geotiff/DataSubset.java | 2 +- .../test/org/apache/sis/storage/geotiff/GeoTiffStoreTest.java | 4 ++-- .../main/org/apache/sis/storage/AbstractGridCoverageResource.java | 2 +- .../main/org/apache/sis/storage/tiling/TileMatrixSetFormat.java | 6 +++--- .../main/org/apache/sis/storage/tiling/TileReadEvent.java | 2 +- .../main/org/apache/sis/gui/coverage/StyleController.java | 2 +- .../main/org/apache/sis/storage/gdal/GDALStoreProvider.java | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --cc endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java index e09448da27,a20367131f..4ad0686178 --- a/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java +++ b/endorsed/src/org.apache.sis.feature/test/org/apache/sis/filter/ComparisonFilterTest.java @@@ -22,11 -24,15 +24,10 @@@ import static org.junit.jupiter.api.Ass import org.apache.sis.test.TestCase; import static org.apache.sis.test.Assertions.assertSerializedEquals; -// 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.Literal; -import org.opengis.filter.FilterFactory; -import org.opengis.filter.ComparisonOperator; -import org.opengis.filter.ComparisonOperatorName; -import org.opengis.filter.BinaryComparisonOperator; -import org.opengis.filter.BetweenComparisonOperator; +// Specific to the main branch: +import org.apache.sis.feature.AbstractFeature; - import org.apache.sis.filter.visitor.FunctionNames; +import org.apache.sis.pending.geoapi.filter.ComparisonOperatorName; +import org.apache.sis.pending.geoapi.filter.BetweenComparisonOperator; /**
