This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit a175b926cf406f24c83ca073efe4935c6a72ee2d Merge: 76ac26bca2 19892f6617 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Mar 31 17:26:28 2026 +0200 Merge of automatic reorganization of imports order. .../main/org/apache/sis/filter/math/Predicate.java | 2 +- .../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 ++-- .../org/apache/sis/storage/AbstractGridCoverageResource.java | 2 +- .../org/apache/sis/storage/tiling/TileMatrixSetFormat.java | 6 +++--- .../main/org/apache/sis/storage/tiling/TileReadEvent.java | 2 +- .../main/org/apache/sis/geometries/BilinearGrid.java | 2 +- .../main/org/apache/sis/geometries/Geometries.java | 2 +- .../main/org/apache/sis/geometries/Sphere.java | 8 +++++--- .../main/org/apache/sis/geometries/math/AbstractAffine.java | 1 + .../main/org/apache/sis/geometries/math/AbstractMatrix.java | 1 + .../org/apache/sis/geometries/math/AbstractSimilarity.java | 1 + .../main/org/apache/sis/geometries/math/Affine.java | 1 + .../main/org/apache/sis/geometries/math/Affine1D.java | 1 + .../main/org/apache/sis/geometries/math/Affine3D.java | 1 + .../main/org/apache/sis/geometries/math/Affine4D.java | 1 + .../main/org/apache/sis/geometries/math/Affines.java | 1 + .../main/org/apache/sis/geometries/math/ArrayFactory.java | 1 + .../main/org/apache/sis/geometries/math/ArrayFactoryFFM.java | 2 +- .../main/org/apache/sis/geometries/math/ArrayFactoryJava.java | 2 +- .../main/org/apache/sis/geometries/math/Matrices.java | 1 + .../main/org/apache/sis/geometries/math/Matrix.java | 1 + .../main/org/apache/sis/geometries/math/Matrix2D.java | 2 +- .../main/org/apache/sis/geometries/math/Matrix3D.java | 1 + .../main/org/apache/sis/geometries/math/Matrix4D.java | 1 + .../main/org/apache/sis/geometries/math/MatrixND.java | 1 + .../main/org/apache/sis/geometries/math/Quaternion.java | 1 + .../main/org/apache/sis/geometries/math/ReadOnly.java | 3 ++- .../main/org/apache/sis/geometries/math/Similarity.java | 3 ++- .../main/org/apache/sis/geometries/math/Similarity3D.java | 1 + .../main/org/apache/sis/geometries/math/SimilarityND.java | 1 + .../main/org/apache/sis/geometries/math/Transform1D.java | 1 + .../main/org/apache/sis/geometries/scene/Animation.java | 1 + .../org/apache/sis/geometries/scene/AnimationSampler.java | 1 + .../main/org/apache/sis/geometries/scene/Camera.java | 1 + .../main/org/apache/sis/geometries/scene/Material.java | 1 + .../main/org/apache/sis/geometries/scene/Model.java | 5 +++-- .../main/org/apache/sis/geometries/scene/MorphTarget.java | 1 + .../main/org/apache/sis/geometries/scene/Sampler.java | 1 + .../main/org/apache/sis/geometries/scene/SceneNode.java | 11 ++++++----- .../main/org/apache/sis/geometries/scene/Skin.java | 1 + .../main/org/apache/sis/geometries/scene/Surface.java | 1 + .../main/org/apache/sis/geometries/scene/Texture.java | 1 + .../main/org/apache/sis/gui/coverage/StyleController.java | 2 +- .../main/org/apache/sis/storage/gdal/GDALStoreProvider.java | 2 +- 47 files changed, 64 insertions(+), 30 deletions(-) diff --cc incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java index 9b8faafe56,e747b844d9..d117c8b7f3 --- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java +++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java @@@ -25,10 -28,9 +28,9 @@@ import org.apache.sis.geometries.math.V import org.apache.sis.geometries.math.Vectors; import org.apache.sis.geometry.GeneralEnvelope; import org.apache.sis.util.ArgumentChecks; - import static org.opengis.annotation.Specification.ISO_19107; - import org.opengis.annotation.UML; - import org.opengis.geometry.DirectPosition; + -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; ++// Specific to the geoapi-3.1 branch: +import org.opengis.referencing.ReferenceIdentifier; /**
