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 c96495643a Post-merge automatic reorganization of imports order.
c96495643a is described below
commit c96495643ae9e52a13b6e98aa2b9563074f87141
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Fri Oct 9 14:42:56 2026 +0200
Post-merge automatic reorganization of imports order.
---
.../org/apache/sis/util/internal/shared/TableRowList.java | 2 +-
.../main/org/apache/sis/geometries/Curve.java | 2 +-
.../main/org/apache/sis/geometries/Geometries.java | 2 +-
.../main/org/apache/sis/geometries/GeometryFactory.java | 2 +-
.../main/org/apache/sis/geometries/adapter/SIS.java | 2 +-
.../main/org/apache/sis/geometries/adapter/Wrapper.java | 2 +-
.../sis/geometries/internal/shared/ArrayDataPoints.java | 2 +-
.../sis/geometries/internal/shared/DefaultDataPoints.java | 2 +-
.../sis/geometries/mesh/MeshPrimitiveComparator.java | 2 +-
.../apache/sis/geometries/operation/GeometryProcessor.java | 2 +-
.../apache/sis/geometries/operation/SutherlandHodgman.java | 1 -
.../main/org/apache/sis/geometries/operation/To3D.java | 2 +-
.../operation/simplify/greedyinsert/TINBuilder.java | 2 +-
.../operation/simplify/greedyinsert/TinDistance.java | 1 -
.../sis/geometries/operation/triangulate/EarClipping.java | 2 +-
.../operation/triangulate/delaunay/Delaunay.java | 1 -
.../operation/triangulate/delaunay/OrientedTriangle.java | 2 +-
.../main/org/apache/sis/geometries/solid/Cylinder.java | 1 -
.../main/org/apache/sis/geometries/solid/Ellipsoid.java | 2 +-
.../main/org/apache/sis/geometries/solid/Sphere.java | 2 +-
.../org/apache/sis/geometries/surface/PreparedTIN.java | 1 -
.../test/org/apache/sis/geometries/GeometryTest.java | 2 +-
.../test/org/apache/sis/geometries/PointTest.java | 2 +-
.../apache/sis/geometries/adapter/ShapeConverterTest.java | 2 +-
.../org/apache/sis/geometries/curve/LineStringTest.java | 2 +-
.../org/apache/sis/geometries/curve/LinearRingTest.java | 2 +-
.../apache/sis/geometries/curve/MultiLineStringTest.java | 4 ++--
.../test/org/apache/sis/geometries/mesh/PrimitiveTest.java | 2 +-
.../apache/sis/geometries/operation/AbstractD9IMTest.java | 2 +-
.../sis/geometries/operation/SutherlandHogmanTest.java | 2 +-
.../test/org/apache/sis/geometries/operation/To3DTest.java | 2 +-
.../sis/geometries/operation/WithinDistanceTest.java | 3 +--
.../org/apache/sis/geometries/point/MultiPointTest.java | 2 +-
.../apache/sis/geometries/surface/MultiPolygonTest.java | 2 +-
.../org/apache/sis/geometries/surface/PolygonTest.java | 2 +-
.../org/apache/sis/geometries/surface/PreparedTINTest.java | 2 +-
.../org/apache/sis/geometries/surface/TriangleTest.java | 2 +-
.../org/apache/sis/referencing/dggs/AbstractDggrsTest.java | 2 +-
.../org/apache/sis/storage/geopose/LocalTangentPlane.java | 14 +++++++-------
.../apache/sis/resources/embedded/EmbeddedResources.java | 2 +-
40 files changed, 42 insertions(+), 48 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/TableRowList.java
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/TableRowList.java
index 4323fa458b..6049c8807b 100644
---
a/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/TableRowList.java
+++
b/endorsed/src/org.apache.sis.util/main/org/apache/sis/util/internal/shared/TableRowList.java
@@ -17,8 +17,8 @@
package org.apache.sis.util.internal.shared;
import java.util.AbstractList;
-import java.text.Format;
import java.util.Locale;
+import java.text.Format;
import org.apache.sis.io.TableAppender;
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java
index d3ac2dd4a2..ffbeb07625 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Curve.java
@@ -35,9 +35,9 @@ import org.apache.sis.geometries.curve.Rhumb;
import org.apache.sis.geometries.curve.Spiral;
import org.apache.sis.geometries.internal.shared.DefaultReversedCurve;
import org.apache.sis.maths.Array;
+import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
index 86990d308e..73922149d2 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometries.java
@@ -57,6 +57,7 @@ import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.SampleSystem;
import org.apache.sis.maths.Vector3D;
import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
import org.apache.sis.referencing.CRS;
@@ -69,7 +70,6 @@ import
org.apache.sis.referencing.internal.shared.AxisDirections;
import org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.SimpleInternationalString;
-import org.apache.sis.maths.Vector;
/**
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 0a00125ccb..28c33b334c 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
@@ -119,9 +119,9 @@ 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.apache.sis.maths.Vector;
import org.apache.sis.measure.NumberRange;
import org.apache.sis.measure.Range;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/SIS.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/SIS.java
index 78f186fbc7..077eb6edca 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/SIS.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/SIS.java
@@ -57,11 +57,11 @@ 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.apache.sis.maths.Vector;
import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.util.Classes;
import org.apache.sis.util.internal.shared.Strings;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/Wrapper.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/Wrapper.java
index d373dec20a..07dcc7f1b1 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/Wrapper.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/adapter/Wrapper.java
@@ -59,6 +59,7 @@ import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.maths.Array;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
import org.apache.sis.referencing.CRS;
@@ -67,7 +68,6 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Debug;
import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java
index 5907bde516..37bbdfc4bb 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/ArrayDataPoints.java
@@ -32,8 +32,8 @@ import org.apache.sis.maths.DataType;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.SampleSystem;
-import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.maths.Vector;
+import org.apache.sis.util.ArgumentChecks;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java
index 23d0318920..927c1c4448 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/internal/shared/DefaultDataPoints.java
@@ -23,8 +23,8 @@ import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.DataPointsType;
import org.apache.sis.maths.ReadOnly;
-import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.maths.Vector;
+import org.apache.sis.util.ArgumentChecks;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
index 977134e7dc..77aba3d270 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveComparator.java
@@ -28,8 +28,8 @@ import org.apache.sis.geometries.curve.LineString;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.surface.Triangle;
import org.apache.sis.maths.Array;
-import org.apache.sis.referencing.CRS;
import org.apache.sis.maths.Vector;
+import org.apache.sis.referencing.CRS;
/**
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 b21baf76c0..dcc96ec751 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
@@ -48,10 +48,10 @@ 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.apache.sis.maths.Vector;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java
index 3491eccfe0..4855d171e5 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/SutherlandHodgman.java
@@ -21,7 +21,6 @@ import java.util.List;
import org.apache.sis.maths.Maths;
import org.apache.sis.maths.Vector;
import org.apache.sis.maths.Vectors;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java
index 035ef742c2..3b1f0d8caf 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/To3D.java
@@ -32,9 +32,9 @@ import org.apache.sis.maths.Array;
import org.apache.sis.maths.Cursor;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Vector;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java
index 698b0366c0..b656b2fb26 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TINBuilder.java
@@ -37,9 +37,9 @@ import org.apache.sis.geometries.surface.Triangle;
import org.apache.sis.maths.Array;
import org.apache.sis.maths.Maths;
import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java
index 1e3806bfd0..9a857659d6 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/simplify/greedyinsert/TinDistance.java
@@ -21,7 +21,6 @@ import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.surface.Triangle;
import org.apache.sis.maths.Maths;
import org.apache.sis.maths.Vector;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java
index 73fded065b..2a73af2664 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/EarClipping.java
@@ -29,9 +29,9 @@ import org.apache.sis.maths.Array;
import org.apache.sis.maths.Maths;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.Vector;
import static org.apache.sis.maths.Vectors.*;
import org.apache.sis.util.ArraysExt;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java
index 2598c3a742..afd2a15a39 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/triangulate/delaunay/Delaunay.java
@@ -35,7 +35,6 @@ import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.Vector;
import org.apache.sis.maths.Vectors;
import org.apache.sis.util.ArgumentChecks;
-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 7bf801d438..3bb630ae25 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
@@ -31,8 +31,8 @@ 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.maths.ReadOnly;
-import org.apache.sis.referencing.internal.shared.ShapeUtilities;
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/Cylinder.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Cylinder.java
index 72532087cc..afb3967b1e 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Cylinder.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Cylinder.java
@@ -32,7 +32,6 @@ import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.Vector;
import org.apache.sis.maths.Vectors;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Ellipsoid.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Ellipsoid.java
index 4ca477efb1..679bcdb8e1 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Ellipsoid.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Ellipsoid.java
@@ -39,11 +39,11 @@ import org.apache.sis.maths.DataType;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Vector;
import org.apache.sis.util.ArgumentChecks;
// Specific to the geoapi-4.0 branch:
import org.opengis.metadata.Identifier;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java
index ab2c8b1405..af09fd9b2a 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/solid/Sphere.java
@@ -38,11 +38,11 @@ import org.apache.sis.maths.DataType;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.ReadOnly;
import org.apache.sis.maths.SampleSystem;
+import org.apache.sis.maths.Vector;
import org.apache.sis.util.ArgumentChecks;
// Specific to the geoapi-4.0 branch:
import org.opengis.metadata.Identifier;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/PreparedTIN.java
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/PreparedTIN.java
index aee2d1210e..16bf3b2815 100644
---
a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/PreparedTIN.java
+++
b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/surface/PreparedTIN.java
@@ -41,7 +41,6 @@ import org.apache.sis.maths.Vector2D;
import org.apache.sis.maths.Vectors;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometryTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometryTest.java
index 0687e3d550..0c68c094c5 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometryTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometryTest.java
@@ -42,7 +42,7 @@ public abstract class GeometryTest {
protected static final CoordinateReferenceSystem CRS_3D =
CommonCRS.WGS84.geographic3D();
/**
- * Tolerance threshold on the measurements and on the coordinates.
+ * Tolerance threshold on the measurements and on the coordinates.
* For rounding errors of the floating point arithmetic.
*/
protected static final double TOLERANCE = 1E-9;
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PointTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PointTest.java
index 3c17cec0c8..23eb7874c8 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PointTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PointTest.java
@@ -21,12 +21,12 @@ import java.util.Map;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.referencing.CommonCRS;
+import org.apache.sis.maths.Vector;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Disabled;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java
index 2b6d7bb0fb..7a9eef2f14 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/adapter/ShapeConverterTest.java
@@ -40,11 +40,11 @@ import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.geometries.surface.MultiPolygon;
import org.apache.sis.geometries.surface.Polygon;
import org.apache.sis.maths.Vector2D;
+import org.apache.sis.maths.Vector;
// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LineStringTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LineStringTest.java
index a52872d2c7..af21feb2e5 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LineStringTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LineStringTest.java
@@ -19,7 +19,6 @@ package org.apache.sis.geometries.curve;
import javax.measure.Quantity;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometry;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.geometries.point.MultiPoint;
import org.apache.sis.measure.Units;
@@ -27,6 +26,7 @@ import org.apache.sis.measure.Units;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LinearRingTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LinearRingTest.java
index 28c8efcf08..f417ac7c03 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LinearRingTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/LinearRingTest.java
@@ -18,13 +18,13 @@ package org.apache.sis.geometries.curve;
import javax.measure.Quantity;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.measure.Units;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/MultiLineStringTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/MultiLineStringTest.java
index ac9fa36195..293a56bea8 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/MultiLineStringTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/curve/MultiLineStringTest.java
@@ -17,15 +17,15 @@
package org.apache.sis.geometries.curve;
import javax.measure.Quantity;
-import org.apache.sis.geometries.Geometry;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.GeometryTest;
+import org.apache.sis.geometries.Geometry;
import org.apache.sis.measure.Units;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java
index 77f31375ea..81fcb3d960 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveTest.java
@@ -19,12 +19,12 @@ package org.apache.sis.geometries.mesh;
import java.util.Arrays;
import java.util.List;
import org.apache.sis.geometries.Geometries;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.maths.NDArrays;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/AbstractD9IMTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/AbstractD9IMTest.java
index f565b90ac1..9d1c1e51cd 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/AbstractD9IMTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/AbstractD9IMTest.java
@@ -60,7 +60,7 @@ public abstract class AbstractD9IMTest {
public static final CoordinateReferenceSystem CRS_2D =
CommonCRS.WGS84.geographic();
/**
- * Tolerance threshold on the measurements computed by the operations.
+ * Tolerance threshold on the measurements computed by the operations.
* For floating point arithmetic errors.
*/
protected static final double TOLERANCE = 1E-9;
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
index 9c44627a76..0e070fdc77 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/SutherlandHogmanTest.java
@@ -20,11 +20,11 @@ import java.util.List;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.Vector2D;
import org.apache.sis.maths.Array;
+import org.apache.sis.maths.Vector;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java
index 3ae2d11bcf..bba29012a0 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/To3DTest.java
@@ -23,13 +23,13 @@ import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.maths.NDArrays;
+import org.apache.sis.maths.Vector;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/WithinDistanceTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/WithinDistanceTest.java
index fdb6331048..bf1f9cff14 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/WithinDistanceTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/WithinDistanceTest.java
@@ -21,10 +21,9 @@ import org.apache.sis.geometries.Geometry;
import org.apache.sis.measure.Quantities;
import org.apache.sis.measure.Units;
+// Test dependencies
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
-// Test dependencies
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import org.junit.jupiter.api.Test;
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 6649cb944f..7ca22c67f8 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
@@ -17,13 +17,13 @@
package org.apache.sis.geometries.point;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.geometries.Point;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/MultiPolygonTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/MultiPolygonTest.java
index f49dceb235..1d6b586334 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/MultiPolygonTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/MultiPolygonTest.java
@@ -19,13 +19,13 @@ package org.apache.sis.geometries.surface;
import javax.measure.Quantity;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometry;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.measure.Units;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PolygonTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PolygonTest.java
index 3b272fd9d0..48cdb40bf9 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PolygonTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PolygonTest.java
@@ -19,13 +19,13 @@ package org.apache.sis.geometries.surface;
import javax.measure.Quantity;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometry;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.measure.Units;
// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PreparedTINTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PreparedTINTest.java
index 8c0dc632b8..c0055ae9a3 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PreparedTINTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/PreparedTINTest.java
@@ -19,7 +19,6 @@ package org.apache.sis.geometries.surface;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.maths.NDArrays;
@@ -30,6 +29,7 @@ import org.apache.sis.referencing.CommonCRS;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/TriangleTest.java
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/TriangleTest.java
index 71cf51e844..d394f4755f 100644
---
a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/TriangleTest.java
+++
b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/surface/TriangleTest.java
@@ -18,7 +18,6 @@ package org.apache.sis.geometries.surface;
import org.apache.sis.geometries.DataPoints;
import org.apache.sis.geometries.GeometryFactory;
-import org.apache.sis.geometries.GeometryTest;
import org.apache.sis.geometries.curve.LinearRing;
import org.apache.sis.maths.Array;
import org.apache.sis.maths.NDArrays;
@@ -28,6 +27,7 @@ import org.apache.sis.referencing.CommonCRS;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.apache.sis.geometries.GeometryTest;
/**
diff --git
a/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java
b/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java
index c4514c2c12..4001aef534 100644
---
a/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java
+++
b/incubator/src/org.apache.sis.referencing.dggs/test/org/apache/sis/referencing/dggs/AbstractDggrsTest.java
@@ -38,6 +38,7 @@ import org.apache.sis.geometries.surface.Polygon;
import org.apache.sis.maths.Vector2D;
import org.apache.sis.maths.NDArrays;
import org.apache.sis.maths.Vectors;
+import org.apache.sis.maths.Vector;
import org.apache.sis.referencing.GeodeticCalculator;
import org.apache.sis.referencing.CommonCRS;
import org.apache.sis.util.iso.Names;
@@ -50,7 +51,6 @@ import org.apache.sis.storage.rs.CodeIterator;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.apache.sis.maths.Vector;
/**
diff --git
a/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geopose/LocalTangentPlane.java
b/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geopose/LocalTangentPlane.java
index bf66e34dcb..32227e0f60 100644
---
a/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geopose/LocalTangentPlane.java
+++
b/incubator/src/org.apache.sis.storage.json/main/org/apache/sis/storage/geopose/LocalTangentPlane.java
@@ -18,13 +18,6 @@ package org.apache.sis.storage.geopose;
import java.util.Map;
import javax.measure.Unit;
-import org.apache.sis.measure.Units;
-import org.apache.sis.referencing.CommonCRS;
-import org.apache.sis.referencing.crs.DefaultDerivedCRS;
-import org.apache.sis.referencing.cs.DefaultCartesianCS;
-import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
-import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
-import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.crs.GeographicCRS;
@@ -34,6 +27,13 @@ import org.opengis.referencing.cs.CoordinateSystemAxis;
import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.OperationMethod;
import org.opengis.util.FactoryException;
+import org.apache.sis.measure.Units;
+import org.apache.sis.referencing.CommonCRS;
+import org.apache.sis.referencing.crs.DefaultDerivedCRS;
+import org.apache.sis.referencing.cs.DefaultCartesianCS;
+import org.apache.sis.referencing.cs.DefaultCoordinateSystemAxis;
+import org.apache.sis.referencing.operation.DefaultCoordinateOperationFactory;
+import
org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
/**
diff --git
a/optional/src/org.apache.sis.referencing.database/main/org/apache/sis/resources/embedded/EmbeddedResources.java
b/optional/src/org.apache.sis.referencing.database/main/org/apache/sis/resources/embedded/EmbeddedResources.java
index 31dd1da8e6..e1aa3f3e3b 100644
---
a/optional/src/org.apache.sis.referencing.database/main/org/apache/sis/resources/embedded/EmbeddedResources.java
+++
b/optional/src/org.apache.sis.referencing.database/main/org/apache/sis/resources/embedded/EmbeddedResources.java
@@ -33,11 +33,11 @@ import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import javax.sql.DataSource;
import org.hsqldb.jdbc.JDBCDataSource;
+import org.apache.sis.util.Workaround;
import org.apache.sis.util.internal.shared.MetadataServices;
import org.apache.sis.metadata.sql.internal.shared.Initializer;
import org.apache.sis.setup.InstallationResources;
import org.apache.sis.system.DataDirectory;
-import org.apache.sis.util.Workaround;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.util.resources.Errors;
