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 8dbe7f3e64d3e59f2fca9a62eafbbf8b477046fd
Merge: 51c67748ee f34a356cf9
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Jul 19 18:25:13 2024 +0200
Merge of automatic reorganization of imports order.
.../main/org/apache/sis/metadata/privy/RecordSchemaSIS.java | 2 +-
.../main/org/apache/sis/io/wkt/ElementKind.java | 4 +++-
.../main/org/apache/sis/referencing/MultiRegisterOperations.java | 2 +-
.../main/org/apache/sis/referencing/crs/AbstractSingleCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultGeographicCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java | 2 +-
.../org/apache/sis/referencing/datum/DefaultDatumEnsemble.java | 6 +++---
.../main/org/apache/sis/referencing/datum/PseudoDatum.java | 8 +++++---
9 files changed, 17 insertions(+), 13 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
index c190cbe749,71f39fb368..17d2ff61bb
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
@@@ -40,13 -40,9 +40,13 @@@ import org.apache.sis.util.ArgumentChec
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.Workaround;
+// Specific to the main and geoapi-3.1 branches:
+import org.opengis.referencing.crs.GeographicCRS;
+import org.opengis.referencing.operation.Projection;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
- import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.referencing.datum.DatumEnsemble;
+ import org.opengis.coordinate.MismatchedDimensionException;
/**
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/PseudoDatum.java
index ee840991a4,751e780930..1edef9d645
---
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
@@@ -40,11 -38,13 +38,15 @@@ import org.apache.sis.util.resources.Er
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.GeodeticException;
+// 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 geoapi-4.0 branch:
-import org.opengis.metadata.Identifier;
-
/**
* A datum ensemble viewed as if it was a single datum for the sake of
simplicity.
