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 027cd1b7539c56692617aef02300bc3effc1ddc4 Merge: 4e0bc740bc be1d8a0caf Author: Martin Desruisseaux <[email protected]> AuthorDate: Mon Sep 1 12:36:15 2025 +0200 Merge of automatic reorganization of imports order. .../apache/sis/geometry/wrapper/GeometryWrapper.java | 2 +- .../org/apache/sis/referencing/AuthorityFactories.java | 2 +- .../main/org/apache/sis/referencing/CRS.java | 8 ++++---- .../apache/sis/referencing/crs/AbstractDerivedCRS.java | 2 +- .../referencing/factory/IdentifiedObjectFinder.java | 6 +++--- .../sis/referencing/factory/sql/EPSGInstaller.java | 2 +- .../apache/sis/test/integration/ConsistencyTest.java | 4 +--- .../org/apache/sis/geometries/GeometryFactory.java | 3 ++- .../main/org/apache/sis/geometries/Wrapper.java | 18 ++++++++---------- 9 files changed, 22 insertions(+), 25 deletions(-) diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java index 21ffa968fd,c093240378..193647114c --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/CRS.java @@@ -94,11 -97,7 +97,10 @@@ import org.apache.sis.util.privy.Consta import org.apache.sis.util.resources.Errors; import org.apache.sis.util.logging.Logging; +// Specific to the main and geoapi-3.1 branches: +import org.opengis.referencing.crs.GeneralDerivedCRS; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: - import org.opengis.geometry.Geometry; import org.opengis.referencing.ObjectDomain; import org.opengis.referencing.crs.DerivedCRS; import org.opengis.referencing.datum.DynamicReferenceFrame; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractDerivedCRS.java index f07fdeb3fe,cabb6fd81c..1f523146a1 --- 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,9 -43,6 +43,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; + // Specific to the geoapi-3.1 and geoapi-4.0 branches: import org.opengis.coordinate.MismatchedDimensionException; diff --cc endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java index 34d842d425,fdb044803a..4f5499c4b8 --- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java +++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/IdentifiedObjectFinder.java @@@ -41,12 -41,12 +41,12 @@@ import org.apache.sis.util.collection.B import org.apache.sis.util.logging.Logging; import org.apache.sis.system.Semaphores; - // Specific to the geoapi-3.1 and geoapi-4.0 branches: - import org.opengis.referencing.datum.DatumEnsemble; - +// 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.datum.DatumEnsemble; + -// Specific to the geoapi-4.0 branch: -import org.opengis.metadata.Identifier; - /** * Searches in an authority factory for objects approximately equal to a given object.
