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 202cc77abb844b163fe6a96d20b8d19c376e98cb Merge: cae1934156 7f9cbaea89 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Nov 7 19:02:13 2026 +0100 Merge of automatic reorganization of imports order. .../xml/bind/metadata/replace/ReferenceSystemMetadata.java | 2 +- .../sis/style/se1/function/AbstractLookupFunction.java | 2 -- .../main/org/apache/sis/style/se1/function/Categorize.java | 2 -- .../main/org/apache/sis/style/se1/function/ChangeCase.java | 2 -- .../main/org/apache/sis/style/se1/function/Concatenate.java | 2 -- .../main/org/apache/sis/style/se1/function/FormatDate.java | 2 -- .../main/org/apache/sis/style/se1/function/FormatNumber.java | 2 -- .../main/org/apache/sis/style/se1/function/Interpolate.java | 2 -- .../main/org/apache/sis/style/se1/function/Recode.java | 2 -- .../main/org/apache/sis/style/se1/function/StringLength.java | 2 -- .../org/apache/sis/style/se1/function/StringPosition.java | 2 -- .../main/org/apache/sis/style/se1/function/Substring.java | 2 -- .../org/apache/sis/style/se1/function/SymbologyFunction.java | 6 ++---- .../apache/sis/style/se1/function/SymbologyFunctions.java | 6 ++---- .../main/org/apache/sis/style/se1/function/Trim.java | 2 -- .../test/org/apache/sis/style/se1/ColorMapTest.java | 8 +++++--- .../test/org/apache/sis/style/se1/ColorReplacementTest.java | 9 +++++---- .../org/apache/sis/style/se1/function/CategorizeTest.java | 12 +++++------- .../sis/style/se1/function/FormattingFunctionsTest.java | 10 ++++------ .../org/apache/sis/style/se1/function/InterpolateTest.java | 12 +++++------- .../test/org/apache/sis/style/se1/function/RecodeTest.java | 10 ++++------ .../apache/sis/referencing/EllipsoidalHeightSeparator.java | 4 +--- .../internal/shared/EllipsoidalHeightCombiner.java | 6 +++--- .../operation/CoordinateOperationRegistryTest.java | 2 +- .../main/org/apache/sis/geometries/GeometryCollection.java | 1 + .../geometries/internal/shared/DefaultOffsetLineString.java | 6 +++--- .../org/apache/sis/geometries/internal/shared/Vertex.java | 3 ++- .../main/org/apache/sis/geometries/mesh/MeshPrimitive.java | 2 +- .../apache/sis/geometries/operation/GeometryProcessor.java | 2 +- .../main/org/apache/sis/maths/Sample.java | 1 + .../main/org/apache/sis/maths/Vector1D.java | 1 + .../main/org/apache/sis/maths/VectorAsDirectPosition.java | 1 + .../operation/triangulate/delaunay/OrientedEdgeTest.java | 2 +- .../storage/dggs/DiscreteGlobalGridCoverageProcessor.java | 2 +- .../main/org/apache/sis/storage/rs/CodedDerivation.java | 2 +- .../storage/rs/internal/shared/CompoundCodedResource.java | 6 +++--- 36 files changed, 55 insertions(+), 85 deletions(-) diff --cc endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java index b0278024e6,3dd30b68f2..ad01ad26f5 --- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java +++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/bind/metadata/replace/ReferenceSystemMetadata.java @@@ -29,10 -28,8 +28,11 @@@ import org.apache.sis.xml.bind.FilterBy import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.Utilities; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.ReferenceIdentifier; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: + import java.util.Optional; import org.opengis.referencing.ReferenceSystemType; import org.apache.sis.util.collection.Containers; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java index ec1bfaaa8b,de23e9e09b..afbc363f8d --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java @@@ -28,7 -28,8 +28,8 @@@ import org.opengis.referencing.crs.Sing import org.opengis.referencing.crs.VerticalCRS; import org.opengis.referencing.crs.ProjectedCRS; import org.opengis.referencing.crs.GeodeticCRS; -import org.opengis.referencing.crs.GeographicCRS; import org.opengis.referencing.crs.EngineeringCRS; ++import org.opengis.referencing.crs.GeographicCRS; import org.opengis.referencing.datum.GeodeticDatum; import org.opengis.referencing.operation.Conversion; import org.apache.sis.referencing.internal.shared.AxisDirections; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/EllipsoidalHeightCombiner.java index 37c7de7a2f,a8ee20c8ee..2c513b2def --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/EllipsoidalHeightCombiner.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/EllipsoidalHeightCombiner.java @@@ -48,6 -48,6 +48,9 @@@ import org.apache.sis.util.logging.Logg import org.apache.sis.util.resources.Errors; import org.apache.sis.util.internal.shared.Constants; ++// Specific to the main and geoapi-3.1 branches: ++import org.opengis.referencing.crs.GeographicCRS; ++ // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.ObjectDomain;
