This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 4589e86bfb91c0f1801bbf51f02c72f14a2b6872 Merge: 90feafe896 c1f0c18816 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Jun 23 17:48:39 2026 +0200 Merge of automatic reorganization of imports order. .../main/org/apache/sis/coverage/grid/GridGeometry.java | 2 +- .../test/org/apache/sis/coverage/CategoryListTest.java | 2 +- .../test/org/apache/sis/coverage/grid/GridGeometryTest.java | 6 ++++-- .../test/org/apache/sis/image/OverviewImageTest.java | 6 +++--- .../main/org/apache/sis/metadata/iso/citation/DefaultTelephone.java | 2 +- .../org/apache/sis/metadata/iso/distribution/DefaultFormat.java | 2 +- .../org/apache/sis/metadata/iso/distribution/DefaultMedium.java | 2 +- .../org/apache/sis/referencing/gazetteer/AbstractLocationType.java | 2 +- .../apache/sis/referencing/gazetteer/ReferencingByIdentifiers.java | 2 +- .../main/org/apache/sis/coordinate/DefaultCoordinateMetadata.java | 4 ++-- .../main/org/apache/sis/parameter/DefaultParameterDescriptor.java | 2 +- .../main/org/apache/sis/referencing/DefaultObjectDomain.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultCompoundCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultParametricCRS.java | 2 +- .../org/apache/sis/referencing/datum/DefaultParametricDatum.java | 2 +- .../main/org/apache/sis/referencing/legacy/DefaultImageDatum.java | 2 +- .../org/apache/sis/referencing/operation/DefiningConversion.java | 2 +- .../main/org/apache/sis/storage/OptionKey.java | 2 +- .../main/org/apache/sis/storage/image/WorldFileStore.java | 2 +- .../main/org/apache/sis/storage/tiling/ImageTileMatrix.java | 4 +++- .../main/org/apache/sis/geometries/Capsule.java | 2 +- .../main/org/apache/sis/geometries/Cylinder.java | 2 +- .../main/org/apache/sis/geometries/Frustrum.java | 3 ++- .../main/org/apache/sis/geometries/OrientedGeometry.java | 2 +- .../main/org/apache/sis/geometries/Plane.java | 2 +- .../org.apache.sis.geometry/main/org/apache/sis/geometries/Ray.java | 4 ++-- .../sis/geometries/internal/shared/AbstractOrientedGeometry.java | 2 +- .../main/org/apache/sis/geometries/math/EasingMethod.java | 1 + .../main/org/apache/sis/geometries/scene/physics/Collider.java | 1 + .../org/apache/sis/geometries/scene/physics/ColliderGeometry.java | 1 + .../org/apache/sis/geometries/scene/physics/CollisionFilter.java | 3 ++- .../main/org/apache/sis/geometries/scene/physics/Joint.java | 1 + .../main/org/apache/sis/geometries/scene/physics/Motion.java | 1 + .../org/apache/sis/geometries/scene/physics/PhysicalMaterial.java | 3 ++- .../main/org/apache/sis/geometries/scene/physics/Trigger.java | 1 + .../test/org/apache/sis/geometries/math/EasingMethodTest.java | 2 ++ .../main/org/apache/sis/storage/geoheif/CoverageBuilder.java | 4 ++-- .../main/org/apache/sis/storage/geoheif/ImageModel.java | 2 +- .../main/org/apache/sis/storage/gsf/GSFStoreProvider.java | 2 +- .../main/org/apache/sis/storage/shapefile/ShapefileStore.java | 4 ++-- .../test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java | 2 +- .../main/org/apache/sis/gui/dataset/PathAction.java | 2 +- .../main/org/apache/sis/gui/referencing/FilterByDatum.java | 2 +- 43 files changed, 58 insertions(+), 43 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java index 5506b95521,560e23321a..0801eab967 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/iso/distribution/DefaultMedium.java @@@ -33,10 -34,9 +34,9 @@@ import org.apache.sis.xml.bind.FilterBy import org.apache.sis.xml.bind.gco.GO_Real; import org.apache.sis.xml.bind.metadata.CI_Citation; import org.apache.sis.xml.bind.metadata.MD_Identifier; - import org.apache.sis.metadata.TitleProperty; -import org.apache.sis.xml.internal.shared.LegacyNamespaces; -import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; import org.apache.sis.metadata.internal.Dependencies; +import org.apache.sis.metadata.iso.legacy.LegacyPropertyAdapter; +import org.apache.sis.xml.internal.shared.LegacyNamespaces; import org.apache.sis.util.collection.Containers; import static org.apache.sis.metadata.internal.shared.ImplementationHelper.ensurePositive; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultImageDatum.java index 782194c540,e8568f24e3..4da148c5da --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultImageDatum.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/legacy/DefaultImageDatum.java @@@ -31,10 -30,6 +30,11 @@@ import org.apache.sis.metadata.internal import org.apache.sis.io.wkt.Formatter; import org.apache.sis.util.ComparisonMode; +// Specific to the main and geoapi-3.1 branches: ++import java.lang.reflect.Type; +import org.opengis.referencing.datum.PixelInCell; +import org.opengis.referencing.datum.ImageDatum; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.metadata.Identifier;
