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 4c46d7bb98889e4dc1e14d5528016334cc87753a
Merge: d1adc5678e 8dbe7f3e64
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Jul 19 18:26:48 2024 +0200
Merge of automatic reorganization of imports order.
.../main/org/apache/sis/metadata/privy/RecordSchemaSIS.java | 2 +-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/AbstractSingleCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java | 6 +++---
.../main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java | 6 +++---
.../org/apache/sis/referencing/datum/DefaultDatumEnsemble.java | 4 ++--
.../main/org/apache/sis/referencing/datum/PseudoDatum.java | 8 ++++----
.../org/apache/sis/referencing/factory/sql/EPSGDataAccess.java | 4 ++--
.../apache/sis/referencing/operation/DefaultConversionTest.java | 2 +-
9 files changed, 18 insertions(+), 18 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractCRS.java
index bd6e31b3fc,794042176d..4185e1d79e
---
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
@@@ -47,9 -46,8 +46,10 @@@ 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.metadata.Identifier;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
++import org.apache.sis.pending.geoapi.referencing.MissingMethods;
+import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
index 4aa8a7a943,141568dac9..5d33897dfd
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
@@@ -34,10 -34,9 +34,10 @@@ import org.apache.sis.referencing.datum
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.metadata.privy.ImplementationHelper;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.referencing.datum.DatumEnsemble;
+// Specific to the main branch:
+import org.opengis.referencing.ReferenceIdentifier;
- import org.apache.sis.pending.geoapi.referencing.MissingMethods;
+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/DefaultGeocentricCRS.java
index 18c99916e6,b35fdc3d41..20bc0f7cb0
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
@@@ -32,9 -32,9 +32,9 @@@ import org.apache.sis.io.wkt.Formatter
// 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;
+
/**
* A 2- or 3-dimensional coordinate reference system with the origin at the
approximate centre of mass of the earth.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
index 05df774103,4eceaac3c7..ca71a2e761
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
@@@ -48,9 -48,9 +48,9 @@@ import static org.apache.sis.util.privy
// 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.DatumEnsemble;
++// Specific to the main branch:
++import org.apache.sis.referencing.datum.DefaultDatumEnsemble;
+
/**
* A 1-dimensional coordinate reference system used for the recording of time.
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java
index 83fd8e8334,1edef9d645..c215bd1211
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java
@@@ -38,13 -38,14 +38,13 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.GeodeticException;
- // Specific to the main branch:
- import static
org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble;
-
// Specific to the main and geoapi-3.1 branches:
import java.util.Date;
- import org.opengis.metadata.extent.Extent;
import org.opengis.referencing.ReferenceIdentifier;
+ import org.opengis.metadata.extent.Extent;
+
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.time.temporal.Temporal;
-import org.opengis.referencing.ObjectDomain;
++// Specific to the main branch:
++import static
org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
index ae85930faa,039ae92ea8..e51792d6c2
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
@@@ -121,12 -121,9 +121,12 @@@ import org.apache.sis.measure.NumberRan
import org.apache.sis.measure.Units;
import org.apache.sis.pending.jdk.JDK16;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
- import org.apache.sis.referencing.internal.ServicesForMetadata;
- import org.apache.sis.temporal.TemporalDate;
+import org.apache.sis.referencing.cs.DefaultParametricCS;
+import org.apache.sis.referencing.datum.DefaultParametricDatum;
+import org.apache.sis.referencing.factory.GeodeticObjectFactory;
++import org.apache.sis.referencing.internal.ServicesForMetadata;
++import org.apache.sis.temporal.TemporalDate;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
index 2ea4268ce1,8f4124dbd8..c1b5d8bb0a
---
a/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
+++
b/endorsed/src/org.apache.sis.referencing/test/org/apache/sis/referencing/operation/DefaultConversionTest.java
@@@ -50,9 -50,8 +50,9 @@@ import org.apache.sis.parameter.Default
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.test.Assertions.assertSerializedEquals;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import static org.opengis.test.Assertions.assertMatrixEquals;
+// Specific to the main branch:
- import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
+import static
org.apache.sis.pending.geoapi.referencing.MissingMethods.getDatumEnsemble;
++import static org.apache.sis.test.GeoapiAssert.assertMatrixEquals;
/**
