This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push: new 58c30aad3d Post-merge automatic reorganization of imports order. 58c30aad3d is described below commit 58c30aad3d238f660f397d6b8fa58e6a46364ae4 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Wed Feb 26 19:05:27 2025 +0100 Post-merge automatic reorganization of imports order. --- .../test/org/apache/sis/metadata/PropertyAccessorTest.java | 2 +- .../main/org/apache/sis/storage/geotiff/CompressedSubset.java | 2 +- .../main/org/apache/sis/storage/geotiff/ImageFileDirectory.java | 2 +- .../main/org/apache/sis/storage/geotiff/Writer.java | 2 +- .../test/org/apache/sis/storage/geotiff/GeoTiffStoreTest.java | 2 +- .../test/org/apache/sis/storage/geotiff/WriterTest.java | 2 +- .../main/org/apache/sis/storage/base/TiledGridResource.java | 2 +- .../main/org/apache/sis/storage/base/URIDataStoreProvider.java | 2 +- .../main/org/apache/sis/storage/esri/RasterStore.java | 2 +- .../test/org/apache/sis/io/stream/HyperRectangleWriterTest.java | 2 +- .../main/org/apache/sis/storage/geoheif/GeoHeifStore.java | 2 +- .../main/org/apache/sis/storage/isobmff/MainBoxRegistry.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/GroupList.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/ItemProperties.java | 2 +- .../org/apache/sis/storage/isobmff/base/ItemPropertyContainer.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/Meta.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/Movie.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/OriginalFileType.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/Track.java | 2 +- .../main/org/apache/sis/storage/isobmff/base/UserData.java | 2 +- .../main/org/apache/sis/storage/gdal/Band.java | 4 +++- .../main/org/apache/sis/storage/gdal/TiledCoverage.java | 2 ++ 22 files changed, 25 insertions(+), 21 deletions(-) diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java index 74886f5a02..eb05661e58 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/PropertyAccessorTest.java @@ -39,7 +39,6 @@ import org.opengis.metadata.maintenance.MaintenanceInformation; import org.opengis.metadata.spatial.SpatialRepresentationType; import org.opengis.referencing.IdentifiedObject; import org.opengis.referencing.ReferenceSystem; -import org.opengis.referencing.ReferenceSystemType; import org.opengis.referencing.crs.GeodeticCRS; import org.opengis.referencing.crs.GeographicCRS; import org.opengis.referencing.datum.GeodeticDatum; @@ -66,6 +65,7 @@ import static org.apache.sis.metadata.Assertions.assertTitleEquals; // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.content.AttributeGroup; +import org.opengis.referencing.ReferenceSystemType; import org.opengis.referencing.ObjectDomain; import org.opengis.referencing.datum.DatumEnsemble; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java index d39bcde5c3..9c62813d72 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/CompressedSubset.java @@ -25,8 +25,8 @@ import static java.lang.Math.toIntExact; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.base.TiledGridResource; import org.apache.sis.storage.geotiff.inflater.Inflater; -import org.apache.sis.image.privy.RasterFactory; import org.apache.sis.image.DataType; +import org.apache.sis.image.privy.RasterFactory; /** diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java index 78404db9c5..aef0676913 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/ImageFileDirectory.java @@ -53,6 +53,7 @@ import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.coverage.SampleDimension; import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridExtent; +import org.apache.sis.image.DataType; import org.apache.sis.image.privy.ColorModelBuilder; import org.apache.sis.image.privy.ColorModelFactory; import org.apache.sis.image.privy.SampleModelBuilder; @@ -66,7 +67,6 @@ import org.apache.sis.util.privy.Strings; import org.apache.sis.metadata.iso.DefaultMetadata; import org.apache.sis.math.Vector; import org.apache.sis.measure.NumberRange; -import org.apache.sis.image.DataType; import org.apache.sis.pending.jdk.JDK18; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java index f14d7db097..c1e24151b0 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/main/org/apache/sis/storage/geotiff/Writer.java @@ -41,9 +41,9 @@ import org.opengis.metadata.Metadata; import org.opengis.metadata.citation.CitationDate; import org.opengis.referencing.operation.TransformException; import org.apache.sis.image.ImageProcessor; +import org.apache.sis.image.DataType; import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.IncompleteGridGeometryException; -import org.apache.sis.image.DataType; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreReferencingException; import org.apache.sis.storage.IncompatibleResourceException; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/GeoTiffStoreTest.java b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/GeoTiffStoreTest.java index feb90f7f13..7c0f6b7f1b 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/GeoTiffStoreTest.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/GeoTiffStoreTest.java @@ -30,9 +30,9 @@ import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.PixelInCell; import org.apache.sis.coverage.grid.GridCoverage; import org.apache.sis.coverage.grid.GridCoverageBuilder; +import org.apache.sis.referencing.CRS; import org.apache.sis.referencing.operation.transform.MathTransforms; import org.apache.sis.referencing.operation.matrix.Matrix4; -import org.apache.sis.referencing.CRS; // Test dependencies import org.junit.jupiter.api.Test; diff --git a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java index 025b5d96d0..ab44f35b7f 100644 --- a/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java +++ b/endorsed/src/org.apache.sis.storage.geotiff/test/org/apache/sis/storage/geotiff/WriterTest.java @@ -41,9 +41,9 @@ import org.apache.sis.storage.geotiff.base.Tags; import org.apache.sis.coverage.grid.GridExtent; import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridOrientation; +import org.apache.sis.image.DataType; import org.apache.sis.image.privy.ColorModelBuilder; import org.apache.sis.geometry.Envelope2D; -import org.apache.sis.image.DataType; // Test dependencies import org.junit.jupiter.api.Test; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java index 91a79fe5fe..104f9d1258 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/TiledGridResource.java @@ -38,9 +38,9 @@ import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridRoundingMode; import org.apache.sis.coverage.grid.PixelInCell; import org.apache.sis.coverage.privy.RangeArgument; +import org.apache.sis.image.DataType; import org.apache.sis.image.privy.ColorModelFactory; import org.apache.sis.image.privy.ImageUtilities; -import org.apache.sis.image.DataType; import org.apache.sis.storage.Resource; import org.apache.sis.storage.AbstractGridCoverageResource; import org.apache.sis.storage.DataStoreException; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStoreProvider.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStoreProvider.java index 50a3eb334d..c34d659644 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStoreProvider.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/base/URIDataStoreProvider.java @@ -22,9 +22,9 @@ import java.io.DataOutput; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.net.URI; import java.nio.Buffer; import java.nio.ByteOrder; +import java.net.URI; import java.nio.file.Path; import java.nio.file.OpenOption; import java.nio.file.StandardOpenOption; diff --git a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java index 6d7792ea5d..55e72027f2 100644 --- a/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java +++ b/endorsed/src/org.apache.sis.storage/main/org/apache/sis/storage/esri/RasterStore.java @@ -36,13 +36,13 @@ import org.apache.sis.coverage.SampleDimension; import org.apache.sis.coverage.grid.GridGeometry; import org.apache.sis.coverage.grid.GridCoverage2D; import org.apache.sis.image.PlanarImage; +import org.apache.sis.image.DataType; import org.apache.sis.storage.GridCoverageResource; import org.apache.sis.storage.DataStoreProvider; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.StorageConnector; import org.apache.sis.storage.base.PRJDataStore; import org.apache.sis.storage.base.MetadataBuilder; -import org.apache.sis.image.DataType; import org.apache.sis.image.privy.ColorModelFactory; import org.apache.sis.image.privy.ColorModelBuilder; import org.apache.sis.image.privy.ObservableImage; diff --git a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java index 5a01052ea7..fd74b68ba8 100644 --- a/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java +++ b/endorsed/src/org.apache.sis.storage/test/org/apache/sis/io/stream/HyperRectangleWriterTest.java @@ -20,12 +20,12 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.lang.reflect.Array; import java.util.Random; +import java.util.Arrays; import java.util.function.IntFunction; import java.util.function.ToDoubleFunction; import java.awt.image.Raster; import java.awt.image.BufferedImage; import java.awt.image.DataBufferByte; -import java.util.Arrays; // Test dependencies import org.junit.jupiter.api.Test; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java index 1bba479a9f..530ceb6218 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/geoheif/GeoHeifStore.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.geoheif; import java.net.URI; +import java.io.IOException; import java.nio.file.Path; import java.nio.file.StandardOpenOption; -import java.io.IOException; import java.util.Collection; import java.util.Optional; import java.util.logging.Level; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java index 37791679a4..e49e9bdf4a 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/MainBoxRegistry.java @@ -17,8 +17,8 @@ package org.apache.sis.storage.isobmff; import java.util.UUID; -import java.io.IOException; import java.util.ServiceLoader; +import java.io.IOException; import org.apache.sis.io.stream.ChannelDataInput; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.DataStoreContentException; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/GroupList.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/GroupList.java index 1544bd3ce0..632a867116 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/GroupList.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/GroupList.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.ContainerBox; -import org.apache.sis.storage.DataStoreException; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemProperties.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemProperties.java index 6bfcd2c8af..f2367e81c1 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemProperties.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemProperties.java @@ -20,10 +20,10 @@ import java.util.Map; import java.util.ArrayList; import java.util.BitSet; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.ContainerBox; -import org.apache.sis.storage.DataStoreException; import org.apache.sis.util.collection.TreeTable; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemPropertyContainer.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemPropertyContainer.java index 03bfb19517..f6565a2fa4 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemPropertyContainer.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/ItemPropertyContainer.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.ContainerBox; -import org.apache.sis.storage.DataStoreException; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java index 4c513ad852..fa1803abeb 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Meta.java @@ -17,10 +17,10 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Box; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.FullBox; -import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.base.MetadataBuilder; diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Movie.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Movie.java index 0c49c17821..31b75fc69a 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Movie.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Movie.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.ContainerBox; -import org.apache.sis.storage.DataStoreException; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/OriginalFileType.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/OriginalFileType.java index 846d391ed0..a870eaabae 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/OriginalFileType.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/OriginalFileType.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.ContainerBox; -import org.apache.sis.storage.DataStoreException; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Track.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Track.java index 37aa30c4c6..0b9ae6d7f6 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Track.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/Track.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.ContainerBox; -import org.apache.sis.storage.DataStoreException; /** diff --git a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/UserData.java b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/UserData.java index 929656f57d..4b9bc64e7e 100644 --- a/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/UserData.java +++ b/incubator/src/org.apache.sis.storage.geoheif/main/org/apache/sis/storage/isobmff/base/UserData.java @@ -17,9 +17,9 @@ package org.apache.sis.storage.isobmff.base; import java.io.IOException; +import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.isobmff.Reader; import org.apache.sis.storage.isobmff.ContainerBox; -import org.apache.sis.storage.DataStoreException; /** diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Band.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Band.java index 5bc58838ae..148ab5a00a 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Band.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/Band.java @@ -33,11 +33,13 @@ import org.opengis.referencing.operation.MathTransform1D; import org.apache.sis.referencing.operation.transform.MathTransforms; import org.apache.sis.storage.DataStoreException; import org.apache.sis.coverage.SampleDimension; -import org.apache.sis.image.privy.AssertionMessages; import org.apache.sis.image.privy.RasterFactory; import org.apache.sis.measure.NumberRange; import org.apache.sis.measure.Units; +// Test dependencies +import org.apache.sis.image.privy.AssertionMessages; + /** * Information about a single band in a <abbr>GDAL</abbr> raster. diff --git a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java index 3fa33fb638..bd6a8a2db4 100644 --- a/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java +++ b/optional/src/org.apache.sis.storage.gdal/main/org/apache/sis/storage/gdal/TiledCoverage.java @@ -27,6 +27,8 @@ import org.apache.sis.util.logging.Logging; import org.apache.sis.storage.DataStoreException; import org.apache.sis.storage.base.TiledGridCoverage; import org.apache.sis.storage.base.TiledGridResource; + +// Test dependencies import org.apache.sis.image.privy.AssertionMessages;