This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits 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 6dfabbc7f7 Post-merge automatic reorganization of imports order.
6dfabbc7f7 is described below
commit 6dfabbc7f709d141f1600f1c7f06a3779970392a
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Sat Oct 17 23:47:27 2026 +0200
Post-merge automatic reorganization of imports order.
---
.../main/org/apache/sis/geometries/GeometryFactory.java | 4 ++--
.../main/org/apache/sis/geometries/GeometryType.java | 4 ++--
.../main/org/apache/sis/geometries/HyperPlane.java | 2 +-
.../main/org/apache/sis/geometries/Plane.java | 2 +-
.../main/org/apache/sis/geometries/Solid.java | 2 +-
.../main/org/apache/sis/geometries/adapter/JTSAdapter.java | 10 +++++-----
.../org/apache/sis/geometries/adapter/WellKnownBinary.java | 2 +-
.../apache/sis/geometries/adapter/WellKnownBinaryParser.java | 2 +-
.../main/org/apache/sis/geometries/curve/Line.java | 2 +-
.../main/org/apache/sis/geometries/curve/Ray.java | 2 +-
.../sis/geometries/internal/shared/DefaultCompoundCurve.java | 2 +-
.../sis/geometries/internal/shared/DefaultNurbCurve.java | 2 +-
.../sis/geometries/internal/shared/DefaultNurbSurface.java | 4 ++--
.../geometries/internal/shared/DefaultPolyhedralSurface.java | 2 +-
.../apache/sis/geometries/internal/shared/DefaultSolid.java | 4 ++--
.../org/apache/sis/geometries/operation/GeometryProcessor.java | 8 ++++----
.../geometries/operation/simplify/greedyinsert/WTriangle.java | 2 +-
.../operation/triangulate/delaunay/OrientedEdge.java | 2 +-
.../operation/triangulate/delaunay/OrientedTriangle.java | 2 +-
.../sis/geometries/solid/polyhedron/AbstractPolyhedron.java | 6 +++---
.../main/org/apache/sis/geometries/surface/Capsule.java | 2 +-
.../main/org/apache/sis/geometries/surface/Cylinder.java | 2 +-
.../main/org/apache/sis/geometries/surface/Ellipsoid.java | 1 -
.../main/org/apache/sis/geometries/surface/Sphere.java | 1 -
.../main/org/apache/sis/gml/GML2Reader.java | 2 +-
.../main/org/apache/sis/gml/GML3Writer.java | 2 +-
.../org/apache/sis/geometries/operation/SymDifferenceTest.java | 4 ++--
.../test/org/apache/sis/geometries/point/MultiPointTest.java | 2 +-
.../test/org/apache/sis/geometries/surface/EllipsoidTest.java | 6 +++---
.../sis/geometries/surface/ParametricCurveSurfaceTest.java | 3 ++-
30 files changed, 45 insertions(+), 46 deletions(-)
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
index 3ab912a8e3..e1c3ed0a21 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryFactory.java
@@ -99,9 +99,7 @@ import
org.apache.sis.geometries.internal.shared.DefaultTriangulatedSurface;
import org.apache.sis.geometries.surface.Capsule;
import org.apache.sis.geometries.surface.Cylinder;
import org.apache.sis.geometries.surface.Ellipsoid;
-import org.apache.sis.geometries.solid.Polyhedron;
import org.apache.sis.geometries.surface.Sphere;
-import org.apache.sis.geometries.solid.BSplineSolid;
import org.apache.sis.geometries.surface.BSplineSurface;
import org.apache.sis.geometries.surface.BSplineSurfaceForm;
import org.apache.sis.geometries.surface.BilinearGrid;
@@ -111,6 +109,8 @@ import org.apache.sis.geometries.surface.Polygon;
import org.apache.sis.geometries.surface.PolyhedralSurface;
import org.apache.sis.geometries.surface.TIN;
import org.apache.sis.geometries.surface.Triangle;
+import org.apache.sis.geometries.solid.Polyhedron;
+import org.apache.sis.geometries.solid.BSplineSolid;
import org.apache.sis.maths.Array;
import org.apache.sis.maths.DataType;
import org.apache.sis.maths.NDArrays;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryType.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryType.java
index 952396a479..6a3cd3d6f6 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryType.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryType.java
@@ -17,6 +17,8 @@
package org.apache.sis.geometries;
import javax.print.attribute.standard.MediaSize.ISO;
+import static org.opengis.annotation.Specification.ISO_19107;
+import org.opengis.annotation.UML;
import org.apache.sis.geometries.curve.Arc;
import org.apache.sis.geometries.curve.ArcByBulge;
import org.apache.sis.geometries.curve.ArcByCenterPoint;
@@ -56,8 +58,6 @@ import org.apache.sis.geometries.surface.PolyhedralSurface;
import org.apache.sis.geometries.surface.Sphere;
import org.apache.sis.geometries.surface.TIN;
import org.apache.sis.geometries.surface.Triangle;
-import static org.opengis.annotation.Specification.ISO_19107;
-import org.opengis.annotation.UML;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/HyperPlane.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/HyperPlane.java
index d39d29c51c..8fec14a709 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/HyperPlane.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/HyperPlane.java
@@ -20,12 +20,12 @@ import java.util.Objects;
import static org.opengis.annotation.Specification.ISO_12113;
import org.opengis.annotation.UML;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vector;
-import org.opengis.geometry.Envelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java
index 733491c1cc..2e6cc3910a 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Plane.java
@@ -20,12 +20,12 @@ import java.util.Objects;
import static org.opengis.annotation.Specification.ISO_12113;
import org.opengis.annotation.UML;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vector;
-import org.opengis.geometry.Envelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Solid.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Solid.java
index 4c9bf77492..a569454ac4 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Solid.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Solid.java
@@ -18,9 +18,9 @@ package org.apache.sis.geometries;
import java.util.List;
import javax.measure.Quantity;
-import org.apache.sis.geometries.internal.shared.DefaultSolid;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.internal.shared.DefaultSolid;
import org.apache.sis.geometries.solid.ParametricCurveSolid;
import org.apache.sis.geometries.solid.Polyhedron;
import org.apache.sis.maths.Array;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java
index 9a0d841294..c11283ebb6 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/JTSAdapter.java
@@ -18,6 +18,11 @@ package org.apache.sis.geometries.adapter;
import java.util.ArrayList;
import java.util.List;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
+import org.locationtech.jts.geom.CoordinateXY;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Geometries;
@@ -40,11 +45,6 @@ import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.SampleSystem;
import org.apache.sis.maths.Vector;
import org.apache.sis.maths.Vectors;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.CoordinateSequence;
-import org.locationtech.jts.geom.CoordinateXY;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinary.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinary.java
index de6100c825..718082bf3d 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinary.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinary.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.adapter;
import java.nio.ByteOrder;
import java.util.Arrays;
import java.util.function.IntFunction;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Empty;
@@ -37,7 +38,6 @@ import org.apache.sis.geometries.surface.TIN;
import org.apache.sis.geometries.surface.Triangle;
import org.apache.sis.maths.Vector;
import org.apache.sis.util.ArgumentChecks;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinaryParser.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinaryParser.java
index 92accc436e..06254fbfeb 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinaryParser.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/WellKnownBinaryParser.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.DataPointsType;
@@ -43,7 +44,6 @@ import org.apache.sis.maths.Array;
import org.apache.sis.maths.DataType;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.SampleSystem;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Line.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Line.java
index 9bee4f89a2..8284ce0092 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Line.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Line.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.geometries.curve;
-import javax.measure.Quantity;
import javax.print.attribute.standard.MediaSize.ISO;
+import javax.measure.Quantity;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.Envelope;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Ray.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Ray.java
index 0a38ac50a4..bee76a3c28 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Ray.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/curve/Ray.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.curve;
import javax.measure.Quantity;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.CurveInterpolation;
import org.apache.sis.geometries.DataPointsType;
@@ -29,7 +30,6 @@ import org.apache.sis.maths.Array;
import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.measure.Quantities;
-import org.opengis.geometry.Envelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java
index ee5a1c4ab2..04efab6955 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultCompoundCurve.java
@@ -23,9 +23,9 @@ import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.DataPointsType;
+import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.curve.CompoundCurve;
import org.apache.sis.geometries.curve.LineString;
-import org.apache.sis.geometries.Geometries;
import org.apache.sis.maths.Array;
import org.apache.sis.maths.DataType;
import org.apache.sis.maths.NDArrays;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbCurve.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbCurve.java
index 33fc4d7c7e..b63279026e 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbCurve.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbCurve.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.internal.shared;
import java.util.Arrays;
import java.util.List;
import javax.measure.Quantity;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Geometries;
@@ -34,7 +35,6 @@ import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.Vector;
import org.apache.sis.maths.Vectors;
import org.apache.sis.measure.Quantities;
-import org.opengis.geometry.Envelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbSurface.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbSurface.java
index 39c436dd1c..6f8cc6d840 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbSurface.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultNurbSurface.java
@@ -21,21 +21,21 @@ import java.util.Arrays;
import java.util.List;
import javax.measure.Quantity;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.Geometry;
+import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.curve.KnotType;
import org.apache.sis.geometries.operation.DeBoorAlgorithm;
import org.apache.sis.geometries.surface.BSplineSurfaceForm;
import org.apache.sis.geometries.surface.NurbSurface;
-import org.apache.sis.geometries.Geometries;
import org.apache.sis.maths.Array;
import org.apache.sis.maths.DataType;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.Vector;
import org.apache.sis.maths.Vectors;
-import org.opengis.geometry.Envelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolyhedralSurface.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolyhedralSurface.java
index f28773790e..a0b333d050 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolyhedralSurface.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultPolyhedralSurface.java
@@ -20,9 +20,9 @@ import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Geometry;
+import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.surface.Polygon;
import org.apache.sis.geometries.surface.PolyhedralSurface;
-import org.apache.sis.geometries.Geometries;
import org.apache.sis.util.ArgumentChecks;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultSolid.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultSolid.java
index f0c3709098..3d4bb3f66f 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultSolid.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultSolid.java
@@ -18,11 +18,11 @@ package org.apache.sis.geometries.internal.shared;
import java.util.List;
import javax.measure.Quantity;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Geometry;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.GeometryCollection;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.GeometryType;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
index 5e62cce01e..917acead48 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryProcessor.java
@@ -25,6 +25,10 @@ import java.util.Map.Entry;
import java.util.function.Consumer;
import java.util.function.Function;
import javax.measure.Quantity;
+import static org.opengis.annotation.Specification.ISO_19107;
+import org.opengis.annotation.UML;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.DE9IM;
import org.apache.sis.geometries.DataPointsType;
@@ -50,10 +54,6 @@ import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
import org.apache.sis.util.ArgumentChecks;
-import static org.opengis.annotation.Specification.ISO_19107;
-import org.opengis.annotation.UML;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java
index afabf3ac3d..b652f1f1a5 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/WTriangle.java
@@ -24,12 +24,12 @@ import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.DataPointsType;
+import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
import org.apache.sis.geometries.internal.shared.IndexedPoint;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.surface.Triangle;
-import org.apache.sis.geometries.Geometries;
import org.apache.sis.maths.Maths;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vector;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java
index 1840eed752..dae091b0f9 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedEdge.java
@@ -21,11 +21,11 @@ import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.DataPointsType;
+import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
-import org.apache.sis.geometries.Geometries;
import org.apache.sis.maths.Maths;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vector;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java
index e20ab8dc93..b15fc6c255 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/OrientedTriangle.java
@@ -23,13 +23,13 @@ import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.DataPointsType;
+import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.surface.Triangle;
-import org.apache.sis.geometries.Geometries;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vector;
import org.apache.sis.referencing.internal.shared.ShapeUtilities;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/polyhedron/AbstractPolyhedron.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/polyhedron/AbstractPolyhedron.java
index c4830db71d..a519bec852 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/polyhedron/AbstractPolyhedron.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/polyhedron/AbstractPolyhedron.java
@@ -17,6 +17,8 @@
package org.apache.sis.geometries.solid.polyhedron;
import java.util.List;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.GeometryCollection;
@@ -24,10 +26,10 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.Surface;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.internal.shared.AbstractGeometry;
+import org.apache.sis.geometries.internal.shared.DefaultSphere;
import org.apache.sis.geometries.solid.Polyhedron;
import org.apache.sis.geometries.spherical.SphericalConvexPolygon;
import org.apache.sis.geometries.surface.Polygon;
-import org.apache.sis.geometries.internal.shared.DefaultSphere;
import org.apache.sis.geometries.surface.Sphere;
import org.apache.sis.maths.Array;
import org.apache.sis.maths.NDArrays;
@@ -35,8 +37,6 @@ import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.SampleSystem;
import org.apache.sis.maths.Vector3D;
import org.apache.sis.util.ArgumentChecks;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Capsule.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Capsule.java
index 0b2f4abc9b..9bdeee5562 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Capsule.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Capsule.java
@@ -20,6 +20,7 @@ import java.util.List;
import static org.opengis.annotation.Specification.ISO_12113;
import org.opengis.annotation.UML;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryFactory;
@@ -32,7 +33,6 @@ import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vectors;
import org.apache.sis.maths.Vector;
-import org.opengis.geometry.Envelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Cylinder.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Cylinder.java
index 1bdca5a48a..68033cfb57 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Cylinder.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Cylinder.java
@@ -22,6 +22,7 @@ import javax.measure.Quantity;
import static org.opengis.annotation.Specification.ISO_12113;
import org.opengis.annotation.UML;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.Geometry;
@@ -38,7 +39,6 @@ import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vectors;
import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
-import org.opengis.geometry.Envelope;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Ellipsoid.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Ellipsoid.java
index 4e59033ccd..abb7475f8f 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Ellipsoid.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Ellipsoid.java
@@ -29,7 +29,6 @@ import org.apache.sis.geometries.SurfaceInterpolation;
import org.apache.sis.geometries.internal.shared.DefaultEllipsoid;
import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.ReadOnly;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Sphere.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Sphere.java
index 5a2f8334f4..62c5d08b01 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Sphere.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/Sphere.java
@@ -31,7 +31,6 @@ import org.apache.sis.geometries.SurfaceInterpolation;
import org.apache.sis.geometries.internal.shared.DefaultSphere;
import org.apache.sis.maths.NDRange;
import org.apache.sis.maths.ReadOnly;
-import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java
index 115aae2ee5..884b17fd3d 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML2Reader.java
@@ -22,6 +22,7 @@ import java.util.List;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.BBox;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryCollection;
@@ -32,7 +33,6 @@ import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.surface.Polygon;
import org.apache.sis.storage.DataStoreContentException;
import org.apache.sis.storage.DataStoreReferencingException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java
index 18a1d315ce..8eb061e45d 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/gml/GML3Writer.java
@@ -18,10 +18,10 @@ package org.apache.sis.gml;
import java.io.OutputStream;
import java.util.function.IntFunction;
-import javax.measure.Unit;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamWriter;
+import javax.measure.Unit;
import org.apache.sis.geometries.BBox;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.DataPoints;
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SymDifferenceTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SymDifferenceTest.java
index 94eead092f..e1c464bc97 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SymDifferenceTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SymDifferenceTest.java
@@ -18,10 +18,10 @@ package org.apache.sis.geometries.operation;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryCollection;
-
-// Test dependencies
import org.apache.sis.geometries.GeometryType;
import org.apache.sis.geometries.Point;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/point/MultiPointTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/point/MultiPointTest.java
index 3fdd29f163..f3cce114bd 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/point/MultiPointTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/point/MultiPointTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.sis.geometries.point;
-import org.apache.sis.geometries.GeometryCollection;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.geometries.GeometryCollection;
import org.apache.sis.geometries.Point;
// Test dependencies
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/EllipsoidTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/EllipsoidTest.java
index bcdc4ab045..487a29e4ae 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/EllipsoidTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/EllipsoidTest.java
@@ -23,14 +23,14 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.GeometryType;
import org.apache.sis.geometries.curve.EllipticArc;
import org.apache.sis.maths.Vector;
+import static org.apache.sis.geometries.surface.SphereTest.assertEnvelope;
+import static org.apache.sis.geometries.surface.SphereTest.assertPosition;
+import static org.apache.sis.geometries.surface.SphereTest.line;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.apache.sis.geometries.GeometryTest;
-import static org.apache.sis.geometries.surface.SphereTest.assertEnvelope;
-import static org.apache.sis.geometries.surface.SphereTest.assertPosition;
-import static org.apache.sis.geometries.surface.SphereTest.line;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/ParametricCurveSurfaceTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/ParametricCurveSurfaceTest.java
index 7eac9813be..8a0c1570eb 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/ParametricCurveSurfaceTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/ParametricCurveSurfaceTest.java
@@ -16,12 +16,13 @@
*/
package org.apache.sis.geometries.surface;
+import org.apache.sis.geometries.internal.shared.DefaultSphere;
+
// Test dependencies
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.apache.sis.geometries.GeometryTest;
-import org.apache.sis.geometries.internal.shared.DefaultSphere;
/**
