You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2025/07/21 14:54:59 UTC
(sis) branch geoapi-4.0 updated: Post-merge automatic reorganization of imports order.
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 2225f00d04 Post-merge automatic reorganization of imports order.
2225f00d04 is described below
commit 2225f00d046ae22df213be9d773f4ac3c2bb7b09
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Mon Jul 21 16:54:38 2025 +0200
Post-merge automatic reorganization of imports order.
---
.../apache/sis/feature/StringJoinOperation.java | 2 +-
.../apache/sis/filter/DefaultFilterFactory.java | 2 +-
.../apache/sis/geometry/wrapper/Geometries.java | 2 +-
.../sis/geometry/wrapper/GeometryWrapper.java | 2 -
.../sis/geometry/wrapper/jts/ConverterTo2D.java | 2 +-
.../org/apache/sis/geometry/wrapper/jts/JTS.java | 2 +-
.../org/apache/sis/metadata/MetadataStandard.java | 2 +-
.../referencing/datum/DefaultDatumEnsemble.java | 4 +-
.../operation/provider/AbstractProvider.java | 2 +-
.../operation/provider/Geographic2Dto3D.java | 2 +-
.../transform/EllipsoidToCentricTransform.java | 2 +-
.../operation/transform/LinearTransform1D.java | 2 +
.../operation/transform/OnewayLinearTransform.java | 6 ++-
.../referencing/privy/ReferencingUtilities.java | 2 -
.../sis/storage/sql/feature/InfoStatements.java | 2 +-
.../org/apache/sis/storage/sql/feature/Table.java | 2 +-
.../org/apache/sis/geometries/AttributesType.java | 5 ++-
.../main/org/apache/sis/geometries/BBox.java | 7 ++--
.../main/org/apache/sis/geometries/Bearing.java | 1 +
.../org/apache/sis/geometries/BoundaryType.java | 1 +
.../org/apache/sis/geometries/CompoundCurve.java | 1 +
.../main/org/apache/sis/geometries/Curve.java | 3 +-
.../apache/sis/geometries/CurveInterpolation.java | 1 +
.../main/org/apache/sis/geometries/Empty.java | 1 +
.../main/org/apache/sis/geometries/Geometries.java | 31 +++++++-------
.../main/org/apache/sis/geometries/Geometry.java | 1 +
.../apache/sis/geometries/GeometryCollection.java | 3 +-
.../org/apache/sis/geometries/GeometryFactory.java | 3 +-
.../org/apache/sis/geometries/GeometryType.java | 1 +
.../org/apache/sis/geometries/GeometryVisitor.java | 1 +
.../main/org/apache/sis/geometries/Knot.java | 1 +
.../main/org/apache/sis/geometries/LineString.java | 7 ++--
.../main/org/apache/sis/geometries/LinearRing.java | 1 +
.../main/org/apache/sis/geometries/MultiCurve.java | 1 +
.../org/apache/sis/geometries/MultiLineString.java | 1 +
.../main/org/apache/sis/geometries/MultiPoint.java | 3 +-
.../org/apache/sis/geometries/MultiPolygon.java | 1 +
.../org/apache/sis/geometries/MultiPolyhedron.java | 1 +
.../org/apache/sis/geometries/MultiSurface.java | 1 +
.../main/org/apache/sis/geometries/OBBox.java | 5 ++-
.../org/apache/sis/geometries/OffsetCurve.java | 1 +
.../main/org/apache/sis/geometries/Orientable.java | 1 +
.../main/org/apache/sis/geometries/Point.java | 8 ++--
.../org/apache/sis/geometries/PointSequence.java | 5 ++-
.../main/org/apache/sis/geometries/Polygon.java | 3 +-
.../apache/sis/geometries/PolyhedralSurface.java | 1 +
.../main/org/apache/sis/geometries/Polyhedron.java | 1 +
.../org/apache/sis/geometries/PreparedTIN.java | 17 ++++----
.../main/org/apache/sis/geometries/Primitive.java | 1 +
.../main/org/apache/sis/geometries/Prism.java | 3 +-
.../org/apache/sis/geometries/ProductCurve.java | 5 ++-
.../main/org/apache/sis/geometries/Solid.java | 1 +
.../apache/sis/geometries/SolidInterpolation.java | 1 +
.../main/org/apache/sis/geometries/Sphere.java | 5 ++-
.../main/org/apache/sis/geometries/Surface.java | 3 +-
.../sis/geometries/SurfaceInterpolation.java | 1 +
.../main/org/apache/sis/geometries/TIN.java | 1 +
.../main/org/apache/sis/geometries/Triangle.java | 10 ++---
.../apache/sis/geometries/TriangulatedSurface.java | 1 +
.../main/org/apache/sis/geometries/conics/Arc.java | 3 +-
.../org/apache/sis/geometries/conics/Circle.java | 1 +
.../sis/geometries/conics/CircularString.java | 1 +
.../org/apache/sis/geometries/conics/Conic.java | 3 +-
.../org/apache/sis/geometries/conics/ConicArc.java | 1 +
.../org/apache/sis/geometries/conics/Ellipse.java | 1 +
.../apache/sis/geometries/conics/EllipticArc.java | 1 +
.../apache/sis/geometries/conicsurfaces/Cone.java | 1 +
.../sis/geometries/conicsurfaces/Cylinder.java | 1 +
.../sis/geometries/conicsurfaces/Sphere.java | 1 +
.../sis/geometries/cs/CurveRelativeDirection.java | 1 +
.../apache/sis/geometries/cs/FixedDirection.java | 1 +
.../geometries/cs/GeometricCoordinateSystem.java | 5 ++-
.../org/apache/sis/geometries/cs/Projection.java | 1 +
.../sis/geometries/cs/ReferenceDirection.java | 1 +
.../sis/geometries/cs/RelativeDirection.java | 1 +
.../org/apache/sis/geometries/cs/Rotation.java | 1 +
.../apache/sis/geometries/geodesics/Geodesic.java | 5 ++-
.../sis/geometries/griddedsolid/BSolidSpline.java | 1 +
.../griddedsolid/ParametricCurveSolid.java | 7 ++--
.../org/apache/sis/geometries/index/KdTree.java | 1 +
.../sis/geometries/index/MortonIterator.java | 1 +
.../apache/sis/geometries/math/AbstractCursor.java | 1 +
.../apache/sis/geometries/math/AbstractTuple.java | 3 +-
.../sis/geometries/math/AbstractTupleArray.java | 1 +
.../main/org/apache/sis/geometries/math/Maths.java | 1 +
.../org/apache/sis/geometries/math/Matrix.java | 1 +
.../org/apache/sis/geometries/math/Matrix2D.java | 1 +
.../org/apache/sis/geometries/math/Matrix3D.java | 1 +
.../org/apache/sis/geometries/math/Matrix4D.java | 1 +
.../apache/sis/geometries/math/SampleSystem.java | 5 ++-
.../main/org/apache/sis/geometries/math/Tuple.java | 3 +-
.../org/apache/sis/geometries/math/TupleArray.java | 5 ++-
.../geometries/math/TupleArrayConcatenated.java | 3 +-
.../math/TupleArrayCursorUnmodifiable.java | 1 +
.../apache/sis/geometries/math/TupleArrayND.java | 3 +-
.../sis/geometries/math/TupleArraySpliterator.java | 1 +
.../geometries/math/TupleArrayUnmodifiable.java | 3 +-
.../apache/sis/geometries/math/TupleArrays.java | 5 ++-
.../sis/geometries/math/TupleUnmodifiable.java | 3 +-
.../org/apache/sis/geometries/math/Vector.java | 1 +
.../org/apache/sis/geometries/math/Vector1D.java | 1 +
.../org/apache/sis/geometries/math/Vector2D.java | 1 +
.../org/apache/sis/geometries/math/Vector3D.java | 1 +
.../org/apache/sis/geometries/math/Vector4D.java | 1 +
.../org/apache/sis/geometries/math/VectorND.java | 1 +
.../org/apache/sis/geometries/math/Vectors.java | 10 ++---
.../apache/sis/geometries/mesh/MeshPrimitive.java | 5 ++-
.../geometries/mesh/MeshPrimitiveComparator.java | 7 ++--
.../sis/geometries/mesh/MeshPrimitiveIndexes.java | 1 +
.../sis/geometries/mesh/MeshPrimitiveVisitor.java | 6 +--
.../sis/geometries/mesh/MultiMeshPrimitive.java | 7 ++--
.../geometries/operation/GeometryOperations.java | 49 +++++++++++-----------
.../apache/sis/geometries/operation/Operation.java | 1 +
.../geometries/operation/OperationException.java | 1 +
.../geometries/operation/SutherlandHodgman.java | 5 ++-
.../operation/spatialanalysis2d/Buffer.java | 1 +
.../operation/spatialanalysis2d/ConvexHull.java | 1 +
.../operation/spatialanalysis2d/Difference.java | 1 +
.../operation/spatialanalysis2d/Distance.java | 1 +
.../operation/spatialanalysis2d/ISOBand.java | 19 +++++----
.../operation/spatialanalysis2d/ISOLine.java | 11 ++---
.../operation/spatialanalysis2d/Intersection.java | 1 +
.../operation/spatialanalysis2d/IsoInclusion.java | 1 +
.../operation/spatialanalysis2d/SymDifference.java | 1 +
.../operation/spatialanalysis2d/Union.java | 1 +
.../operation/spatialedition/ComputeAttribute.java | 7 ++--
.../geometries/operation/spatialedition/To3D.java | 5 ++-
.../operation/spatialedition/ToPrimitive.java | 1 +
.../operation/spatialedition/Transform.java | 7 ++--
.../operation/spatialrelations2d/Contains.java | 1 +
.../operation/spatialrelations2d/Crosses.java | 1 +
.../operation/spatialrelations2d/Disjoint.java | 1 +
.../operation/spatialrelations2d/Equals.java | 1 +
.../operation/spatialrelations2d/Intersects.java | 1 +
.../operation/spatialrelations2d/LocateAlong.java | 1 +
.../spatialrelations2d/LocateBetween.java | 1 +
.../operation/spatialrelations2d/Overlaps.java | 1 +
.../operation/spatialrelations2d/Relate.java | 1 +
.../operation/spatialrelations2d/Touches.java | 1 +
.../operation/spatialrelations2d/Within.java | 1 +
.../parametriccurvesurfaces/BilinearGrid.java | 1 +
.../geometries/parametriccurvesurfaces/Cone.java | 1 +
.../parametriccurvesurfaces/Cylinder.java | 1 +
.../ParametricCurveSurface.java | 9 ++--
.../geometries/parametriccurvesurfaces/Sphere.java | 1 +
.../sis/geometries/polynomials/FunctionArc.java | 5 ++-
.../sis/geometries/polynomials/FunctionCurve.java | 3 +-
.../geometries/polynomials/PolynomialCurve.java | 1 +
.../sis/geometries/polynomials/RealFunction.java | 3 +-
.../sis/geometries/polynomials/RealPolynomial.java | 3 +-
.../sis/geometries/privy/AbstractGeometry.java | 7 ++--
.../apache/sis/geometries/privy/ArraySequence.java | 15 +++----
.../privy/DefaultGeometryCollection.java | 3 +-
.../sis/geometries/privy/DefaultLineString.java | 1 +
.../sis/geometries/privy/DefaultLinearRing.java | 1 +
.../sis/geometries/privy/DefaultMultiCurve.java | 3 +-
.../geometries/privy/DefaultMultiLineString.java | 1 +
.../sis/geometries/privy/DefaultMultiPoint.java | 5 ++-
.../sis/geometries/privy/DefaultMultiPolygon.java | 1 +
.../sis/geometries/privy/DefaultMultiSurface.java | 3 +-
.../apache/sis/geometries/privy/DefaultPoint.java | 11 ++---
.../sis/geometries/privy/DefaultPointSequence.java | 5 ++-
.../sis/geometries/privy/DefaultPolygon.java | 7 ++--
.../apache/sis/geometries/processor/Processor.java | 1 +
.../sis/geometries/processor/ProcessorUtils.java | 7 ++--
.../processor/spatialanalysis2d/Distance.java | 1 +
.../processor/spatialanalysis2d/Intersection.java | 25 +++++------
.../processor/spatialedition/ComputeAttribute.java | 5 ++-
.../geometries/processor/spatialedition/To3D.java | 5 ++-
.../processor/spatialedition/ToPrimitive.java | 1 +
.../processor/spatialedition/Transform.java | 3 +-
.../processor/spatialrelations2d/Contains.java | 1 +
.../org/apache/sis/geometries/rhumb/Rhumb.java | 5 ++-
.../sis/geometries/simplify/TextureAtlas.java | 1 +
.../sis/geometries/simplify/greedyinsert/Edge.java | 1 +
.../simplify/greedyinsert/TINBuilder.java | 3 +-
.../simplify/greedyinsert/TinDistance.java | 1 +
.../simplify/greedyinsert/WTriangle.java | 13 +++---
.../apache/sis/geometries/spirals/Clothoid.java | 1 +
.../org/apache/sis/geometries/spirals/Spiral.java | 7 ++--
.../sis/geometries/splines/BSplineCurve.java | 1 +
.../org/apache/sis/geometries/splines/Bezier.java | 1 +
.../apache/sis/geometries/splines/CubicSpline.java | 1 +
.../apache/sis/geometries/splines/KnotType.java | 1 +
.../org/apache/sis/geometries/splines/NURB.java | 1 +
.../sis/geometries/splines/PolynomialSpline.java | 3 +-
.../apache/sis/geometries/splines/SplineCurve.java | 5 ++-
.../sis/geometries/splines/SplineCurveForm.java | 1 +
.../geometries/splinesurfaces/BSplineSurface.java | 9 ++--
.../splinesurfaces/BSplineSurfaceForm.java | 1 +
.../sis/geometries/triangulate/EarClipping.java | 7 ++--
.../geometries/triangulate/delaunay/Delaunay.java | 3 +-
.../triangulate/delaunay/OrientedEdge.java | 11 ++---
.../triangulate/delaunay/OrientedTriangle.java | 15 +++----
.../org/apache/sis/geometries/GeometriesTest.java | 8 ++--
.../org/apache/sis/geometries/PreparedTINTest.java | 9 ++--
.../org/apache/sis/geometries/TriangleTest.java | 3 ++
.../sis/geometries/index/MortonIteratorTest.java | 2 +
.../geometries/math/AbstractTupleArrayTest.java | 5 ++-
.../sis/geometries/math/AbstractTupleTest.java | 2 +
.../sis/geometries/math/AbstractVectorTest.java | 2 +
.../org/apache/sis/geometries/math/MathsTest.java | 2 +
.../apache/sis/geometries/math/QuaternionTest.java | 3 ++
.../math/TupleArrayConcatenatedTest.java | 2 +
.../sis/geometries/math/TupleArrayNbTest.java | 1 +
.../sis/geometries/math/TupleArrayNfTest.java | 1 +
.../sis/geometries/math/TupleArrayNiTest.java | 1 +
.../sis/geometries/math/TupleArrayNlTest.java | 1 +
.../sis/geometries/math/TupleArrayNsTest.java | 1 +
.../sis/geometries/math/TupleArrayNubTest.java | 1 +
.../sis/geometries/math/TupleArrayNuiTest.java | 1 +
.../sis/geometries/math/TupleArrayNusTest.java | 1 +
.../sis/geometries/math/TupleArraysTest.java | 5 ++-
.../apache/sis/geometries/math/VectorXbTest.java | 1 +
.../apache/sis/geometries/math/VectorXdTest.java | 1 +
.../apache/sis/geometries/math/VectorXfTest.java | 1 +
.../apache/sis/geometries/math/VectorXiTest.java | 1 +
.../apache/sis/geometries/math/VectorXlTest.java | 1 +
.../apache/sis/geometries/math/VectorXsTest.java | 1 +
.../apache/sis/geometries/math/VectorXubTest.java | 1 +
.../apache/sis/geometries/math/VectorXuiTest.java | 1 +
.../apache/sis/geometries/math/VectorXusTest.java | 1 +
.../apache/sis/geometries/math/VectorsTest.java | 9 ++--
.../sis/geometries/mesh/PrimitiveIndexesTest.java | 7 +++-
.../apache/sis/geometries/mesh/PrimitiveTest.java | 3 ++
.../sis/geometries/mesh/PrimitiveVisitorTest.java | 9 ++--
.../geometries/operation/SutherlandHogmanTest.java | 3 ++
.../operation/spatialanalysis2d/IsoBandTest.java | 9 ++--
.../sis/geometries/privy/ArraySequenceTest.java | 5 ++-
.../processor/spatialanalysis2d/DistanceTest.java | 3 ++
.../spatialanalysis2d/IntersectionTest.java | 6 ++-
.../processor/spatialedition/To3DTest.java | 7 +++-
.../processor/spatialedition/ToPrimitiveTest.java | 9 ++--
.../processor/spatialedition/TransformTest.java | 11 +++--
.../sis/geometries/simplify/TextureAtlasTest.java | 3 ++
.../triangulate/delaunay/DelaunayTest.java | 5 ++-
.../triangulate/delaunay/OrientedEdgeTest.java | 5 ++-
.../sis/storage/shapefile/ShapefileStore.java | 4 +-
.../sis/storage/shapefile/ShapefileStoreTest.java | 2 +-
239 files changed, 546 insertions(+), 284 deletions(-)
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
index c1c035a7dd..c6dd9105ce 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/feature/StringJoinOperation.java
@@ -33,10 +33,10 @@ import org.apache.sis.util.UnconvertibleObjectException;
import org.apache.sis.util.CharSequences;
import org.apache.sis.util.Classes;
import org.apache.sis.util.privy.CollectionsExt;
+import org.apache.sis.util.privy.UnmodifiableArrayList;
import org.apache.sis.converter.SurjectiveConverter;
import org.apache.sis.feature.privy.AttributeConvention;
import org.apache.sis.feature.internal.Resources;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
index 9133bec01e..004d0985ae 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/filter/DefaultFilterFactory.java
@@ -33,7 +33,6 @@ import org.apache.sis.filter.sqlmm.Registry;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.iso.AbstractFactory;
import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.privy.Strings;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import java.util.Iterator;
@@ -42,6 +41,7 @@ import org.opengis.filter.*;
import org.opengis.feature.Feature;
import org.opengis.filter.capability.AvailableFunction;
import org.opengis.filter.capability.FilterCapabilities;
+import org.apache.sis.util.privy.Strings;
import org.apache.sis.util.privy.AbstractMap;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
index 00c44ba879..03e50c87b4 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/Geometries.java
@@ -41,7 +41,7 @@ import org.apache.sis.setup.GeometryLibrary;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.util.collection.BackingStoreException;
-// Specific to the geoapi-3.1 and 4.0 branches:
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.feature.Feature;
// Specific to the geoapi-4.0 branch:
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
index 0ccc9fb2c4..401258b6a3 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/GeometryWrapper.java
@@ -50,8 +50,6 @@ import org.opengis.geometry.TransfiniteSet;
import org.opengis.geometry.complex.Complex;
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.DistanceOperatorName;
-
-// Specific to the geoapi-4.0 branch:
import org.opengis.coordinate.MismatchedDimensionException;
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ConverterTo2D.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ConverterTo2D.java
index c65b0bde62..cc4e0d2486 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ConverterTo2D.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/ConverterTo2D.java
@@ -19,7 +19,6 @@ package org.apache.sis.geometry.wrapper.jts;
import java.lang.reflect.Array;
import java.util.function.BiFunction;
import java.util.function.UnaryOperator;
-import org.apache.sis.util.resources.Errors;
import org.locationtech.jts.geom.CoordinateSequence;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryCollection;
@@ -31,6 +30,7 @@ import org.locationtech.jts.geom.MultiPoint;
import org.locationtech.jts.geom.MultiPolygon;
import org.locationtech.jts.geom.Point;
import org.locationtech.jts.geom.Polygon;
+import org.apache.sis.util.resources.Errors;
/**
diff --git a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
index 114d41572b..3a207803a8 100644
--- a/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
+++ b/endorsed/src/org.apache.sis.feature/main/org/apache/sis/geometry/wrapper/jts/JTS.java
@@ -28,6 +28,7 @@ import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.LinearRing;
import org.locationtech.jts.geom.MultiPolygon;
import org.locationtech.jts.geom.Polygon;
+import org.locationtech.jts.geom.GeometryCollection;
import org.opengis.metadata.Identifier;
import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -46,7 +47,6 @@ import org.apache.sis.metadata.iso.extent.DefaultGeographicBoundingBox;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.privy.Constants;
import static org.apache.sis.geometry.wrapper.Geometries.LOGGER;
-import org.locationtech.jts.geom.GeometryCollection;
/**
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
index 6027ca5296..a4b418d2a0 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/MetadataStandard.java
@@ -26,10 +26,10 @@ import java.util.concurrent.ConcurrentHashMap;
import java.io.IOException;
import java.io.Serializable;
import java.io.ObjectInputStream;
-import org.apache.sis.metadata.privy.SecondaryTrait;
import org.opengis.metadata.Identifier;
import org.opengis.metadata.ExtendedElementInformation;
import org.opengis.metadata.citation.Citation;
+import org.apache.sis.metadata.privy.SecondaryTrait;
import org.apache.sis.util.Classes;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.collection.TreeTable;
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 1e831e468d..3345849257 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
@@ -21,9 +21,7 @@ import java.util.List;
import java.util.Collection;
import java.util.Iterator;
import java.util.Objects;
-import java.util.Optional;
import java.util.function.Function;
-import java.time.temporal.Temporal;
import org.opengis.referencing.IdentifiedObject;
import org.opengis.referencing.crs.EngineeringCRS;
import org.opengis.referencing.crs.GeodeticCRS;
@@ -52,6 +50,8 @@ import org.apache.sis.util.Utilities;
import org.apache.sis.util.resources.Errors;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.util.Optional;
+import java.time.temporal.Temporal;
import org.opengis.referencing.crs.ParametricCRS;
import org.opengis.referencing.datum.DatumEnsemble;
import org.opengis.referencing.datum.ParametricDatum;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
index 5605224192..6e0f6437a9 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/AbstractProvider.java
@@ -18,9 +18,9 @@ package org.apache.sis.referencing.operation.provider;
import java.util.Map;
import java.util.logging.Logger;
+import jakarta.xml.bind.annotation.XmlTransient;
import javax.measure.Unit;
import javax.measure.quantity.Length;
-import jakarta.xml.bind.annotation.XmlTransient;
import org.opengis.parameter.ParameterValue;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
index db79328b9b..7ca99fc10a 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/provider/Geographic2Dto3D.java
@@ -25,8 +25,8 @@ import org.opengis.referencing.operation.Conversion;
import org.opengis.referencing.operation.MathTransform;
import org.apache.sis.metadata.iso.citation.Citations;
import org.apache.sis.parameter.ParameterBuilder;
-import org.apache.sis.util.privy.Constants;
import org.apache.sis.parameter.Parameters;
+import org.apache.sis.util.privy.Constants;
import org.apache.sis.measure.Units;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
index 03128847a6..bcda59084c 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
@@ -45,6 +45,7 @@ import org.apache.sis.util.privy.DoubleDouble;
import org.apache.sis.util.resources.Errors;
import org.apache.sis.referencing.privy.Formulas;
import org.apache.sis.referencing.privy.DirectPositionView;
+import org.apache.sis.referencing.privy.ReferencingUtilities;
import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.referencing.datum.DefaultEllipsoid;
import org.apache.sis.referencing.operation.matrix.Matrix3;
@@ -54,7 +55,6 @@ import org.apache.sis.referencing.operation.provider.MapProjection;
import org.apache.sis.referencing.operation.provider.GeocentricToGeographic;
import org.apache.sis.referencing.operation.provider.GeographicToGeocentric;
import org.apache.sis.referencing.operation.provider.Geographic3Dto2D;
-import org.apache.sis.referencing.privy.ReferencingUtilities;
import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.metadata.iso.citation.Citations;
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
index 1f6a735f1e..71339e9338 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/LinearTransform1D.java
@@ -32,6 +32,8 @@ import org.apache.sis.referencing.operation.provider.Affine;
import org.apache.sis.referencing.internal.Arithmetic;
import org.apache.sis.util.ComparisonMode;
import org.apache.sis.util.privy.DoubleDouble;
+
+
/*
* We really want to use doubleToRawLongBits, not doubleToLongBits, because the
* coverage module needs the raw bits for differentiating various NaN values.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OnewayLinearTransform.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OnewayLinearTransform.java
index c5f4f31a45..3a72184125 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OnewayLinearTransform.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/operation/transform/OnewayLinearTransform.java
@@ -17,8 +17,6 @@
package org.apache.sis.referencing.operation.transform;
import java.io.Serializable;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
import org.opengis.geometry.DirectPosition;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.parameter.ParameterDescriptorGroup;
@@ -26,6 +24,10 @@ import org.opengis.referencing.operation.Matrix;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import java.nio.DoubleBuffer;
+import java.nio.FloatBuffer;
+
/**
* A transform which is linear in the forward direction, but non-linear in the inverse direction.
diff --git a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java
index c58e78f33b..6b17576c97 100644
--- a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java
+++ b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/privy/ReferencingUtilities.java
@@ -51,8 +51,6 @@ import org.apache.sis.referencing.internal.VerticalDatumTypes;
import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-
/**
* A set of static methods working on GeoAPI referencing objects.
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
index a8aae84641..1bf546c8a2 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/InfoStatements.java
@@ -53,11 +53,11 @@ import org.apache.sis.system.CommonExecutor;
import org.apache.sis.system.Modules;
import org.apache.sis.util.Localized;
import org.apache.sis.util.Utilities;
+import org.apache.sis.util.Workaround;
import org.apache.sis.util.privy.Constants;
import org.apache.sis.io.wkt.Convention;
import org.apache.sis.io.wkt.WKTFormat;
import org.apache.sis.io.wkt.Warnings;
-import org.apache.sis.util.Workaround;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
import org.opengis.metadata.Identifier;
diff --git a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
index 1a56e7149e..c5711cc715 100644
--- a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
+++ b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Table.java
@@ -29,8 +29,8 @@ import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import org.opengis.util.GenericName;
import org.opengis.geometry.Envelope;
-import org.apache.sis.filter.privy.XPath;
import org.apache.sis.filter.InvalidXPathException;
+import org.apache.sis.filter.privy.XPath;
import org.apache.sis.storage.AbstractFeatureSet;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.InternalDataStoreException;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java
index eb6de35ab8..b9aeefc8c3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/AttributesType.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.DataType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.geometries.math.DataType;
+
/**
* 3D Engine decompose draw calls by primitive types.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java
index 4c019c55e7..37e858d113 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BBox.java
@@ -18,12 +18,13 @@ package org.apache.sis.geometries;
import java.util.HashMap;
import java.util.Map;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vectors;
-import org.apache.sis.geometry.GeneralEnvelope;
import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.math.Vectors;
+import org.apache.sis.geometry.GeneralEnvelope;
+
/**
* A BBOx geometry defined by lower and upper corners.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Bearing.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Bearing.java
index 3699040978..5709e06bf0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Bearing.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Bearing.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BoundaryType.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BoundaryType.java
index 80929e0231..5b621e156c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BoundaryType.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/BoundaryType.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CompoundCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CompoundCurve.java
index 408fa0650f..28cb6ffc2b 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CompoundCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CompoundCurve.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries;
+
/**
*
* @todo
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 87029368eb..663c59e6bc 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
@@ -16,12 +16,13 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.math.Vector;
import java.util.List;
import javax.measure.quantity.Length;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
+import org.apache.sis.geometries.math.Vector;
+
/**
* A Curve is a 1-dimensional geometric object usually stored as a sequence of Points, with the subtype of Curve
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CurveInterpolation.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CurveInterpolation.java
index a3d68eaf19..2d76080a0c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CurveInterpolation.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/CurveInterpolation.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Empty.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Empty.java
index dc639c46dc..99f92b0be2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Empty.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Empty.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
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 afc37270cc..157cd5d6d8 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
@@ -27,7 +27,22 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.CoordinateSequence;
import javax.measure.Unit;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.IdentifiedObject;
+import static org.opengis.referencing.IdentifiedObject.ALIAS_KEY;
+import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.cs.AxisDirection;
+import org.opengis.referencing.cs.CoordinateSystem;
+import org.opengis.referencing.cs.CoordinateSystemAxis;
+import org.opengis.referencing.datum.EngineeringDatum;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.Matrix;
+import org.opengis.util.FactoryException;
+import org.opengis.util.InternationalString;
import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.Tuple;
@@ -55,21 +70,7 @@ import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.SimpleInternationalString;
import org.apache.sis.util.Static;
import org.apache.sis.util.Utilities;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.CoordinateSequence;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.IdentifiedObject;
-import static org.opengis.referencing.IdentifiedObject.ALIAS_KEY;
-import static org.opengis.referencing.IdentifiedObject.NAME_KEY;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.cs.AxisDirection;
-import org.opengis.referencing.cs.CoordinateSystem;
-import org.opengis.referencing.cs.CoordinateSystemAxis;
-import org.opengis.referencing.datum.EngineeringDatum;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.Matrix;
-import org.opengis.util.FactoryException;
-import org.opengis.util.InternationalString;
+
/**
* Mesh geometry utilities.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometry.java
index ddc6b0dcbc..7d1799eb47 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometry.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Geometry.java
@@ -25,6 +25,7 @@ import org.opengis.geometry.Envelope;
import org.opengis.metadata.Metadata;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* Parent interface of any geometry.
* <p>
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java
index c02c8c0444..7f58353071 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryCollection.java
@@ -17,10 +17,11 @@
package org.apache.sis.geometries;
import java.util.Set;
-import org.apache.sis.geometry.GeneralEnvelope;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.Envelope;
+import org.apache.sis.geometry.GeneralEnvelope;
+
/**
* A GeometryCollection is a geometric object that is a collection of some number of geometric objects.
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 34386da45c..c173a8cf8c 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
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.privy.ArraySequence;
@@ -32,7 +33,7 @@ import org.apache.sis.geometries.privy.DefaultMultiSurface;
import org.apache.sis.geometries.privy.DefaultPoint;
import org.apache.sis.geometries.privy.DefaultPolygon;
import org.apache.sis.geometries.privy.DefaultTriangle;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
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 0bea13f99d..e9b4d1e07a 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
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java
index 26d274a097..deac5dbc57 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/GeometryVisitor.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Knot.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Knot.java
index 921a322a88..4044b66a5f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Knot.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Knot.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LineString.java
index 0059fda299..e4e5e36424 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LineString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LineString.java
@@ -16,14 +16,15 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.privy.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
import javax.measure.quantity.Length;
-import org.apache.sis.geometry.GeneralEnvelope;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.geometries.privy.AbstractGeometry;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometry.GeneralEnvelope;
+
/**
* A LineString is a Curve with linear interpolation between Points.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LinearRing.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LinearRing.java
index 405424b47e..7d30951115 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LinearRing.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/LinearRing.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Tuple;
+
/**
* A LinearRing is a LineString that is both closed and simple.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiCurve.java
index a8ddf5255a..1c5d5e65bc 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiCurve.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries;
+
/**
* A MultiCurve is a 1-dimensional GeometryCollection whose elements are Curves
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java
index e6e186fe04..3a31c9abc1 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiLineString.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Tuple;
+
/**
* A MultiLineString is a MultiCurve whose elements are LineStrings.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java
index 7a1373d080..cb2b7dbd47 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPoint.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.geometries;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Tuple;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* A MultiPoint is a 0-dimensional GeometryCollection.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolygon.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolygon.java
index bc1c77d20d..8c39f0959e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolygon.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolygon.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries;
import org.apache.sis.geometries.privy.AbstractGeometry;
+
/**
* A MultiPolygon is a MultiSurface whose elements are Polygons.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolyhedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolyhedron.java
index 94f8c68028..e4fb4cff40 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolyhedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiPolyhedron.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries;
+
/**
* A multi-polyhedron is a collection of polyhedron objects. These are arbitrary aggregations.
* There is no assumption regarding the topological relationships between the polyhedron objects,
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiSurface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiSurface.java
index b49af1deef..069f454581 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiSurface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/MultiSurface.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries;
+
/**
* A MultiSurface is a 2-dimensional GeometryCollection whose elements are Surfaces, all using coordinates from
* the same coordinate reference system. The geometric interiors of any two Surfaces in a MultiSurface may not intersect
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java
index 6eb2031672..61d25faf20 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OBBox.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.geometries;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vectors;
import org.apache.sis.geometry.GeneralEnvelope;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* An oriented BBox geometry defined by a center and half length axis.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OffsetCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OffsetCurve.java
index af18da98c1..131ee86f69 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OffsetCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/OffsetCurve.java
@@ -20,6 +20,7 @@ import javax.measure.quantity.Length;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Orientable.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Orientable.java
index 6f89f8790c..6f821aa5b8 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Orientable.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Orientable.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java
index ec139bd97f..f943d47d74 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Point.java
@@ -16,15 +16,15 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.privy.AbstractGeometry;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.geometry.GeneralEnvelope;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.geometries.privy.AbstractGeometry;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.geometry.GeneralEnvelope;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java
index f15c3b76bc..ee6f70c1ff 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PointSequence.java
@@ -16,14 +16,15 @@
*/
package org.apache.sis.geometries;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometry.GeneralEnvelope;
-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/Polygon.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polygon.java
index 1fe4653634..fa1f1cf2aa 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polygon.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polygon.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.privy.AbstractGeometry;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.coordinate.GriddedSurface;
+import org.apache.sis.geometries.privy.AbstractGeometry;
+
/**
* A Polygon is a planar Surface defined by 1 exterior boundary and 0 or more interior boundaries.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PolyhedralSurface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PolyhedralSurface.java
index 12308beaf5..170acdedc3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PolyhedralSurface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PolyhedralSurface.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
* A PolyhedralSurface is a contiguous collection of polygons, which share common boundary segments.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polyhedron.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polyhedron.java
index 44139b1556..4c6562e391 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polyhedron.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Polyhedron.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries;
import java.util.List;
+
/**
* A solid is defined by its bounding surfaces. Each bounding surface is a closed, simple surface, also called a shell.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java
index 7d9d288f2f..587cb78163 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/PreparedTIN.java
@@ -22,6 +22,14 @@ import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.stream.Stream;
+import org.locationtech.jts.index.quadtree.Quadtree;
+import org.opengis.coverage.CannotEvaluateException;
+import org.opengis.geometry.DirectPosition;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vector2D;
@@ -31,14 +39,7 @@ import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Utilities;
-import org.locationtech.jts.index.quadtree.Quadtree;
-import org.opengis.coverage.CannotEvaluateException;
-import org.opengis.geometry.DirectPosition;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
+
/**
* Decorate a TIN, adding optimized search capabilities.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Primitive.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Primitive.java
index 2c9aefa76c..beae94729c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Primitive.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Primitive.java
@@ -20,6 +20,7 @@ import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Prism.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Prism.java
index 0944445987..23ffa4eb7d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Prism.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Prism.java
@@ -16,8 +16,9 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.measure.NumberRange;
import org.opengis.referencing.crs.SingleCRS;
+import org.apache.sis.measure.NumberRange;
+
/**
* A prism is defined by a base shape (e.g. Polygon or Circle) that is then extruded from some optional lower limit to an upper limit.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/ProductCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/ProductCurve.java
index af6f6b4350..199ad7bcb3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/ProductCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/ProductCurve.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.cs.Projection;
import java.util.List;
-import org.apache.sis.measure.Range;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.cs.Projection;
+import org.apache.sis.measure.Range;
+
/**
*
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 10733cbb8d..fd9c662293 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
@@ -23,6 +23,7 @@ import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
+
/**
*
* @author Johann Sorel (Geomatys
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SolidInterpolation.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SolidInterpolation.java
index fa4d1f16e8..27860718b5 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SolidInterpolation.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SolidInterpolation.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java
index eaafc7b462..f1e18d1086 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Sphere.java
@@ -16,14 +16,15 @@
*/
package org.apache.sis.geometries;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vectors;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.ArgumentChecks;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* A sphere geometry defined by a center and a radius.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java
index 46efc410a1..11162926a9 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Surface.java
@@ -16,12 +16,13 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.math.Vector;
import java.util.List;
import javax.measure.quantity.Length;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
+import org.apache.sis.geometries.math.Vector;
+
/**
* A Surface is a 2-dimensional geometric object.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SurfaceInterpolation.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SurfaceInterpolation.java
index 4fcd6b6b2d..1fc5979ca0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SurfaceInterpolation.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/SurfaceInterpolation.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java
index 5e24fcef88..b949ac0eaa 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TIN.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Tuple;
+
/**
* A TIN (triangulated irregular network) is a PolyhedralSurface consisting only of Triangle patches.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java
index 46add7381d..fabf57e021 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/Triangle.java
@@ -16,19 +16,19 @@
*/
package org.apache.sis.geometries;
-import org.apache.sis.geometries.privy.AbstractGeometry;
import java.util.Collections;
import java.util.List;
+import static org.opengis.annotation.Specification.ISO_19107;
+import org.opengis.annotation.UML;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vector2D;
import org.apache.sis.geometries.math.Vector3D;
import org.apache.sis.geometries.math.Vectors;
-import static org.opengis.annotation.Specification.ISO_19107;
-import org.opengis.annotation.UML;
-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/TriangulatedSurface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TriangulatedSurface.java
index e17591c3a7..f1367e2b16 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TriangulatedSurface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/TriangulatedSurface.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Arc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Arc.java
index 8344dbe514..f6c2c6d51a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Arc.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Arc.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries.conics;
-import org.apache.sis.geometries.math.Vector;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
+import org.apache.sis.geometries.math.Vector;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Circle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Circle.java
index b40ab4bd03..5d5326e84e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Circle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Circle.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.conics;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/CircularString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/CircularString.java
index ece8270291..b7f19733d4 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/CircularString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/CircularString.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.conics;
import org.apache.sis.geometries.Curve;
+
/**
* @todo
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Conic.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Conic.java
index 196dfd1aa7..e51f9f7081 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Conic.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Conic.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries.conics;
-import org.apache.sis.geometries.Curve;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
+import org.apache.sis.geometries.Curve;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java
index 726fc09037..43c40d2250 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/ConicArc.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.conics;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Ellipse.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Ellipse.java
index c26c640214..8fb81f9e30 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Ellipse.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/Ellipse.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.conics;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/EllipticArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/EllipticArc.java
index 911f69567f..1e9136a066 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/EllipticArc.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conics/EllipticArc.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.conics;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cone.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cone.java
index 22248b042c..bec2719686 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cone.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cone.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.conicsurfaces;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cylinder.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cylinder.java
index 089445b027..21402d00fb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cylinder.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Cylinder.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.conicsurfaces;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Sphere.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Sphere.java
index 8bdf085dd3..ad9320e62f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Sphere.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/conicsurfaces/Sphere.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.conicsurfaces;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/CurveRelativeDirection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/CurveRelativeDirection.java
index a596a38c69..be06486705 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/CurveRelativeDirection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/CurveRelativeDirection.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.cs;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/FixedDirection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/FixedDirection.java
index b4c67f3f6d..b2b1003ae3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/FixedDirection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/FixedDirection.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.cs;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java
index 85f413a166..b3c821bff0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/GeometricCoordinateSystem.java
@@ -16,12 +16,13 @@
*/
package org.apache.sis.geometries.cs;
-import org.apache.sis.geometries.Bearing;
-import org.apache.sis.geometries.math.Vector;
import javax.measure.quantity.Length;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
+import org.apache.sis.geometries.Bearing;
+import org.apache.sis.geometries.math.Vector;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Projection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Projection.java
index 65cf35e7e0..c406b5259b 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Projection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Projection.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.cs;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/ReferenceDirection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/ReferenceDirection.java
index b187e2375d..7a0ad44305 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/ReferenceDirection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/ReferenceDirection.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.cs;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/RelativeDirection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/RelativeDirection.java
index f6c0693299..5c097ff36d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/RelativeDirection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/RelativeDirection.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.cs;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Rotation.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Rotation.java
index 0b10079528..a00756457d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Rotation.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/cs/Rotation.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.cs;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/geodesics/Geodesic.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/geodesics/Geodesic.java
index 12fa0d6240..1368fbb115 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/geodesics/Geodesic.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/geodesics/Geodesic.java
@@ -16,10 +16,11 @@
*/
package org.apache.sis.geometries.geodesics;
-import org.apache.sis.geometries.Curve;
-import org.apache.sis.geometries.CurveInterpolation;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.Curve;
+import org.apache.sis.geometries.CurveInterpolation;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/BSolidSpline.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/BSolidSpline.java
index 976fb64f7c..df95e242fa 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/BSolidSpline.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/BSolidSpline.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.griddedsolid;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/ParametricCurveSolid.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/ParametricCurveSolid.java
index f4a066983a..458414b552 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/ParametricCurveSolid.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/griddedsolid/ParametricCurveSolid.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.geometries.griddedsolid;
-import org.apache.sis.geometries.Curve;
-import org.apache.sis.geometries.GeometryType;
-import org.apache.sis.geometries.Solid;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
+import org.apache.sis.geometries.Curve;
+import org.apache.sis.geometries.GeometryType;
+import org.apache.sis.geometries.Solid;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java
index 6e3925b4e3..41b5072882 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/KdTree.java
@@ -26,6 +26,7 @@ import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.Tuple;
+
/**
* Adapted version of KdTree from :
* https://stackoverflow.com/questions/253767/kdtree-implementation-in-java
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/MortonIterator.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/MortonIterator.java
index ae0af3d36d..f683097fb1 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/MortonIterator.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/index/MortonIterator.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.index;
import org.apache.sis.util.ArgumentChecks;
+
/**
* Morton iterator utilities.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractCursor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractCursor.java
index 5a0e59991d..fda709389e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractCursor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractCursor.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTuple.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTuple.java
index e917f9cbb3..a04cb798de 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTuple.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTuple.java
@@ -17,9 +17,10 @@
package org.apache.sis.geometries.math;
import java.util.Arrays;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Utilities;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTupleArray.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTupleArray.java
index e7920c9b3c..3cac3715f0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTupleArray.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/AbstractTupleArray.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java
index 094cba60bf..074f0b5fdb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Maths.java
@@ -26,6 +26,7 @@ import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.util.Static;
import org.apache.sis.util.privy.Numerics;
+
/**
* Origin : Adapted from Unlicense-Lib
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix.java
index 611d888e7f..4b48b4a653 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.math;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.matrix.NoninvertibleMatrixException;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix2D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix2D.java
index f2efce9787..e576a2324f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix2D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix2D.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.math;
import org.apache.sis.referencing.operation.matrix.Matrix2;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix3D.java
index 233c9d36f1..a6e71d1673 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix3D.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.math;
import org.apache.sis.referencing.operation.matrix.Matrix3;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix4D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix4D.java
index 16d6f39217..f2b9ef2e95 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix4D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Matrix4D.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.math;
import org.apache.sis.referencing.operation.matrix.Matrix4;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SampleSystem.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SampleSystem.java
index b9e62c63d0..85b7ccd5c8 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SampleSystem.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/SampleSystem.java
@@ -19,13 +19,14 @@ package org.apache.sis.geometries.math;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.GenericName;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.collection.BackingStoreException;
import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.iso.Names;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.GenericName;
+
/**
* Experimental class to store multisamples dimensions.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Tuple.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Tuple.java
index 6baa7c1da0..4371d1c1a2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Tuple.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Tuple.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries.math;
-import org.apache.sis.util.Utilities;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+import org.apache.sis.util.Utilities;
+
/**
* A tuple is an array of values.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArray.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArray.java
index 694b91a98c..cb3df277a5 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArray.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArray.java
@@ -18,12 +18,13 @@ package org.apache.sis.geometries.math;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
-import org.apache.sis.referencing.CRS;
-import org.apache.sis.util.ArgumentChecks;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
+import org.apache.sis.referencing.CRS;
+import org.apache.sis.util.ArgumentChecks;
+
/**
* A tuple array is fixed size array of tuples.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayConcatenated.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayConcatenated.java
index 90ea5f0d0e..7501ce0742 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayConcatenated.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayConcatenated.java
@@ -17,11 +17,12 @@
package org.apache.sis.geometries.math;
import java.util.Arrays;
-import org.apache.sis.util.ArgumentChecks;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
+import org.apache.sis.util.ArgumentChecks;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayCursorUnmodifiable.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayCursorUnmodifiable.java
index 7881a23c91..381210b061 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayCursorUnmodifiable.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayCursorUnmodifiable.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.math;
import org.apache.sis.util.ArgumentChecks;
+
/**
* Unmodifiable tuple array cursor.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayND.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayND.java
index b1f440380e..1714b431f3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayND.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayND.java
@@ -18,8 +18,9 @@ package org.apache.sis.geometries.math;
import java.util.Arrays;
import java.util.List;
-import org.apache.sis.util.ArgumentChecks;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.util.ArgumentChecks;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArraySpliterator.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArraySpliterator.java
index 288c885657..a6d31651a7 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArraySpliterator.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArraySpliterator.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.math;
import java.util.Spliterator;
import java.util.function.Consumer;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayUnmodifiable.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayUnmodifiable.java
index 9e174f5399..1e26217883 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayUnmodifiable.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrayUnmodifiable.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries.math;
-import org.apache.sis.util.ArgumentChecks;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.opengis.util.FactoryException;
+import org.apache.sis.util.ArgumentChecks;
+
/**
* Unmodifiable tuple array.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java
index 93e6c3c147..2860da8934 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleArrays.java
@@ -22,6 +22,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.Random;
import java.util.concurrent.RecursiveAction;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.FactoryException;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.geometries.BBox;
import org.apache.sis.geometries.Geometries;
@@ -30,8 +32,7 @@ import org.apache.sis.measure.NumberRange;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Static;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleUnmodifiable.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleUnmodifiable.java
index de90f8e181..299dc3b6c0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleUnmodifiable.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/TupleUnmodifiable.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.geometries.math;
-import org.apache.sis.util.ArgumentChecks;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.util.ArgumentChecks;
+
/**
* Unmodifiable tuple.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector.java
index c1cbf5f4ba..b096193829 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
* A vector is a subclass of tuple with arithmetic operations defined.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector1D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector1D.java
index 36af27e8ed..b6f049a7a0 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector1D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector1D.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector2D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector2D.java
index 95e8eb2dc2..715cf904c6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector2D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector2D.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector3D.java
index 5a659bdb0c..405b778c4d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector3D.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector4D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector4D.java
index 2365c9d4d3..d8dfe18223 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector4D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vector4D.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/VectorND.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/VectorND.java
index 7921d14923..5268a6f6fe 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/VectorND.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/VectorND.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java
index 8bcd5385f8..7384c7c020 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/math/Vectors.java
@@ -16,17 +16,17 @@
*/
package org.apache.sis.geometries.math;
-import org.apache.sis.measure.NumberRange;
-import org.apache.sis.referencing.operation.matrix.MatrixSIS;
-import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.Static;
import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.Envelope;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+import org.apache.sis.measure.NumberRange;
+import org.apache.sis.referencing.operation.matrix.MatrixSIS;
+import org.apache.sis.referencing.operation.transform.MathTransforms;
+import org.apache.sis.util.ArgumentChecks;
+import org.apache.sis.util.Static;
/**
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
index 747eda5a0a..9888771d2d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitive.java
@@ -30,6 +30,8 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.BBox;
import org.apache.sis.geometries.Geometries;
@@ -58,8 +60,7 @@ import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.privy.UnmodifiableArrayList;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* A mesh geometry is a structure which mimics the natural primitives used
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 06ab99584d..677b2bd57b 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
@@ -16,9 +16,6 @@
*/
package org.apache.sis.geometries.mesh;
-import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.TupleArray;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -29,8 +26,12 @@ import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.util.Utilities;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java
index 71ba41c86b..ed2ac479e4 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveIndexes.java
@@ -31,6 +31,7 @@ import org.apache.sis.geometries.math.TupleArrayCursor;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.math.Vector1D;
+
/**
* Various algorithms to transform primitive indexes.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
index 114c86519c..e138f8c6d3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MeshPrimitiveVisitor.java
@@ -16,9 +16,6 @@
*/
package org.apache.sis.geometries.mesh;
-import org.apache.sis.geometries.math.TupleArray;
-import org.apache.sis.geometries.math.TupleArrayCursor;
-import org.apache.sis.geometries.math.TupleArrays;
import java.util.HashSet;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryFactory;
@@ -26,6 +23,9 @@ import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.math.TupleArray;
+import org.apache.sis.geometries.math.TupleArrayCursor;
+import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.util.ArgumentChecks;
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MultiMeshPrimitive.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MultiMeshPrimitive.java
index c97c03644d..4a91844abd 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MultiMeshPrimitive.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/mesh/MultiMeshPrimitive.java
@@ -24,13 +24,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import org.apache.sis.geometries.privy.AbstractGeometry;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.GeometryCollection;
+import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Utilities;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.TransformException;
+
/**
* MultiPrimitive is a group of primitive defining a more complex geometry.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java
index 654fb0c11e..0a47545af6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/GeometryOperations.java
@@ -16,15 +16,36 @@
*/
package org.apache.sis.geometries.operation;
-import org.apache.sis.geometries.math.SampleSystem;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.ServiceLoader;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import javax.measure.quantity.Length;
+import static org.opengis.annotation.Specification.ISO_19107;
+import org.opengis.annotation.UML;
+import org.opengis.geometry.DirectPosition;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.LinearRing;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.geometries.math.DataType;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.math.TupleArray;
+import org.apache.sis.geometries.math.TupleArrays;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
+import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.operation.spatialanalysis2d.Buffer;
import org.apache.sis.geometries.operation.spatialanalysis2d.ConvexHull;
import org.apache.sis.geometries.operation.spatialanalysis2d.Difference;
@@ -48,28 +69,8 @@ import org.apache.sis.geometries.operation.spatialrelations2d.Relate;
import org.apache.sis.geometries.operation.spatialrelations2d.Touches;
import org.apache.sis.geometries.operation.spatialrelations2d.Within;
import org.apache.sis.geometries.processor.Processor;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.TupleArray;
-import org.apache.sis.geometries.math.TupleArrays;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Optional;
-import java.util.ServiceLoader;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-import javax.measure.quantity.Length;
import org.apache.sis.util.Static;
-import static org.opengis.annotation.Specification.ISO_19107;
-import org.opengis.annotation.UML;
-import org.opengis.geometry.DirectPosition;
-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/Operation.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Operation.java
index 7fb11e6178..2e63093b16 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Operation.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/Operation.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.util.ArgumentChecks;
+
/**
* A geometric operation which involve one or two geometries and produces one or many results.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/OperationException.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/OperationException.java
index c422565826..7d22d297f9 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/OperationException.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/OperationException.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.operation;
+
/**
* Raised if an geometry operation fails.
*
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 7b7d34fc02..026f4ebf32 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
@@ -16,13 +16,14 @@
*/
package org.apache.sis.geometries.operation;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.sis.geometries.processor.spatialanalysis2d.Distance;
import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.Vector;
import org.apache.sis.geometries.math.Vectors;
-import java.util.ArrayList;
-import java.util.List;
+
/**
* The Sutherland–Hodgman algorithm is an algorithm used for clipping polygons.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Buffer.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Buffer.java
index 4d5604e340..a7cec47ecb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Buffer.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Buffer.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a geometric object that represents all Points whose distance from this geometric object is less than
* or equal to distance. Calculations are in the spatial reference system of this geometric object. Because of the
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ConvexHull.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ConvexHull.java
index e2b568b775..24dab9c41b 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ConvexHull.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ConvexHull.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a geometric object that represents the convex hull of this geometric object.
* Convex hulls, being dependent on straight lines, can be accurately represented in linear interpolations
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Difference.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Difference.java
index fd8403e0a0..9330d69b1d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Difference.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Difference.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a geometric object that represents the Point set difference of this geometric object with anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Distance.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Distance.java
index fdb98b5c7d..71bf1ffa6c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Distance.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Distance.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns the shortest distance between any two Points in the two geometric objects as calculated in the
* spatial reference system of this geometric object.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java
index 2901e12fd1..b1403d9971 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOBand.java
@@ -16,19 +16,10 @@
*/
package org.apache.sis.geometries.operation.spatialanalysis2d;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
-import org.apache.sis.geometries.PointSequence;
-import org.apache.sis.geometries.Triangle;
-import static org.apache.sis.geometries.operation.spatialanalysis2d.ISOLine.interpolateToArray;
-import org.apache.sis.geometries.math.Tuple;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.sis.measure.NumberRange;
-import org.apache.sis.util.ArgumentChecks;
-import org.opengis.util.FactoryException;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryCollection;
import org.locationtech.jts.geom.GeometryFactory;
@@ -36,6 +27,16 @@ import org.locationtech.jts.geom.Polygon;
import org.locationtech.jts.geom.TopologyException;
import org.locationtech.jts.geom.impl.PackedCoordinateSequence;
import org.locationtech.jts.geom.impl.PackedCoordinateSequenceFactory;
+import org.opengis.util.FactoryException;
+import org.apache.sis.geometries.PointSequence;
+import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
+import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
+import static org.apache.sis.geometries.operation.spatialanalysis2d.ISOLine.interpolateToArray;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.measure.NumberRange;
+import org.apache.sis.util.ArgumentChecks;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
index 0426464c2e..5419b2d86e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/ISOLine.java
@@ -19,10 +19,13 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
+import org.locationtech.jts.geom.Coordinate;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
+import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.TupleArray;
@@ -31,9 +34,7 @@ import org.apache.sis.geometries.math.Vector3D;
import org.apache.sis.geometries.math.Vectors;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
-import org.locationtech.jts.geom.Coordinate;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Intersection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Intersection.java
index 7815b32137..41a625be8f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Intersection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Intersection.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a geometric object that represents the Point set intersection of this geometric object with anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/IsoInclusion.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/IsoInclusion.java
index 61caf667de..0473ab8cf5 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/IsoInclusion.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/IsoInclusion.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.mesh.MeshPrimitive;
+
/**
* Enum used in {@linkplain ISOBand isoband computation} to manage the integration of
* {@linkplain MeshPrimitive.Triangles triangles} whose vertices are all located at the intersection altitude of
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/SymDifference.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/SymDifference.java
index 07aac31a7e..50969eba93 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/SymDifference.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/SymDifference.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a geometric object that represents the Point set symmetric difference of this geometric
* object with anotherGeometry.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Union.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Union.java
index 5a7098b275..0361dcafc2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Union.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialanalysis2d/Union.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialanalysis2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a geometric object that represents the Point set union of this geometric object with anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ComputeAttribute.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ComputeAttribute.java
index a8c7fec6bf..9f9e4cdfef 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ComputeAttribute.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ComputeAttribute.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.geometries.operation.spatialedition;
-import org.apache.sis.geometries.math.SampleSystem;
+import java.util.function.Function;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.Point;
-import org.apache.sis.geometries.operation.Operation;
+import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.DataType;
import org.apache.sis.geometries.math.Tuple;
-import java.util.function.Function;
+import org.apache.sis.geometries.operation.Operation;
+
/**
* Create a new attribute or update an existing one.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/To3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/To3D.java
index c12d83e02a..b47ff2cb38 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/To3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/To3D.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries.operation.spatialedition;
+import java.util.function.Consumer;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
import org.apache.sis.geometries.math.Tuple;
-import java.util.function.Consumer;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* Add a Z axis on the geometry and configure it's ordinates.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ToPrimitive.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ToPrimitive.java
index 5c7a881093..ffe6f48b2c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ToPrimitive.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/ToPrimitive.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialedition;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Transform geometry to a Primitive or MultiPrimitive.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/Transform.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/Transform.java
index 3e36fbc895..cde06a33a3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/Transform.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialedition/Transform.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.geometries.operation.spatialedition;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.referencing.CRS;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.util.FactoryException;
+
/**
* Returns a geometric object that represents a transformed version of the geometry.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Contains.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Contains.java
index 1f592ba675..60bf11238e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Contains.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Contains.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially contains” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Crosses.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Crosses.java
index a5c8c0c9cf..8e8f25c6f2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Crosses.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Crosses.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially crosses” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Disjoint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Disjoint.java
index 396b9f94e9..d4c9cf5a42 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Disjoint.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Disjoint.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially disjoint” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Equals.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Equals.java
index 1c7d1fcbe6..df2bdb2d97 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Equals.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Equals.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially equal” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Intersects.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Intersects.java
index a2f50fa029..9e56220975 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Intersects.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Intersects.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially intersects” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateAlong.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateAlong.java
index 51dd6813a9..5f358a4e72 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateAlong.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateAlong.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a derived geometry collection value that matches the specified m coordinate value.
* See Subclause 6.1.2.6 “Measures on Geometry” for more details.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateBetween.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateBetween.java
index e924f420bb..8cf2552692 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateBetween.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/LocateBetween.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns a derived geometry collection value that matches the specified range of m coordinate values inclusively.
* See Subclause 6.1.2.6 “Measures on Geometry” for more details.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Overlaps.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Overlaps.java
index 6e9a868779..4d5c483b71 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Overlaps.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Overlaps.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially overlaps” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Relate.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Relate.java
index 0aca95befc..a4c9b068d8 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Relate.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Relate.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object is spatially related to anotherGeometry by testing for intersections between
* the interior, boundary and exterior of the two geometric objects as specified by the values in the
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Touches.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Touches.java
index 63ef516745..c443ed6f15 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Touches.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Touches.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially touches” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Within.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Within.java
index a350df9111..d86d5f0489 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Within.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/operation/spatialrelations2d/Within.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.operation.spatialrelations2d;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
+
/**
* Returns TRUE if this geometric object “spatially within” anotherGeometry.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/BilinearGrid.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/BilinearGrid.java
index 0d230aefb8..65c779a840 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/BilinearGrid.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/BilinearGrid.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.parametriccurvesurfaces;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cone.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cone.java
index 99583d528e..bd960338f9 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cone.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cone.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.parametriccurvesurfaces;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cylinder.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cylinder.java
index 49ed40a058..77b9cf2ad6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cylinder.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Cylinder.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.parametriccurvesurfaces;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/ParametricCurveSurface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/ParametricCurveSurface.java
index 4f949b543a..f4e2c5b0e6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/ParametricCurveSurface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/ParametricCurveSurface.java
@@ -16,15 +16,16 @@
*/
package org.apache.sis.geometries.parametriccurvesurfaces;
-import org.apache.sis.geometries.Curve;
-import org.apache.sis.geometries.GeometryType;
-import org.apache.sis.geometries.Knot;
-import org.apache.sis.geometries.Surface;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.DirectPosition;
import org.opengis.referencing.ReferenceSystem;
+import org.apache.sis.geometries.Curve;
+import org.apache.sis.geometries.GeometryType;
+import org.apache.sis.geometries.Knot;
+import org.apache.sis.geometries.Surface;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Sphere.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Sphere.java
index b14ba1e1ed..f56e24e843 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Sphere.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/parametriccurvesurfaces/Sphere.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.parametriccurvesurfaces;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java
index 05340bd939..50d1def263 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionArc.java
@@ -16,10 +16,11 @@
*/
package org.apache.sis.geometries.polynomials;
-import org.apache.sis.geometries.math.Vector;
-import org.apache.sis.measure.Range;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.math.Vector;
+import org.apache.sis.measure.Range;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionCurve.java
index 29b57cceb9..fca71cb56c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/FunctionCurve.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.geometries.polynomials;
-import org.apache.sis.geometries.Curve;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.Curve;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/PolynomialCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/PolynomialCurve.java
index fcdad0a1e4..fb27e94c30 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/PolynomialCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/PolynomialCurve.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.polynomials;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealFunction.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealFunction.java
index f8bc5c0725..c280e1405e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealFunction.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealFunction.java
@@ -18,10 +18,11 @@ package org.apache.sis.geometries.polynomials;
import java.net.URI;
import java.util.List;
-import org.apache.sis.measure.Range;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.util.GenericName;
+import org.apache.sis.measure.Range;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealPolynomial.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealPolynomial.java
index 1569a93e50..4afea452a7 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealPolynomial.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/polynomials/RealPolynomial.java
@@ -18,10 +18,11 @@ package org.apache.sis.geometries.polynomials;
import java.net.URI;
import java.util.List;
-import org.apache.sis.measure.Range;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.util.GenericName;
+import org.apache.sis.measure.Range;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/AbstractGeometry.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/AbstractGeometry.java
index 87acd71bf6..3d99d57182 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/AbstractGeometry.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/AbstractGeometry.java
@@ -16,13 +16,14 @@
*/
package org.apache.sis.geometries.privy;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.TupleArray;
-import org.apache.sis.geometries.math.TupleArrayCursor;
import java.util.HashMap;
import java.util.Map;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.PointSequence;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.math.TupleArray;
+import org.apache.sis.geometries.math.TupleArrayCursor;
+
/**
* Abstract geometry, manages crs only.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/ArraySequence.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/ArraySequence.java
index ea18626fde..7ab287b101 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/ArraySequence.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/ArraySequence.java
@@ -16,24 +16,25 @@
*/
package org.apache.sis.geometries.privy;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.TupleArray;
-import org.apache.sis.geometries.math.TupleArrayCursor;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.BBox;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
+import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.geometries.math.DataType;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.math.TupleArray;
+import org.apache.sis.geometries.math.TupleArrayCursor;
import org.apache.sis.geometries.math.TupleArrays;
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/privy/DefaultGeometryCollection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultGeometryCollection.java
index c6bf60cf9b..cb48c82b2c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultGeometryCollection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultGeometryCollection.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.geometries.privy;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryCollection;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLineString.java
index 1616b46b89..213d2ee467 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLineString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLineString.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.privy;
import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.PointSequence;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLinearRing.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLinearRing.java
index e8702fe943..58ecdeb139 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLinearRing.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultLinearRing.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.privy;
import org.apache.sis.geometries.LinearRing;
import org.apache.sis.geometries.PointSequence;
+
/**
* TODO : add linear ring constraints.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiCurve.java
index 04cd18eb63..626d71bb36 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiCurve.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.geometries.privy;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.MultiCurve;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiLineString.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiLineString.java
index 52cf33fdd6..6c427952a5 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiLineString.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiLineString.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.privy;
import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.MultiLineString;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiPoint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiPoint.java
index 0d3463a522..3eb8740c8a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiPoint.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiPoint.java
@@ -16,12 +16,13 @@
*/
package org.apache.sis.geometries.privy;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.MultiPoint;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
-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/privy/DefaultMultiPolygon.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiPolygon.java
index fb15bbb936..a9c0373555 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiPolygon.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiPolygon.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.privy;
import org.apache.sis.geometries.MultiPolygon;
import org.apache.sis.geometries.Polygon;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiSurface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiSurface.java
index c99e596097..c23499d036 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiSurface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultMultiSurface.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.geometries.privy;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.MultiSurface;
import org.apache.sis.geometries.Surface;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPoint.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPoint.java
index c7acf911c8..e87944e513 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPoint.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPoint.java
@@ -16,15 +16,16 @@
*/
package org.apache.sis.geometries.privy;
-import org.apache.sis.geometries.math.SampleSystem;
-import org.apache.sis.geometries.math.DataType;
-import org.apache.sis.geometries.math.Tuple;
-import org.apache.sis.geometries.math.TupleArrays;
import java.util.Objects;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.geometries.math.SampleSystem;
+import org.apache.sis.geometries.math.DataType;
+import org.apache.sis.geometries.math.Tuple;
+import org.apache.sis.geometries.math.TupleArrays;
+
/**
* Default line implementation.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPointSequence.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPointSequence.java
index cb67373c82..776b30ac38 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPointSequence.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPointSequence.java
@@ -16,14 +16,15 @@
*/
package org.apache.sis.geometries.privy;
-import org.apache.sis.geometries.math.Tuple;
import java.util.Arrays;
import java.util.List;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
+import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.util.ArgumentChecks;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* Point sequence backed by a list of Point.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPolygon.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPolygon.java
index 59a8b57476..0d875e2594 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPolygon.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/privy/DefaultPolygon.java
@@ -18,14 +18,15 @@ package org.apache.sis.geometries.privy;
import java.util.Collections;
import java.util.List;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.LinearRing;
import org.apache.sis.geometries.Polygon;
-import org.apache.sis.util.privy.UnmodifiableArrayList;
import org.apache.sis.util.ArgumentChecks;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.util.privy.UnmodifiableArrayList;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/Processor.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/Processor.java
index f35292316c..b99097ba16 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/Processor.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/Processor.java
@@ -20,6 +20,7 @@ import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.Operation;
import org.apache.sis.geometries.operation.OperationException;
+
/**
* A processor is able to process a single operation type.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java
index 96f200ae32..9f9f71f4f3 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/ProcessorUtils.java
@@ -18,13 +18,14 @@ package org.apache.sis.geometries.processor;
import java.util.ArrayList;
import java.util.List;
+import org.opengis.referencing.crs.CompoundCRS;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.util.Static;
import org.apache.sis.util.Utilities;
-import org.opengis.referencing.crs.CompoundCRS;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Distance.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Distance.java
index 43ebca2ed2..2db333cc19 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Distance.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Distance.java
@@ -24,6 +24,7 @@ import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.Vectors;
+
/**
* Distance 2D processors.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Intersection.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Intersection.java
index b58c1bded2..e68028bd57 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Intersection.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialanalysis2d/Intersection.java
@@ -16,16 +16,25 @@
*/
package org.apache.sis.geometries.processor.spatialanalysis2d;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometries.AttributesType;
-import org.apache.sis.geometries.privy.DefaultPointSequence;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.MultiLineString;
-import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PreparedTIN;
-import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.GeometryFactory;
+import org.apache.sis.geometries.privy.DefaultPointSequence;
+import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
+import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.operation.SutherlandHodgman;
@@ -35,15 +44,7 @@ import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrayCursor;
import org.apache.sis.geometries.math.TupleArrays;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.apache.sis.geometries.GeometryFactory;
-import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ComputeAttribute.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ComputeAttribute.java
index 51151ae4d5..fbb53e5325 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ComputeAttribute.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ComputeAttribute.java
@@ -16,6 +16,8 @@
*/
package org.apache.sis.geometries.processor.spatialedition;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.operation.GeometryOperations;
@@ -23,8 +25,7 @@ import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.processor.Processor;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
-import java.util.ArrayList;
-import java.util.List;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java
index 48ccf14fab..754b5371ed 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/To3D.java
@@ -19,6 +19,8 @@ package org.apache.sis.geometries.processor.spatialedition;
import java.util.HashMap;
import java.util.Map;
import java.util.function.Consumer;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.PointSequence;
@@ -32,8 +34,7 @@ import org.apache.sis.geometries.privy.ArraySequence;
import org.apache.sis.geometries.processor.Processor;
import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.CommonCRS;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java
index 9a91103141..6c42d59832 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/ToPrimitive.java
@@ -30,6 +30,7 @@ import org.apache.sis.geometries.privy.ArraySequence;
import org.apache.sis.geometries.processor.Processor;
import org.apache.sis.geometries.triangulate.EarClipping;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java
index eb613fbf8b..43bc6e286d 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialedition/Transform.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.opengis.referencing.operation.TransformException;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.GeometryFactory;
@@ -34,7 +35,7 @@ import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.privy.ArraySequence;
import org.apache.sis.geometries.processor.Processor;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
-import org.opengis.referencing.operation.TransformException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialrelations2d/Contains.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialrelations2d/Contains.java
index e78f209f53..e5427ba297 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialrelations2d/Contains.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/processor/spatialrelations2d/Contains.java
@@ -30,6 +30,7 @@ import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrayCursor;
import org.apache.sis.geometries.math.Vectors;
+
/**
* Constains 2D processors.
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/rhumb/Rhumb.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/rhumb/Rhumb.java
index c2f6a3a627..1feb8653d5 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/rhumb/Rhumb.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/rhumb/Rhumb.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries.rhumb;
+import static org.opengis.annotation.Specification.ISO_19107;
+import org.opengis.annotation.UML;
import org.apache.sis.geometries.Curve;
import org.apache.sis.geometries.CurveInterpolation;
import org.apache.sis.geometries.Bearing;
-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/simplify/TextureAtlas.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/TextureAtlas.java
index f3bcf07e4a..72210f8141 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/TextureAtlas.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/TextureAtlas.java
@@ -29,6 +29,7 @@ import java.util.UUID;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.util.ArgumentChecks;
+
/**
*
* Creation algorithm from :
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/Edge.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/Edge.java
index 66cd2bc177..3b0b530dfd 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/Edge.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/Edge.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.simplify.greedyinsert;
import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java
index badddff3b0..351d8d211c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TINBuilder.java
@@ -28,6 +28,7 @@ import java.util.function.BiFunction;
import java.util.function.Consumer;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.LinearRing;
import org.apache.sis.geometries.PointSequence;
@@ -39,7 +40,7 @@ import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.Utilities;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* Variant of progressive TIN creation until an error threshold is met.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TinDistance.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TinDistance.java
index a13534da4c..3626dfb456 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TinDistance.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/TinDistance.java
@@ -23,6 +23,7 @@ import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.Vector;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/WTriangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/WTriangle.java
index 929861afaf..8950325012 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/WTriangle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/simplify/greedyinsert/WTriangle.java
@@ -16,20 +16,21 @@
*/
package org.apache.sis.geometries.simplify.greedyinsert;
-import org.apache.sis.geometries.privy.AbstractGeometry;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.BiFunction;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.LinearRing;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.GeometryFactory;
+import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.BiFunction;
-import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.operation.OperationException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* Triangle.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Clothoid.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Clothoid.java
index 3eac8eef4c..ecaeeb76c2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Clothoid.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Clothoid.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.spirals;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Spiral.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Spiral.java
index e59430e10f..2b3565f58f 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Spiral.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/spirals/Spiral.java
@@ -16,12 +16,13 @@
*/
package org.apache.sis.geometries.spirals;
-import org.apache.sis.geometries.Curve;
-import org.apache.sis.geometries.polynomials.RealFunction;
-import org.apache.sis.geometries.math.Vector;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.Curve;
+import org.apache.sis.geometries.polynomials.RealFunction;
+import org.apache.sis.geometries.math.Vector;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/BSplineCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/BSplineCurve.java
index 880d6d2cf7..05fd5e82cc 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/BSplineCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/BSplineCurve.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.splines;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/Bezier.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/Bezier.java
index f343cd6530..05e9c3cae5 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/Bezier.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/Bezier.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.splines;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/CubicSpline.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/CubicSpline.java
index b2a3184721..f63647768a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/CubicSpline.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/CubicSpline.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.splines;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/KnotType.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/KnotType.java
index d005569be7..78104be3cf 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/KnotType.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/KnotType.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.splines;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/NURB.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/NURB.java
index 5cbcda3490..b11f976bf6 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/NURB.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/NURB.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.splines;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java
index bf21a2fd70..bb9f362d60 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/PolynomialSpline.java
@@ -16,9 +16,10 @@
*/
package org.apache.sis.geometries.splines;
-import org.apache.sis.geometries.math.Vector;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.math.Vector;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurve.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurve.java
index 78976c7735..04158026d1 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurve.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurve.java
@@ -16,11 +16,12 @@
*/
package org.apache.sis.geometries.splines;
-import org.apache.sis.geometries.Knot;
-import org.apache.sis.geometries.polynomials.PolynomialCurve;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+import org.apache.sis.geometries.Knot;
+import org.apache.sis.geometries.polynomials.PolynomialCurve;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurveForm.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurveForm.java
index f443bdff16..0a5ec2e23a 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurveForm.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splines/SplineCurveForm.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.splines;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurface.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurface.java
index 0fddc8e4af..3e1dcaab53 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurface.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurface.java
@@ -16,14 +16,15 @@
*/
package org.apache.sis.geometries.splinesurfaces;
-import org.apache.sis.geometries.Knot;
-import org.apache.sis.geometries.GeometryType;
-import org.apache.sis.geometries.parametriccurvesurfaces.ParametricCurveSurface;
-import org.apache.sis.geometries.splines.KnotType;
import java.util.List;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
import org.opengis.geometry.coordinate.BSplineSurfaceForm;
+import org.apache.sis.geometries.Knot;
+import org.apache.sis.geometries.GeometryType;
+import org.apache.sis.geometries.parametriccurvesurfaces.ParametricCurveSurface;
+import org.apache.sis.geometries.splines.KnotType;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurfaceForm.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurfaceForm.java
index ec2c38f820..80e06a2ae2 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurfaceForm.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/splinesurfaces/BSplineSurfaceForm.java
@@ -19,6 +19,7 @@ package org.apache.sis.geometries.splinesurfaces;
import static org.opengis.annotation.Specification.ISO_19107;
import org.opengis.annotation.UML;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java
index d64b3403e9..917063025e 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/EarClipping.java
@@ -16,8 +16,6 @@
*/
package org.apache.sis.geometries.triangulate;
-import org.apache.sis.geometries.math.Maths;
-import static org.apache.sis.geometries.math.Vectors.*;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -25,14 +23,17 @@ import java.util.List;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.LineString;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.Polygon;
+import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.math.Vector2D;
+import static org.apache.sis.geometries.math.Vectors.*;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.util.ArraysExt;
+
/**
* Origin : Adapted from Unlicense-Lib
*
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java
index 81e3c67682..905c436a2c 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/Delaunay.java
@@ -23,6 +23,7 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.opengis.geometry.Envelope;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.index.KdTree;
@@ -35,7 +36,7 @@ import org.apache.sis.geometries.math.Vectors;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.util.ArgumentChecks;
-import org.opengis.geometry.Envelope;
+
/**
* Delaunay triangulation algorithm.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedEdge.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedEdge.java
index f3eb72bd55..7fc6ef13fb 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedEdge.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedEdge.java
@@ -16,17 +16,18 @@
*/
package org.apache.sis.geometries.triangulate.delaunay;
-import org.apache.sis.geometries.privy.AbstractGeometry;
+import java.util.Iterator;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.PointSequence;
+import org.apache.sis.geometries.privy.AbstractGeometry;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.math.Maths;
import org.apache.sis.geometries.math.Tuple;
-import java.util.Iterator;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
+
/**
* A oriented edge is a straight line between from a start point to an end point.
diff --git a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedTriangle.java b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedTriangle.java
index b61258c0ca..6d6ba1b5cd 100644
--- a/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedTriangle.java
+++ b/incubator/src/org.apache.sis.geometry/main/org/apache/sis/geometries/triangulate/delaunay/OrientedTriangle.java
@@ -16,21 +16,22 @@
*/
package org.apache.sis.geometries.triangulate.delaunay;
-import org.apache.sis.geometries.privy.AbstractGeometry;
+import java.awt.geom.Point2D;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.LinearRing;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
-import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.GeometryFactory;
+import org.apache.sis.geometries.privy.AbstractGeometry;
+import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.math.Tuple;
-import java.awt.geom.Point2D;
-import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.referencing.privy.ShapeUtilities;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometriesTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometriesTest.java
index 0359b36016..3e1f395c26 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometriesTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/GeometriesTest.java
@@ -16,14 +16,16 @@
*/
package org.apache.sis.geometries;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.util.FactoryException;
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.Disabled;
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.util.FactoryException;
/**
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java
index bef31f33e6..e2a19d7fd5 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/PreparedTINTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.sis.geometries;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometry.GeneralEnvelope;
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.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
index 1265d4790b..48ea40a1f5 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/TriangleTest.java
@@ -19,9 +19,12 @@ package org.apache.sis.geometries;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/index/MortonIteratorTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/index/MortonIteratorTest.java
index ff4c168b53..d8160b871b 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/index/MortonIteratorTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/index/MortonIteratorTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.sis.geometries.index;
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleArrayTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleArrayTest.java
index da7860a5e4..111e7b1e5e 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleArrayTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleArrayTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.sis.geometries.math;
+import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.operation.matrix.MatrixSIS;
import org.apache.sis.referencing.operation.transform.MathTransforms;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.operation.TransformException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleTest.java
index 5293797ba3..7153f06a55 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractTupleTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.sis.geometries.math;
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractVectorTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractVectorTest.java
index d85a93a2b0..a917dd3c31 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractVectorTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/AbstractVectorTest.java
@@ -16,8 +16,10 @@
*/
package org.apache.sis.geometries.math;
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/MathsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/MathsTest.java
index 0801d20ac8..2aa0fbb0c2 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/MathsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/MathsTest.java
@@ -16,10 +16,12 @@
*/
package org.apache.sis.geometries.math;
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/QuaternionTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/QuaternionTest.java
index a4f0429628..add2587b3d 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/QuaternionTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/QuaternionTest.java
@@ -18,9 +18,12 @@ package org.apache.sis.geometries.math;
import org.apache.sis.referencing.operation.matrix.Matrix3;
import org.apache.sis.referencing.operation.matrix.Matrix4;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* Original code from Unlicense.science
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayConcatenatedTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayConcatenatedTest.java
index 5a32ed958e..55485c3938 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayConcatenatedTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayConcatenatedTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.sis.geometries.math;
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNbTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNbTest.java
index 2213d58563..2201befa8f 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNbTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNbTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNfTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNfTest.java
index 924b4b27b1..d5772fe28f 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNfTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNfTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNiTest.java
index 538196ac96..efbf044c9c 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNiTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNlTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNlTest.java
index b0c377e73b..f6b1529a78 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNlTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNlTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNsTest.java
index 7d853ddb49..7bae038638 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNubTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNubTest.java
index b265201fd2..8017980d14 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNubTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNubTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNuiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNuiTest.java
index 51b34abbea..9a34ec3530 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNuiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNuiTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNusTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNusTest.java
index bfcef49520..c5d573aaf2 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNusTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArrayNusTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArraysTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArraysTest.java
index ef02adb553..988a2b9120 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArraysTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/TupleArraysTest.java
@@ -20,9 +20,12 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.stream.Stream;
+import org.opengis.util.FactoryException;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXbTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXbTest.java
index 4330571bbe..afdc96e276 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXbTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXbTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXdTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXdTest.java
index 565eb53d62..076499fb75 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXdTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXdTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXfTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXfTest.java
index 369ba4ca95..5e32254bab 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXfTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXfTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXiTest.java
index 627e2406b6..9787f29bb6 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXiTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXlTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXlTest.java
index bf813c5d82..fe88d6bf5b 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXlTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXlTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXsTest.java
index 055279cef3..9467043c53 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXsTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXubTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXubTest.java
index 39df2012cf..b0fe4ac412 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXubTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXubTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXuiTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXuiTest.java
index 34db7cbfb5..ad2fd8a488 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXuiTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXuiTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXusTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXusTest.java
index 8ca19dad98..6906c7d97d 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXusTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorXusTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.geometries.math;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorsTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorsTest.java
index 6031af1fb4..93ae447847 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorsTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/math/VectorsTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.sis.geometries.math;
-import org.apache.sis.geometry.GeneralEnvelope;
-import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
import org.opengis.coordinate.MismatchedDimensionException;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
+import org.apache.sis.geometry.GeneralEnvelope;
+
+// Test dependencies
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
index d54be53529..976bf77534 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveIndexesTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.sis.geometries.mesh;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.mesh.MeshPrimitiveIndexes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
+import org.apache.sis.geometries.mesh.MeshPrimitiveIndexes;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
* In those tests created index may change because of hash maps and set sorting.
*
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 c224c118e9..e41360dc6f 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
@@ -20,9 +20,12 @@ import java.util.Arrays;
import java.util.List;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.math.TupleArrays;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java
index 7b37d87619..0bc898697c 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/mesh/PrimitiveVisitorTest.java
@@ -16,22 +16,25 @@
*/
package org.apache.sis.geometries.mesh;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
-import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.TIN;
import org.apache.sis.geometries.Triangle;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
+import org.apache.sis.geometries.mesh.MeshPrimitiveVisitor;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.math.Vector3D;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* Tests for MeshGeometry visitor.
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 e4a8c0e708..04e0d94aeb 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
@@ -21,9 +21,12 @@ import org.apache.sis.geometries.math.Tuple;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.math.Vector2D;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java
index 46ab5d7692..20ba0b244d 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/operation/spatialanalysis2d/IsoBandTest.java
@@ -21,18 +21,21 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.Polygon;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.Geometries;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.math.SampleSystem;
import org.apache.sis.geometries.math.TupleArrays;
import static org.apache.sis.geometries.operation.spatialanalysis2d.ISOLine.interpolateToCoord2D;
import org.apache.sis.measure.NumberRange;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.Polygon;
-import org.opengis.util.FactoryException;
+
public class IsoBandTest {
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/privy/ArraySequenceTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/privy/ArraySequenceTest.java
index 2c52297953..7daa97852b 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/privy/ArraySequenceTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/privy/ArraySequenceTest.java
@@ -18,6 +18,7 @@ package org.apache.sis.geometries.privy;
import java.util.HashMap;
import java.util.Map;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.math.SampleSystem;
@@ -26,9 +27,11 @@ import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.math.Vector2D;
import org.apache.sis.geometries.math.Vector3D;
import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/DistanceTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/DistanceTest.java
index 7a842d46e9..910f9c9161 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/DistanceTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/DistanceTest.java
@@ -23,9 +23,12 @@ import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.geometries.operation.OperationException;
import org.apache.sis.geometries.operation.spatialanalysis2d.Distance;
import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java
index b952dac928..e8f2353fbd 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialanalysis2d/IntersectionTest.java
@@ -16,16 +16,18 @@
*/
package org.apache.sis.geometries.processor.spatialanalysis2d;
-
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/To3DTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/To3DTest.java
index 4458562d60..b44ebbcd68 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/To3DTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/To3DTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.sis.geometries.processor.spatialedition;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.math.Tuple;
@@ -23,10 +25,11 @@ import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.operation.GeometryOperations;
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.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java
index 14042dc6a9..98e0a4f521 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/ToPrimitiveTest.java
@@ -16,25 +16,28 @@
*/
package org.apache.sis.geometries.processor.spatialedition;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.AttributesType;
import org.apache.sis.geometries.Geometry;
import org.apache.sis.geometries.GeometryFactory;
import org.apache.sis.geometries.LineString;
import org.apache.sis.geometries.LinearRing;
-import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.MultiLineString;
-import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometries.MultiPoint;
import org.apache.sis.geometries.Point;
import org.apache.sis.geometries.PointSequence;
import org.apache.sis.geometries.Polygon;
+import org.apache.sis.geometries.mesh.MeshPrimitive;
+import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.operation.GeometryOperations;
import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/TransformTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/TransformTest.java
index cf10ddcce4..906e6dccbc 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/TransformTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/processor/spatialedition/TransformTest.java
@@ -16,18 +16,21 @@
*/
package org.apache.sis.geometries.processor.spatialedition;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.referencing.operation.TransformException;
+import org.opengis.util.FactoryException;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MultiMeshPrimitive;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.geometries.operation.GeometryOperations;
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.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.referencing.operation.TransformException;
-import org.opengis.util.FactoryException;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/simplify/TextureAtlasTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/simplify/TextureAtlasTest.java
index 48c7be346b..d31e1e0277 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/simplify/TextureAtlasTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/simplify/TextureAtlasTest.java
@@ -21,9 +21,12 @@ import java.awt.Graphics2D;
import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage;
import org.apache.sis.coverage.grid.GridExtent;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java
index 0f60f16a25..ae8f63e6f1 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/DelaunayTest.java
@@ -16,13 +16,16 @@
*/
package org.apache.sis.geometries.triangulate.delaunay;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitiveComparator;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java
index 6232475972..ab16774ba0 100644
--- a/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java
+++ b/incubator/src/org.apache.sis.geometry/test/org/apache/sis/geometries/triangulate/delaunay/OrientedEdgeTest.java
@@ -17,14 +17,17 @@
package org.apache.sis.geometries.triangulate.delaunay;
import java.util.Iterator;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.geometries.mesh.MeshPrimitive;
import org.apache.sis.geometries.mesh.MeshPrimitive.Vertex;
import org.apache.sis.geometries.math.TupleArray;
import org.apache.sis.geometries.math.TupleArrays;
import org.apache.sis.referencing.CommonCRS;
+
+// Test dependencies
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.Test;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
*
diff --git a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
index 5617c12bf9..9c2559444b 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/main/org/apache/sis/storage/shapefile/ShapefileStore.java
@@ -61,6 +61,7 @@ import org.opengis.util.FactoryException;
import org.opengis.util.GenericName;
import org.opengis.geometry.Envelope;
import org.opengis.metadata.Metadata;
+import org.opengis.metadata.Identifier;
import org.opengis.parameter.ParameterValueGroup;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.operation.TransformException;
@@ -75,7 +76,6 @@ import org.apache.sis.filter.DefaultFilterFactory;
import org.apache.sis.filter.Optimization;
import org.apache.sis.filter.privy.FunctionNames;
import org.apache.sis.filter.privy.ListingPropertyVisitor;
-import org.apache.sis.geometry.wrapper.*;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.io.stream.ChannelDataOutput;
import org.apache.sis.io.stream.IOUtilities;
@@ -126,7 +126,7 @@ import org.opengis.filter.LogicalOperator;
import org.opengis.filter.LogicalOperatorName;
import org.opengis.filter.SpatialOperatorName;
import org.opengis.filter.ValueReference;
-import org.opengis.metadata.Identifier;
+import org.apache.sis.geometry.wrapper.*;
/**
diff --git a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
index 509c9ea266..6666f1473a 100644
--- a/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
+++ b/incubator/src/org.apache.sis.storage.shapefile/test/org/apache/sis/storage/shapefile/ShapefileStoreTest.java
@@ -29,6 +29,7 @@ import java.util.stream.Stream;
import org.locationtech.jts.geom.Coordinate;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.Point;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.feature.builder.FeatureTypeBuilder;
import org.apache.sis.util.Utilities;
import org.apache.sis.filter.DefaultFilterFactory;
@@ -50,7 +51,6 @@ import org.opengis.feature.Feature;
import org.opengis.feature.FeatureType;
import org.opengis.filter.BinaryComparisonOperator;
import org.opengis.filter.FilterFactory;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
/**