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 3ce89f28c7af5f28d17036d47e7f040e5bd330cf Merge: 14ecaa6557 45f588a242 Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Sep 11 14:25:30 2025 +0200 Merge of automatic reorganization of imports order. .../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +- .../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java | 2 +- .../main/org/apache/sis/referencing/crs/DefaultParametricCRS.java | 2 +- .../main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java | 2 +- .../main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java | 2 +- .../test/org/apache/sis/io/wkt/GeodeticObjectParserTest.java | 4 ++-- .../test/org/apache/sis/referencing/CommonCRSTest.java | 2 +- .../main/org/apache/sis/setup/GeometryLibrary.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/GeodeticObjectParser.java index 930c73cec9,8120099749..d2075e9d71 --- 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 @@@ -89,13 -89,14 +89,13 @@@ import org.apache.sis.util.privy.String import org.apache.sis.util.resources.Errors; 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.coordinate.CoordinateMetadata; import org.opengis.referencing.ObjectDomain; + import org.opengis.coordinate.CoordinateMetadata; -// Specific to the geoapi-4.0 branch: -import org.apache.sis.referencing.crs.DefaultImageCRS; -import org.apache.sis.referencing.datum.DefaultImageDatum; - /** * Well Known Text (WKT) parser for referencing objects. This include, but is not limited too, diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java index 52b4d3ce8f,67bbf37967..d081318857 --- 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 @@@ -45,14 -45,14 +45,14 @@@ import org.apache.sis.util.Utilities import org.apache.sis.util.ComparisonMode; import org.apache.sis.util.resources.Errors; +// Specific to the main and geoapi-3.1 branches: +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.metadata.Identifier; import org.opengis.referencing.datum.DatumEnsemble; + import org.opengis.metadata.Identifier; -// Specific to the geoapi-4.0 branch: -import org.opengis.referencing.crs.DerivedCRS; -import org.opengis.coordinate.MismatchedDimensionException; - /** * Coordinate reference system, defined by a {@linkplain AbstractCS coordinate system} diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java index 9133cbb2a3,dba0e2c4c1..48e7380f5e --- 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 @@@ -44,10 -44,6 +44,10 @@@ import org.apache.sis.util.ArgumentChec import org.apache.sis.util.ComparisonMode; 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; diff --cc endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java index ccbf6a4d90,8edb9bb36c..c899f20466 --- a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java +++ b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/CommonCRSTest.java @@@ -50,11 -49,9 +49,12 @@@ import static org.apache.sis.test.Asser import static org.apache.sis.test.Assertions.assertMessageContains; import static org.apache.sis.test.TestUtilities.*; +// Specific to the main and geoapi-3.1 branches: +import org.apache.sis.temporal.TemporalDate; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.referencing.datum.RealizationMethod; + import org.opengis.test.Validators; import static org.opengis.test.Assertions.assertAxisDirectionsEqual;
