This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 45f588a242 Post-merge automatic reorganization of imports order.
45f588a242 is described below
commit 45f588a242ce77f8488b01ea61ecee2cacc247fc
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Thu Sep 11 14:23:20 2025 +0200
Post-merge automatic reorganization of imports order.
---
.../main/org/apache/sis/openoffice/ReferencingFunctions.java | 8 ++++----
.../main/org/apache/sis/io/wkt/GeodeticObjectParser.java | 2 +-
.../main/org/apache/sis/referencing/crs/AbstractCRS.java | 2 +-
.../main/org/apache/sis/referencing/crs/DefaultParametricCRS.java | 2 +-
.../org/apache/sis/referencing/datum/DefaultDatumEnsemble.java | 2 +-
.../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, 13 insertions(+), 13 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
index c5337d7ae0..21cfa71560 100644
---
a/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
+++
b/endorsed/src/org.apache.sis.openoffice/main/org/apache/sis/openoffice/ReferencingFunctions.java
@@ -28,6 +28,7 @@ import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.ReferenceSystem;
import org.opengis.referencing.cs.CoordinateSystem;
import org.opengis.referencing.cs.CoordinateSystemAxis;
+import org.opengis.referencing.crs.CRSAuthorityFactory;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.metadata.iso.extent.Extents;
import org.apache.sis.referencing.CRS;
@@ -42,13 +43,12 @@ import org.apache.sis.storage.DataStores;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.base.CodeType;
+// Specific to the main and geoapi-4.0 branches:
+import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
+
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.referencing.ObjectDomain;
-// Specific to the geoapi-4.0 branch:
-import org.opengis.referencing.crs.CRSAuthorityFactory;
-import org.apache.sis.referencing.factory.GeodeticAuthorityFactory;
-
/**
* Implements the {@link XReferencing} methods to make available to Apache
OpenOffice.
diff --git
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
index a712ecbbfa..8120099749 100644
---
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
@@ -90,8 +90,8 @@ import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.iso.Types;
// 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;
diff --git
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
index 275ed71dfb..67bbf37967 100644
---
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
@@ -46,8 +46,8 @@ import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.resources.Errors;
// 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;
diff --git
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
index 285fc6cb3e..fb35dde03a 100644
---
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,7 +23,6 @@ import jakarta.xml.bind.annotation.XmlType;
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.DatumOrEnsemble;
import org.apache.sis.referencing.datum.DefaultParametricDatum;
import org.apache.sis.io.wkt.Formatter;
@@ -32,6 +31,7 @@ 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;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java
index 6d0d482208..f17652bdef 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultDatumEnsemble.java
@@ -42,9 +42,9 @@ import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.referencing.GeodeticException;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.internal.Resources;
+import org.apache.sis.referencing.internal.PositionalAccuracyConstant;
import org.apache.sis.referencing.privy.WKTKeywords;
import org.apache.sis.referencing.privy.WKTUtilities;
-import org.apache.sis.referencing.internal.PositionalAccuracyConstant;
import org.apache.sis.metadata.privy.NameToIdentifier;
import org.apache.sis.metadata.privy.SecondaryTrait;
import org.apache.sis.util.ArgumentChecks;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
index 7f5a051171..c8dcf1fa62 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
@@ -44,8 +44,8 @@ import org.apache.sis.metadata.privy.ImplementationHelper;
import org.apache.sis.referencing.internal.AnnotatedMatrix;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.CharSequences;
-import org.apache.sis.util.privy.CollectionsExt;
import org.apache.sis.util.OptionalCandidate;
+import org.apache.sis.util.privy.CollectionsExt;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.io.wkt.Formatter;
import static org.apache.sis.util.Utilities.deepEquals;
diff --git
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
index 74a0546aab..6fd24bb1a2 100644
---
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
@@ -20,9 +20,9 @@ import java.util.Map;
import java.util.Iterator;
import java.util.Locale;
import java.time.Instant;
+import java.time.Year;
import java.text.ParsePosition;
import java.text.ParseException;
-import java.time.Year;
import java.time.temporal.Temporal;
import javax.measure.Unit;
import javax.measure.quantity.Length;
@@ -38,6 +38,7 @@ import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.measure.Latitude;
import org.apache.sis.measure.Longitude;
+import org.apache.sis.measure.Units;
import org.apache.sis.metadata.privy.AxisNames;
import org.apache.sis.referencing.privy.ReferencingFactoryContainer;
import org.apache.sis.referencing.cs.CoordinateSystems;
@@ -47,7 +48,6 @@ import org.apache.sis.referencing.datum.DefaultGeodeticDatum;
import org.apache.sis.referencing.factory.GeodeticObjectFactory;
import org.apache.sis.referencing.operation.transform.MathTransforms;
import org.apache.sis.referencing.operation.transform.LinearTransform;
-import org.apache.sis.measure.Units;
import static org.apache.sis.util.privy.Constants.SECONDS_PER_DAY;
// Test dependencies
diff --git
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
index b49e9b122c..8edb9bb36c 100644
---
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
@@ -45,13 +45,13 @@ import static org.apache.sis.util.privy.Constants.UTC;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import org.opengis.test.Validators;
import static org.apache.sis.test.Assertions.assertEqualsIgnoreMetadata;
import static org.apache.sis.test.Assertions.assertMessageContains;
import static org.apache.sis.test.TestUtilities.*;
// 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;
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/GeometryLibrary.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/GeometryLibrary.java
index 1f06b907e5..e1f45624c7 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/GeometryLibrary.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/GeometryLibrary.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.setup;
-import org.apache.sis.util.privy.Constants;
import org.opengis.metadata.acquisition.GeometryType;
+import org.apache.sis.util.privy.Constants;
/**
