This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 33fed0ffeb220d51b3e12836dbfd67a583eea6f5 Merge: a60d84a9a3 202cc77abb Author: Martin Desruisseaux <[email protected]> AuthorDate: Sat Nov 7 19:04:38 2026 +0100 Merge of automatic reorganization of imports order. .../test/org/apache/sis/style/se1/ColorReplacementTest.java | 1 - .../main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java | 6 ++---- .../sis/referencing/internal/shared/EllipsoidalHeightCombiner.java | 4 +++- .../sis/referencing/operation/CoordinateOperationRegistryTest.java | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EllipsoidalHeightSeparator.java index d511d92388,afbc363f8d..48d1e9f51d --- 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 @@@ -39,14 -41,9 +40,11 @@@ import org.apache.sis.util.Utilities import org.apache.sis.util.resources.Errors; import org.apache.sis.referencing.factory.GeodeticObjectFactory; import static org.apache.sis.referencing.internal.shared.ReferencingUtilities.getPropertiesForModifiedCRS; - - // Specific to the main and geoapi-3.1 branches: - import org.opengis.referencing.crs.GeographicCRS; ++import org.apache.sis.referencing.datum.DatumOrEnsemble; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.referencing.datum.DatumEnsemble; +// Specific to the main branch: - import org.apache.sis.referencing.datum.DatumOrEnsemble; +import org.apache.sis.referencing.datum.DefaultDatumEnsemble; +import static org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/internal/shared/EllipsoidalHeightCombiner.java index 3133460464,2c513b2def..491ab286d9 --- 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 @@@ -49,6 -48,12 +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; - /** * A class in charges of combining two-dimensional geographic or projected CRS with an ellipsoidal height into a diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java index be45ad51eb,7b012055f1..c87f54828c --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/CoordinateOperationRegistryTest.java @@@ -48,11 -49,10 +49,10 @@@ import org.junit.jupiter.api.extension. import org.apache.sis.test.LoggingWatcher; import org.apache.sis.referencing.operation.transform.MathTransformTestCase; import static org.apache.sis.referencing.Assertions.assertEpsgNameAndIdentifierEqual; - import org.apache.sis.referencing.operation.transform.MathTransforms; import static org.apache.sis.test.TestCase.assumeConnectionToEPSG; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.metadata.Identifier; +// Specific to the main branch: +import org.opengis.referencing.ReferenceIdentifier; /**
