This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/sis.git
commit 499c98d8e157510e8024d9abbaac1fea03a32025 Merge: be4deee44b 3ce89f28c7 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Sep 11 14:27:44 2025 +0200 Merge of automatic reorganization of imports order. .../main/org/apache/sis/io/wkt/Formatter.java | 2 +- .../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +- .../main/org/apache/sis/referencing/EPSGFactoryFallback.java | 6 +++--- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +- .../org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 2 +- .../org/apache/sis/referencing/crs/DefaultParametricCRS.java | 2 +- .../apache/sis/referencing/datum/DefaultDatumEnsemble.java | 2 +- .../apache/sis/referencing/datum/DefaultGeodeticDatum.java | 2 +- .../test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 12 ++++++------ .../org/apache/sis/referencing/GeodeticObjectVerifier.java | 2 +- .../main/org/apache/sis/setup/GeometryLibrary.java | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java index 5928ff070e,55c5408246..ccdc06b5ad --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java @@@ -81,7 -81,8 +81,8 @@@ import org.apache.sis.metadata.simple.S import org.apache.sis.metadata.iso.extent.Extents; import org.apache.sis.metadata.iso.citation.Citations; import org.apache.sis.referencing.AbstractIdentifiedObject; -import org.apache.sis.referencing.DefaultObjectDomain; import org.apache.sis.referencing.ImmutableIdentifier; ++import org.apache.sis.referencing.DefaultObjectDomain; import org.apache.sis.referencing.privy.WKTKeywords; import org.apache.sis.referencing.privy.WKTUtilities; import org.apache.sis.referencing.internal.Epoch; @@@ -90,11 -91,9 +91,10 @@@ import org.apache.sis.geometry.Abstract import org.apache.sis.geometry.AbstractEnvelope; import org.apache.sis.xml.NilObject; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.util.ControlledVocabulary; -import org.opengis.referencing.ObjectDomain; +// Specific to the main branch: +import org.opengis.util.CodeList; +import org.opengis.referencing.ReferenceIdentifier; - import org.apache.sis.referencing.DefaultObjectDomain; +import org.apache.sis.referencing.datum.AbstractDatum; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java index 772d4e7487,d2075e9d71..955de75718 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java @@@ -92,16 -92,9 +92,16 @@@ import org.apache.sis.util.iso.Types // 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 org.opengis.referencing.ObjectDomain; -import org.opengis.coordinate.CoordinateMetadata; +// Specific to the main branch: +import org.opengis.referencing.ReferenceSystem; - import org.apache.sis.pending.geoapi.referencing.MissingMethods; +import org.apache.sis.referencing.cs.DefaultParametricCS; +import org.apache.sis.referencing.datum.AbstractDatum; +import org.apache.sis.referencing.datum.DefaultDatumEnsemble; +import org.apache.sis.referencing.datum.DefaultVerticalDatum; +import org.apache.sis.referencing.datum.DefaultParametricDatum; ++import org.apache.sis.pending.geoapi.referencing.MissingMethods; +import org.apache.sis.referencing.factory.GeodeticObjectFactory; +import org.apache.sis.temporal.TemporalDate; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java index d75d81c095,4ab57382bd..fd7884b37a --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/EPSGFactoryFallback.java @@@ -55,9 -55,9 +55,9 @@@ import org.apache.sis.measure.Units // Specific to the main and geoapi-3.1 branches: import org.opengis.referencing.crs.GeocentricCRS; -// 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.DefaultDatumEnsemble; + /** * The authority factory to use as a fallback when the real EPSG factory is not available. diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java index 48721a0892,d081318857..834608bce9 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java @@@ -48,10 -49,9 +49,9 @@@ import org.apache.sis.util.resources.Er import org.opengis.referencing.crs.GeneralDerivedCRS; import org.opengis.geometry.MismatchedDimensionException; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.referencing.datum.DatumEnsemble; -import org.opengis.metadata.Identifier; +// Specific to the main branch: +import org.opengis.referencing.ReferenceIdentifier; - import org.apache.sis.referencing.datum.DefaultDatumEnsemble; +import org.apache.sis.pending.geoapi.referencing.MissingMethods; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java index 939d47281c,48e7380f5e..1bc64a8355 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java @@@ -45,11 -45,11 +45,11 @@@ import org.apache.sis.util.ComparisonMo import org.apache.sis.util.resources.Errors; // Specific to the main and geoapi-3.1 branches: - import org.opengis.referencing.datum.Datum; import org.opengis.referencing.crs.GeneralDerivedCRS; + import org.opengis.referencing.datum.Datum; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.coordinate.MismatchedDimensionException; +// Specific to the main branch: +import org.opengis.geometry.MismatchedDimensionException; /** diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java index 44ce14eeec,fb35dde03a..31008d9de8 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultParametricCRS.java @@@ -23,12 -23,15 +23,12 @@@ import jakarta.xml.bind.annotation.XmlT import org.apache.sis.referencing.privy.WKTKeywords; import org.apache.sis.referencing.cs.AxesConvention; import org.apache.sis.referencing.cs.AbstractCS; -import org.apache.sis.referencing.datum.DefaultParametricDatum; import org.apache.sis.io.wkt.Formatter; ++import org.apache.sis.referencing.datum.DefaultParametricDatum; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.referencing.cs.ParametricCS; -import org.opengis.referencing.crs.ParametricCRS; -import org.opengis.referencing.datum.ParametricDatum; -import org.opengis.referencing.datum.DatumEnsemble; -import org.apache.sis.referencing.datum.DatumOrEnsemble; +// Specific to the main branch: +import org.apache.sis.referencing.cs.DefaultParametricCS; - import org.apache.sis.referencing.datum.DefaultParametricDatum; +import org.apache.sis.referencing.datum.DefaultDatumEnsemble; /** diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java index 50e42e872c,9d94974f1d..df2937600d --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java @@@ -60,15 -60,9 +60,15 @@@ import static org.apache.sis.referencin import static org.apache.sis.referencing.Assertions.assertDiagonalEquals; import static org.apache.sis.test.TestUtilities.getSingleton; + // Specific to the main and geoapi-3.1 branches: + import org.apache.sis.temporal.TemporalDate; + +// Specific to the main branch: ++import org.apache.sis.referencing.datum.DefaultVerticalDatum; +import org.apache.sis.referencing.crs.DefaultGeographicCRS; +import org.apache.sis.referencing.crs.DefaultProjectedCRS; +import org.apache.sis.referencing.crs.DefaultVerticalCRS; - import org.apache.sis.referencing.datum.DefaultVerticalDatum; - - // Specific to the main and geoapi-3.1 branches: - import org.apache.sis.temporal.TemporalDate; + /** * Tests {@link GeodeticObjectParser}. diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java index 50e5b51fbf,d9f5aca0fe..2bd237d53c --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/GeodeticObjectVerifier.java @@@ -39,11 -39,9 +39,11 @@@ import org.apache.sis.measure.Units // Test dependencies import static org.junit.jupiter.api.Assertions.*; -// Specific to the geoapi-3.1 and geoapi-4.0 branches: -import org.opengis.referencing.ObjectDomain; -import org.opengis.referencing.datum.DatumEnsemble; +// Specific to the main branch: +import org.opengis.referencing.ReferenceSystem; +import org.opengis.referencing.datum.Datum; - import org.apache.sis.referencing.datum.DefaultDatumEnsemble; +import org.opengis.referencing.operation.CoordinateOperation; ++import org.apache.sis.referencing.datum.DefaultDatumEnsemble; /**
