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 bfcb1d6355 Post-merge automatic reorganization of imports order.
bfcb1d6355 is described below
commit bfcb1d63550c8615ebe8fec4c75d65f5e84ef906
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Fri Aug 30 16:16:22 2024 +0200
Post-merge automatic reorganization of imports order.
---
.../main/org/apache/sis/referencing/crs/AbstractSingleCRS.java | 2 +-
.../main/org/apache/sis/referencing/datum/AbstractDatum.java | 2 +-
.../org/apache/sis/referencing/datum/DefaultGeodeticDatum.java | 2 +-
.../apache/sis/referencing/factory/GeodeticObjectFactory.java | 2 +-
.../main/org/apache/sis/storage/sql/SQLStore.java | 2 +-
.../main/org/apache/sis/storage/sql/feature/Analyzer.java | 2 +-
.../main/org/apache/sis/storage/sql/feature/Database.java | 2 +-
.../org/apache/sis/storage/sql/feature/InfoStatementsTest.java | 2 +-
.../org/apache/sis/storage/geopackage/GpkgStoreProviderTest.java | 1 +
.../test/org/apache/sis/storage/geopackage/GpkgStoreTest.java | 9 ++++++---
.../sis/storage/geopackage/conformance/CoreConformanceTest.java | 1 +
.../main/org/apache/sis/storage/gimi/GimiProvider.java | 7 ++++---
.../main/org/apache/sis/storage/gimi/GimiStore.java | 5 +++--
.../main/org/apache/sis/storage/gimi/GimiTile.java | 1 +
.../main/org/apache/sis/storage/gimi/GimiTileMatrix.java | 3 ++-
.../main/org/apache/sis/storage/gimi/GimiTileMatrixSet.java | 7 ++++---
.../main/org/apache/sis/storage/gimi/GimiUtils.java | 1 +
.../main/org/apache/sis/storage/gimi/Item.java | 1 +
.../main/org/apache/sis/storage/gimi/ResourceGrid.java | 7 ++++---
.../main/org/apache/sis/storage/gimi/ResourceImageJpeg.java | 1 +
.../org/apache/sis/storage/gimi/ResourceImageUncompressed.java | 7 ++++---
.../main/org/apache/sis/storage/gimi/ResourcePyramid.java | 3 ++-
.../main/org/apache/sis/storage/gimi/ResourceUnknown.java | 1 +
.../apache/sis/storage/gimi/internal/MatrixGridRessource.java | 3 ++-
.../org/apache/sis/storage/gimi/internal/ScaleSortedMap.java | 3 ++-
.../org/apache/sis/storage/gimi/internal/StringUtilities.java | 1 +
.../main/org/apache/sis/storage/gimi/internal/TileMatrices.java | 1 +
.../main/org/apache/sis/storage/gimi/isobmff/Box.java | 1 +
.../main/org/apache/sis/storage/gimi/isobmff/BoxRegistry.java | 1 +
.../main/org/apache/sis/storage/gimi/isobmff/FullBox.java | 1 +
.../main/org/apache/sis/storage/gimi/isobmff/ISOBMFFReader.java | 1 +
.../main/org/apache/sis/storage/gimi/isobmff/gimi/GIMI.java | 1 +
.../sis/storage/gimi/isobmff/gimi/ModelTiePointProperty.java | 1 +
.../storage/gimi/isobmff/gimi/ModelTransformationProperty.java | 1 +
.../sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_10/ContentDescribes.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_10/ISO14496_10.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ColourInformation.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/CombinaisonType.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/EntityToGroup.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ExtendedType.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/Extension.java | 1 +
.../storage/gimi/isobmff/iso14496_12/FDItemInfoExtension.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/FileType.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/FreeSpace.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/GeneralType.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/GroupList.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/HandlerReference.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/ISO14496_12.java | 1 +
.../storage/gimi/isobmff/iso14496_12/IdentifiedMediaData.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/ItemData.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ItemFullProperty.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfo.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ItemInfoEntry.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ItemLocation.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ItemProperties.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ItemProperty.java | 1 +
.../gimi/isobmff/iso14496_12/ItemPropertyAssociation.java | 1 +
.../storage/gimi/isobmff/iso14496_12/ItemPropertyContainer.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/ItemReference.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/MediaData.java | 1 +
.../org/apache/sis/storage/gimi/isobmff/iso14496_12/Meta.java | 1 +
.../org/apache/sis/storage/gimi/isobmff/iso14496_12/Movie.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/MovieHeader.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/OriginalFileType.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/PrimaryItem.java | 1 +
.../gimi/isobmff/iso14496_12/ProgressiveDownloadInfo.java | 1 +
.../gimi/isobmff/iso14496_12/SingleItemTypeReference.java | 1 +
.../gimi/isobmff/iso14496_12/SingleItemTypeReferenceLarge.java | 1 +
.../org/apache/sis/storage/gimi/isobmff/iso14496_12/Track.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso14496_12/TrackHeader.java | 1 +
.../sis/storage/gimi/isobmff/iso23001_17/ChromaLocation.java | 1 +
.../storage/gimi/isobmff/iso23001_17/ComponentDefinition.java | 1 +
.../sis/storage/gimi/isobmff/iso23001_17/ComponentPalette.java | 1 +
.../gimi/isobmff/iso23001_17/ComponentPatternDefinition.java | 1 +
.../gimi/isobmff/iso23001_17/ComponentReferenceLevel.java | 1 +
.../gimi/isobmff/iso23001_17/DepthMappingInformation.java | 1 +
.../storage/gimi/isobmff/iso23001_17/DisparityInformation.java | 1 +
.../storage/gimi/isobmff/iso23001_17/FieldInterlaceProperty.java | 1 +
.../sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceType.java | 1 +
.../gimi/isobmff/iso23001_17/FramePackingInformation.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso23001_17/ISO23001_17.java | 1 +
.../gimi/isobmff/iso23001_17/PolarizationPatternDefinition.java | 1 +
.../sis/storage/gimi/isobmff/iso23001_17/SensorBadPixelsMap.java | 1 +
.../gimi/isobmff/iso23001_17/SensorNonUniformityCorrection.java | 1 +
.../sis/storage/gimi/isobmff/iso23001_17/TAIClockInfo.java | 1 +
.../sis/storage/gimi/isobmff/iso23001_17/TAITimeStamp.java | 1 +
.../gimi/isobmff/iso23001_17/UncompressedFrameConfig.java | 1 +
.../storage/gimi/isobmff/iso23008_12/DerivedImageReference.java | 1 +
.../apache/sis/storage/gimi/isobmff/iso23008_12/ISO23008_12.java | 1 +
.../gimi/isobmff/iso23008_12/ImagePyramidEntityGroup.java | 1 +
.../storage/gimi/isobmff/iso23008_12/ImageSpatialExtents.java | 1 +
.../gimi/isobmff/iso23008_12/PixelInformationProperty.java | 1 +
.../gimi/isobmff/iso23008_12/UserDescriptionProperty.java | 1 +
.../test/org/apache/sis/storage/gimi/StoreTest.java | 1 +
.../main/org/apache/sis/storage/gsf/Attitude.java | 2 +-
.../main/org/apache/sis/storage/gsf/Comment.java | 4 ++--
.../main/org/apache/sis/storage/gsf/DataID.java | 4 ++--
.../main/org/apache/sis/storage/gsf/GSF.java | 1 +
.../main/org/apache/sis/storage/gsf/GSFRecordReader.java | 1 +
.../main/org/apache/sis/storage/gsf/HVNavigationError.java | 4 ++--
.../main/org/apache/sis/storage/gsf/Header.java | 3 ++-
.../main/org/apache/sis/storage/gsf/History.java | 1 +
.../main/org/apache/sis/storage/gsf/NavigationError.java | 2 +-
.../main/org/apache/sis/storage/gsf/Position.java | 3 ++-
.../main/org/apache/sis/storage/gsf/PositionOffsets.java | 2 +-
.../main/org/apache/sis/storage/gsf/ProcessingParameters.java | 4 ++--
.../main/org/apache/sis/storage/gsf/Records.java | 1 +
.../main/org/apache/sis/storage/gsf/SBSensorSpecific.java | 1 +
.../main/org/apache/sis/storage/gsf/SVP.java | 4 ++--
.../main/org/apache/sis/storage/gsf/ScaleFactors.java | 2 +-
.../main/org/apache/sis/storage/gsf/ScaleInfo.java | 2 +-
.../main/org/apache/sis/storage/gsf/SensorParameters.java | 2 +-
.../main/org/apache/sis/storage/gsf/SensorSpecific.java | 3 ++-
.../main/org/apache/sis/storage/gsf/SingleBeamPing.java | 2 +-
.../main/org/apache/sis/storage/gsf/StructClass.java | 1 +
.../main/org/apache/sis/storage/gsf/SwathBathyPing.java | 4 ++--
.../main/org/apache/sis/storage/gsf/SwathBathySummary.java | 2 +-
.../main/org/apache/sis/storage/gsf/TimeSpec.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/BDBSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/CmpSassSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM100Specific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM12Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM3RawTxSector.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM3RunTime.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM3Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM4Specific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM4TxSector.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM950Specific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EMPUStatus.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EMRunTime.java | 2 +-
.../org/apache/sis/storage/gsf/specific/EchotracSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java | 2 +-
.../apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/KMALLExtraDet.java | 2 +-
.../apache/sis/storage/gsf/specific/KMALLImagerySpecific.java | 1 +
.../main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/KMALLTxSector.java | 2 +-
.../sis/storage/gsf/specific/Klein5410BssImagerySpecific.java | 2 +-
.../apache/sis/storage/gsf/specific/Klein5410BssSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/MGD77Specific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java | 2 +-
.../apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/R2SonicSpecific.java | 2 +-
.../sis/storage/gsf/specific/Reson7100ImagerySpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/Reson7100Specific.java | 2 +-
.../sis/storage/gsf/specific/Reson8100ImagerySpecific.java | 1 +
.../org/apache/sis/storage/gsf/specific/Reson8100Specific.java | 2 +-
.../sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java | 2 +-
.../apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SBMGD77Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SeabeamSpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/TypeIIISpecific.java | 2 +-
.../test/org/apache/sis/storage/gsf/StoreTest.java | 1 +
.../org/apache/sis/resources/embedded/EmbeddedResourcesTest.java | 6 ++++--
.../test/org/apache/sis/resources/embedded/Generator.java | 8 ++++----
171 files changed, 209 insertions(+), 106 deletions(-)
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
index 54f035b332..d1fbdcaedf 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/crs/AbstractSingleCRS.java
@@ -35,8 +35,8 @@ import org.apache.sis.referencing.internal.Resources;
import org.apache.sis.metadata.privy.ImplementationHelper;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.metadata.Identifier;
import org.opengis.referencing.datum.DatumEnsemble;
+import org.opengis.metadata.Identifier;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
index a49256eaae..c473e4e1d3 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/AbstractDatum.java
@@ -47,8 +47,8 @@ import static org.apache.sis.util.Utilities.deepEquals;
import static org.apache.sis.util.collection.Containers.property;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DynamicReferenceFrame;
import org.opengis.metadata.Identifier;
+import org.opengis.referencing.datum.DynamicReferenceFrame;
// Specific to the geoapi-4.0 branch:
import org.opengis.annotation.UML;
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
index b95286c5f9..d90ed49af8 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
@@ -53,8 +53,8 @@ import static
org.apache.sis.util.ArgumentChecks.ensureNonNullElement;
import static org.apache.sis.referencing.privy.WKTUtilities.toFormattable;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.referencing.datum.DynamicReferenceFrame;
import org.opengis.metadata.Identifier;
+import org.opengis.referencing.datum.DynamicReferenceFrame;
/**
diff --git
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
index 623e89a925..f5033d0773 100644
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;
import java.util.logging.LogRecord;
import java.util.concurrent.atomic.AtomicReference;
import java.lang.reflect.Constructor;
+import java.time.temporal.Temporal;
import jakarta.xml.bind.JAXBException;
import javax.measure.Unit;
import javax.measure.quantity.Angle;
@@ -64,7 +65,6 @@ import org.apache.sis.io.wkt.Parser;
import org.apache.sis.xml.XML;
// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import java.time.temporal.Temporal;
import org.opengis.referencing.datum.DynamicReferenceFrame;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
index 468f211524..6f53770f48 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/SQLStore.java
@@ -25,8 +25,8 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.Statement;
import java.sql.DatabaseMetaData;
-import java.lang.reflect.Method;
import java.sql.SQLException;
+import java.lang.reflect.Method;
import org.opengis.util.GenericName;
import org.opengis.metadata.Metadata;
import org.opengis.parameter.ParameterValueGroup;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Analyzer.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Analyzer.java
index 25c43fab78..e38ddd9b51 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Analyzer.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Analyzer.java
@@ -41,10 +41,10 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.storage.InternalDataStoreException;
import org.apache.sis.storage.event.StoreListeners;
+import org.apache.sis.storage.sql.ResourceDefinition;
import org.apache.sis.storage.sql.postgis.Postgres;
import org.apache.sis.metadata.sql.privy.Dialect;
import org.apache.sis.metadata.sql.privy.Reflection;
-import org.apache.sis.storage.sql.ResourceDefinition;
import org.apache.sis.util.iso.DefaultNameFactory;
import org.apache.sis.util.resources.ResourceInternationalString;
diff --git
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
index 7fa2a694ac..6d9a1f9593 100644
---
a/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
+++
b/endorsed/src/org.apache.sis.storage.sql/main/org/apache/sis/storage/sql/feature/Database.java
@@ -54,10 +54,10 @@ import org.apache.sis.system.Modules;
import org.apache.sis.storage.sql.SQLStore;
import org.apache.sis.storage.sql.ResourceDefinition;
import org.apache.sis.storage.event.StoreListeners;
+import org.apache.sis.util.Debug;
import org.apache.sis.util.collection.TreeTable;
import org.apache.sis.util.collection.Cache;
import org.apache.sis.util.privy.UnmodifiableArrayList;
-import org.apache.sis.util.Debug;
/**
diff --git
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java
index cea1c8ea4a..7a3f333d12 100644
---
a/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java
+++
b/endorsed/src/org.apache.sis.storage.sql/test/org/apache/sis/storage/sql/feature/InfoStatementsTest.java
@@ -22,6 +22,7 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.lang.reflect.Field;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.apache.sis.referencing.ImmutableIdentifier;
import org.apache.sis.referencing.crs.DefaultGeographicCRS;
import org.apache.sis.metadata.sql.privy.Dialect;
import org.apache.sis.geometry.wrapper.Geometries;
@@ -41,7 +42,6 @@ import static
org.apache.sis.test.Assertions.assertMessageContains;
import org.apache.sis.test.TestCase;
import org.apache.sis.storage.DataStoreMock;
import org.apache.sis.metadata.sql.TestDatabase;
-import org.apache.sis.referencing.ImmutableIdentifier;
import org.apache.sis.referencing.cs.HardCodedCS;
import org.apache.sis.referencing.crs.HardCodedCRS;
import org.apache.sis.referencing.datum.HardCodedDatum;
diff --git
a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreProviderTest.java
b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreProviderTest.java
index ea5229c181..8f034893de 100644
---
a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreProviderTest.java
+++
b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreProviderTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.storage.geopackage;
+// Test dependencies
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
diff --git
a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java
b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java
index 950a00ba9c..16e3b39753 100644
---
a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java
+++
b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java
@@ -30,9 +30,6 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import java.util.stream.Stream;
-import org.opengis.feature.AttributeType;
-import org.opengis.feature.Feature;
-import org.opengis.feature.PropertyType;
import org.apache.sis.geometry.wrapper.Geometries;
import org.apache.sis.geometry.wrapper.GeometryWrapper;
import org.apache.sis.referencing.IdentifiedObjects;
@@ -43,12 +40,18 @@ import org.apache.sis.storage.DataStores;
import org.apache.sis.storage.FeatureSet;
import org.apache.sis.storage.StorageConnector;
+// Test dependencies
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.feature.AttributeType;
+import org.opengis.feature.Feature;
+import org.opengis.feature.PropertyType;
+
/**
* Tests the Geopackage store.
diff --git
a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java
b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java
index 84674b9409..11ae5d400c 100644
---
a/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java
+++
b/incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/conformance/CoreConformanceTest.java
@@ -31,6 +31,7 @@ import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.geopackage.GpkgStore;
+// Test dependencies
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.TestInstance;
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java
index 53da09bcba..3ec75d1fe1 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiProvider.java
@@ -18,15 +18,16 @@ package org.apache.sis.storage.gimi;
import java.net.URI;
import java.nio.file.Path;
+import org.opengis.parameter.ParameterDescriptor;
+import org.opengis.parameter.ParameterDescriptorGroup;
import org.apache.sis.parameter.ParameterBuilder;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.DataStoreProvider;
-import static org.apache.sis.storage.DataStoreProvider.LOCATION;
import org.apache.sis.storage.ProbeResult;
import org.apache.sis.storage.StorageConnector;
-import org.opengis.parameter.ParameterDescriptor;
-import org.opengis.parameter.ParameterDescriptorGroup;
+import static org.apache.sis.storage.DataStoreProvider.LOCATION;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiStore.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiStore.java
index a06cb44562..74a6aa4039 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiStore.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiStore.java
@@ -24,6 +24,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import org.opengis.metadata.Metadata;
+import org.opengis.parameter.ParameterValueGroup;
import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.parameter.Parameters;
import org.apache.sis.storage.Aggregate;
@@ -38,8 +40,7 @@ import
org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemInfo;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemInfoEntry;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.Meta;
import org.apache.sis.storage.gimi.isobmff.iso23008_12.ImagePyramidEntityGroup;
-import org.opengis.metadata.Metadata;
-import org.opengis.parameter.ParameterValueGroup;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTile.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTile.java
index 1702820908..686a18ce87 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTile.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTile.java
@@ -23,6 +23,7 @@ import org.apache.sis.storage.Resource;
import org.apache.sis.storage.tiling.Tile;
import org.apache.sis.storage.tiling.TileStatus;
+
/**
* A tile item resource defined by a Grid Item.
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrix.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrix.java
index c52005dd83..3ba53d813c 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrix.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrix.java
@@ -19,6 +19,7 @@ package org.apache.sis.storage.gimi;
import java.util.Optional;
import java.util.function.Function;
import java.util.stream.Stream;
+import org.opengis.util.GenericName;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.storage.DataStoreException;
@@ -28,7 +29,7 @@ import org.apache.sis.storage.tiling.Tile;
import org.apache.sis.storage.tiling.TileMatrix;
import org.apache.sis.storage.tiling.TileStatus;
import org.apache.sis.util.iso.Names;
-import org.opengis.util.GenericName;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrixSet.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrixSet.java
index 52aab482e1..89d4d00c6b 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrixSet.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiTileMatrixSet.java
@@ -18,13 +18,14 @@ package org.apache.sis.storage.gimi;
import java.util.Optional;
import java.util.SortedMap;
+import org.opengis.geometry.Envelope;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.GenericName;
import org.apache.sis.storage.gimi.internal.ScaleSortedMap;
import org.apache.sis.storage.gimi.internal.StringUtilities;
import org.apache.sis.storage.tiling.TileMatrix;
import org.apache.sis.storage.tiling.TileMatrixSet;
-import org.opengis.geometry.Envelope;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.GenericName;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiUtils.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiUtils.java
index 9099f3c183..c2b1cd3fab 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiUtils.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/GimiUtils.java
@@ -25,6 +25,7 @@ import org.apache.sis.storage.StorageConnector;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Item.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Item.java
index ce32aedeb8..75100b70bb 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Item.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/Item.java
@@ -34,6 +34,7 @@ import org.apache.sis.storage.gimi.isobmff.iso14496_12.Meta;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.PrimaryItem;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.SingleItemTypeReference;
+
/**
* Regroup properties of a single item in the file.
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java
index d3688fe7fb..7853028cb5 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceGrid.java
@@ -19,6 +19,9 @@ package org.apache.sis.storage.gimi;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.MathTransform;
+import org.opengis.util.GenericName;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridExtent;
import org.apache.sis.coverage.grid.GridGeometry;
@@ -35,9 +38,7 @@ import org.apache.sis.storage.tiling.TileMatrix;
import org.apache.sis.storage.tiling.TileMatrixSet;
import org.apache.sis.storage.tiling.TiledResource;
import org.apache.sis.util.iso.Names;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.operation.MathTransform;
-import org.opengis.util.GenericName;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageJpeg.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageJpeg.java
index 144fbba998..35892544c9 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageJpeg.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageJpeg.java
@@ -26,6 +26,7 @@ import org.apache.sis.coverage.grid.GridCoverageBuilder;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.storage.DataStoreException;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java
index bbf34b3864..e1d66e52fb 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceImageUncompressed.java
@@ -21,6 +21,9 @@ import java.awt.image.WritableRaster;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.util.FactoryException;
+import org.opengis.util.GenericName;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridCoverageBuilder;
@@ -42,9 +45,7 @@ import
org.apache.sis.storage.gimi.isobmff.iso23001_17.ComponentDefinition;
import org.apache.sis.storage.gimi.isobmff.iso23001_17.UncompressedFrameConfig;
import org.apache.sis.storage.gimi.isobmff.iso23008_12.ImageSpatialExtents;
import org.apache.sis.util.iso.Names;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.util.FactoryException;
-import org.opengis.util.GenericName;
+
/**
* A single uncompressed image.
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java
index 28d323cc3d..01529ac58c 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourcePyramid.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
+import org.opengis.util.GenericName;
import org.apache.sis.coverage.SampleDimension;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridExtent;
@@ -40,7 +41,7 @@ import org.apache.sis.storage.tiling.TileMatrix;
import org.apache.sis.storage.tiling.TileMatrixSet;
import org.apache.sis.storage.tiling.TiledResource;
import org.apache.sis.util.iso.Names;
-import org.opengis.util.GenericName;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java
index 3bc421dc8a..ca31067625 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/ResourceUnknown.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.storage.base.StoreResource;
+
/**
* Unknown item type.
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/MatrixGridRessource.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/MatrixGridRessource.java
index dd8d300a11..5d7587087d 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/MatrixGridRessource.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/MatrixGridRessource.java
@@ -23,6 +23,7 @@ import java.awt.image.RenderedImage;
import java.awt.image.SampleModel;
import java.io.IOException;
import java.util.logging.Logger;
+import org.opengis.util.GenericName;
import org.apache.sis.coverage.grid.GridCoverage;
import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.storage.DataStoreException;
@@ -31,7 +32,7 @@ import org.apache.sis.storage.Resource;
import org.apache.sis.storage.base.TiledGridCoverage;
import org.apache.sis.storage.base.TiledGridResource;
import org.apache.sis.storage.tiling.TileMatrix;
-import org.opengis.util.GenericName;
+
/**
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/ScaleSortedMap.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/ScaleSortedMap.java
index 6b88d6d537..e1892d9d24 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/ScaleSortedMap.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/ScaleSortedMap.java
@@ -20,9 +20,10 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.Map;
import java.util.TreeMap;
+import org.opengis.util.GenericName;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.storage.tiling.TileMatrix;
-import org.opengis.util.GenericName;
+
/**
* SortedMap of TileMatrix sorted by first axe resolution.
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/StringUtilities.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/StringUtilities.java
index 9b8dc24e5d..9802c40f7a 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/StringUtilities.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/StringUtilities.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.internal;
import java.util.Iterator;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/TileMatrices.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/TileMatrices.java
index ab1b01b566..eb64011cb3 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/TileMatrices.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/internal/TileMatrices.java
@@ -20,6 +20,7 @@ import java.util.stream.LongStream;
import java.util.stream.Stream;
import org.apache.sis.coverage.grid.GridExtent;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/Box.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/Box.java
index 4f83465853..5e5a49a941 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/Box.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/Box.java
@@ -29,6 +29,7 @@ import java.util.List;
import java.util.UUID;
import org.apache.sis.storage.gimi.internal.StringUtilities;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/BoxRegistry.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/BoxRegistry.java
index af1e024c90..d6c3bd8b13 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/BoxRegistry.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/BoxRegistry.java
@@ -19,6 +19,7 @@ package org.apache.sis.storage.gimi.isobmff;
import java.util.Set;
import org.apache.sis.storage.IllegalNameException;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/FullBox.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/FullBox.java
index 0d2aec6421..732f81a242 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/FullBox.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/FullBox.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.storage.gimi.isobmff;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/ISOBMFFReader.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/ISOBMFFReader.java
index 02e0e0ca5f..b279c4e54f 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/ISOBMFFReader.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/ISOBMFFReader.java
@@ -30,6 +30,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.Extension;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/GIMI.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/GIMI.java
index 3c84d32fc4..cf5010cd64 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/GIMI.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/GIMI.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.BoxRegistry;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTiePointProperty.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTiePointProperty.java
index 0e11d6f208..50206d765a 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTiePointProperty.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTiePointProperty.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java
index 3dffa85dfe..c6fc069376 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/ModelTransformationProperty.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java
index 0d3c17de58..e2c968b29d 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/gimi/WellKnownText2Property.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ContentDescribes.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ContentDescribes.java
index c057a52cf0..b0fcdb8248 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ContentDescribes.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ContentDescribes.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_10;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.SingleItemTypeReference;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ISO14496_10.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ISO14496_10.java
index 9ddf00fa6a..75e11f003b 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ISO14496_10.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_10/ISO14496_10.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.BoxRegistry;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ColourInformation.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ColourInformation.java
index b9d9cd2fd8..2b2bf46385 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ColourInformation.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ColourInformation.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/CombinaisonType.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/CombinaisonType.java
index 6b62622fb4..3726987408 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/CombinaisonType.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/CombinaisonType.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* Container : ExtendedTypeBox
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/EntityToGroup.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/EntityToGroup.java
index 0673c437cc..102e63f51a 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/EntityToGroup.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/EntityToGroup.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ExtendedType.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ExtendedType.java
index 403ae2b908..ed28d2c236 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ExtendedType.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ExtendedType.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
*
* Container: File, ItemPropertyContainerBox, or OriginalFileTypeBox
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Extension.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Extension.java
index 10832e17c8..539e7bd1a2 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Extension.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Extension.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FDItemInfoExtension.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FDItemInfoExtension.java
index cdb89c48f4..9d7438e256 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FDItemInfoExtension.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FDItemInfoExtension.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FileType.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FileType.java
index d8309511e1..f5facf2e67 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FileType.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FileType.java
@@ -16,6 +16,7 @@
*/
package org.apache.sis.storage.gimi.isobmff.iso14496_12;
+
/**
* Container: File, or OriginalFileTypeBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FreeSpace.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FreeSpace.java
index bd19fcf9e3..4c41a3ec84 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FreeSpace.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/FreeSpace.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
* Container: File or other box
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GeneralType.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GeneralType.java
index 8701d9c10d..9e260c0228 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GeneralType.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GeneralType.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GroupList.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GroupList.java
index 8d34d2d6a5..976495adc3 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GroupList.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/GroupList.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/HandlerReference.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/HandlerReference.java
index a3520419fa..1cacfa42da 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/HandlerReference.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/HandlerReference.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* Container: MediaBox or MetaBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ISO14496_12.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ISO14496_12.java
index 007551144b..0d78940068 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ISO14496_12.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ISO14496_12.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.BoxRegistry;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/IdentifiedMediaData.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/IdentifiedMediaData.java
index 36dbc5a147..cb42939f27 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/IdentifiedMediaData.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/IdentifiedMediaData.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* Container: File
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemData.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemData.java
index db752c8c71..ff7099f6fe 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemData.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemData.java
@@ -19,6 +19,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
* Container: MetaBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemFullProperty.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemFullProperty.java
index c622e14b6f..b55c82d972 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemFullProperty.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemFullProperty.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.FullBox;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfo.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfo.java
index c24ef3cca9..da35065e06 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfo.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfo.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* Container: File,Segment,MovieBox,TrackBox,MovieFragmentBox,TrackFragmentBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfoEntry.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfoEntry.java
index 2f5b4bbd8f..86b87c9d53 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfoEntry.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemInfoEntry.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemLocation.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemLocation.java
index ec7b27cc09..4f9a226c91 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemLocation.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemLocation.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperties.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperties.java
index 48985c2e01..704368932c 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperties.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperties.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperty.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperty.java
index fb02fb92ad..f1552de0bf 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperty.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemProperty.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyAssociation.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyAssociation.java
index 12775e693a..bd09f99efd 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyAssociation.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyAssociation.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyContainer.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyContainer.java
index 28d73bd35d..907ff81cec 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyContainer.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemPropertyContainer.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemReference.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemReference.java
index 6161e0e5c4..c3648a7a71 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemReference.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ItemReference.java
@@ -23,6 +23,7 @@ import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MediaData.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MediaData.java
index 995d39fdcd..028cfcb269 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MediaData.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MediaData.java
@@ -19,6 +19,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
* Container: File
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Meta.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Meta.java
index 8d5e44220b..c194401e13 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Meta.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Meta.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.FullBox;
+
/**
* Container: File,Segment,MovieBox,TrackBox,MovieFragmentBox,TrackFragmentBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Movie.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Movie.java
index 5b474f84c8..38759dc6df 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Movie.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Movie.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
* Container: File
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MovieHeader.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MovieHeader.java
index a0f3db809f..886c3638ef 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MovieHeader.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/MovieHeader.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* Container: MovieBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/OriginalFileType.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/OriginalFileType.java
index 7accdcd94d..3cea7f1016 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/OriginalFileType.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/OriginalFileType.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
* Container: File, or OriginalFileTypeBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/PrimaryItem.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/PrimaryItem.java
index 6820396785..31f5173cb0 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/PrimaryItem.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/PrimaryItem.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* Container: MetaBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ProgressiveDownloadInfo.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ProgressiveDownloadInfo.java
index 692654af1c..b1ced63048 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ProgressiveDownloadInfo.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/ProgressiveDownloadInfo.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* Container: File
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReference.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReference.java
index 4b02ca65b4..91a4ff516b 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReference.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReference.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReferenceLarge.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReferenceLarge.java
index ed9c132bdd..62888f057e 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReferenceLarge.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/SingleItemTypeReferenceLarge.java
@@ -19,6 +19,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Track.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Track.java
index 84611f8924..b155921610 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Track.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/Track.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso14496_12;
import org.apache.sis.storage.gimi.isobmff.Box;
+
/**
* Container: Movie
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/TrackHeader.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/TrackHeader.java
index c2d6f5c686..9ace1c0826 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/TrackHeader.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso14496_12/TrackHeader.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* Container: TrackBox
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ChromaLocation.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ChromaLocation.java
index 468100d9b9..517d9fa12a 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ChromaLocation.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ChromaLocation.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentDefinition.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentDefinition.java
index 5ae16ca0fb..250b4e3766 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentDefinition.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentDefinition.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* From ISO 23001-17
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPalette.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPalette.java
index 72ef4c04a3..61c16c19d8 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPalette.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPalette.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPatternDefinition.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPatternDefinition.java
index 24e660bfb2..b309e6c093 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPatternDefinition.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentPatternDefinition.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentReferenceLevel.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentReferenceLevel.java
index 86cb6c7668..bb07633000 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentReferenceLevel.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ComponentReferenceLevel.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DepthMappingInformation.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DepthMappingInformation.java
index f796439999..9d64daebc9 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DepthMappingInformation.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DepthMappingInformation.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DisparityInformation.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DisparityInformation.java
index ac14782b23..c19911f565 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DisparityInformation.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/DisparityInformation.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceProperty.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceProperty.java
index 9b0d83f1cf..7f8a34dd31 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceProperty.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceProperty.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceType.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceType.java
index a3deb40081..0d48059bf3 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceType.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FieldInterlaceType.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FramePackingInformation.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FramePackingInformation.java
index 543de4c6c9..2f56b26cef 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FramePackingInformation.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/FramePackingInformation.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ISO23001_17.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ISO23001_17.java
index 9e56cc0007..f683ed8e04 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ISO23001_17.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/ISO23001_17.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.BoxRegistry;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/PolarizationPatternDefinition.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/PolarizationPatternDefinition.java
index 54200a632e..be34ecbe0a 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/PolarizationPatternDefinition.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/PolarizationPatternDefinition.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorBadPixelsMap.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorBadPixelsMap.java
index b93d729dd6..9b21a3f971 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorBadPixelsMap.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorBadPixelsMap.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorNonUniformityCorrection.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorNonUniformityCorrection.java
index 9075433bb0..3c37d15d22 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorNonUniformityCorrection.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/SensorNonUniformityCorrection.java
@@ -21,6 +21,7 @@ import org.apache.sis.io.stream.ChannelDataInput;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAIClockInfo.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAIClockInfo.java
index b54498de8f..ac2254e2f1 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAIClockInfo.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAIClockInfo.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
* From ISO/IEC 23001-17:2024 amendment 1
*
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAITimeStamp.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAITimeStamp.java
index 8375490bd1..804700fe88 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAITimeStamp.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/TAITimeStamp.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/UncompressedFrameConfig.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/UncompressedFrameConfig.java
index e1236e5aaf..bdf05b1efe 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/UncompressedFrameConfig.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23001_17/UncompressedFrameConfig.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.FullBox;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/DerivedImageReference.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/DerivedImageReference.java
index c9b5824758..68a0238096 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/DerivedImageReference.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/DerivedImageReference.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gimi.isobmff.iso23008_12;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.SingleItemTypeReference;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ISO23008_12.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ISO23008_12.java
index ea4ef9a216..fa645250b6 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ISO23008_12.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ISO23008_12.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.IllegalNameException;
import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.BoxRegistry;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImagePyramidEntityGroup.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImagePyramidEntityGroup.java
index e0ca0b4d74..8f4df991da 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImagePyramidEntityGroup.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImagePyramidEntityGroup.java
@@ -21,6 +21,7 @@ import org.apache.sis.storage.gimi.isobmff.Box;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.EntityToGroup;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImageSpatialExtents.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImageSpatialExtents.java
index 4e23fe7407..66a04a5903 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImageSpatialExtents.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/ImageSpatialExtents.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/PixelInformationProperty.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/PixelInformationProperty.java
index 40bfa4f1f5..ace4b13412 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/PixelInformationProperty.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/PixelInformationProperty.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/UserDescriptionProperty.java
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/UserDescriptionProperty.java
index b31de5f5cd..e198b0e3dc 100644
---
a/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/UserDescriptionProperty.java
+++
b/incubator/src/org.apache.sis.storage.gimi/main/org/apache/sis/storage/gimi/isobmff/iso23008_12/UserDescriptionProperty.java
@@ -20,6 +20,7 @@ import java.io.IOException;
import org.apache.sis.storage.gimi.isobmff.ISOBMFFReader;
import org.apache.sis.storage.gimi.isobmff.iso14496_12.ItemFullProperty;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gimi/test/org/apache/sis/storage/gimi/StoreTest.java
b/incubator/src/org.apache.sis.storage.gimi/test/org/apache/sis/storage/gimi/StoreTest.java
index 690095bc64..10969f13ac 100644
---
a/incubator/src/org.apache.sis.storage.gimi/test/org/apache/sis/storage/gimi/StoreTest.java
+++
b/incubator/src/org.apache.sis.storage.gimi/test/org/apache/sis/storage/gimi/StoreTest.java
@@ -16,5 +16,6 @@
*/
package org.apache.sis.storage.gimi;
+
public final class StoreTest {
}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Attitude.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Attitude.java
index e888dcdf73..779663d7b5 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Attitude.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Attitude.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Comment.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Comment.java
index 9c7b034659..a6767af588 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Comment.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Comment.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -60,4 +60,4 @@ public final class Comment extends StructClass{
public String getComment() {
return struct.get(LAYOUT_COMMENT, 24).getString(0);
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/DataID.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/DataID.java
index d103a78986..fb75ad4971 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/DataID.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/DataID.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -66,4 +66,4 @@ public final class DataID extends StructClass {
return struct.get(LAYOUT_RECORD_NUMBER, 12);
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java
index e858a94f14..7ed68f4d27 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSF.java
@@ -29,6 +29,7 @@ import java.lang.invoke.MethodHandle;
import java.util.Arrays;
import java.util.stream.Collectors;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFRecordReader.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFRecordReader.java
index d557a1229a..bdb57a9749 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFRecordReader.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/GSFRecordReader.java
@@ -29,6 +29,7 @@ import java.util.stream.StreamSupport;
import org.apache.sis.storage.DataStoreException;
import org.apache.sis.util.privy.AbstractIterator;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/HVNavigationError.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/HVNavigationError.java
index c99703bca0..ff0083f240 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/HVNavigationError.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/HVNavigationError.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -86,4 +86,4 @@ public final class HVNavigationError extends StructClass {
return struct.get(LAYOUT_POSITION_TYPE, 56);
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Header.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Header.java
index e675afbe24..d0eff52d37 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Header.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Header.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -46,4 +47,4 @@ public final class Header extends StructClass {
return struct.asSlice(0, LAYOUT_VERSION.byteSize()).getString(0);
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/History.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/History.java
index 3fbe26df88..d02a3186ea 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/History.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/History.java
@@ -18,6 +18,7 @@ package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/NavigationError.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/NavigationError.java
index 5a403b48b5..1fdd564fff 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/NavigationError.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/NavigationError.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Position.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Position.java
index 3a09c1c50b..7f98784cf8 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Position.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Position.java
@@ -19,6 +19,7 @@ package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -71,4 +72,4 @@ public final class Position extends StructClass {
struct.set(LAYOUT_Z, 16, fieldValue);
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/PositionOffsets.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/PositionOffsets.java
index 9abeb15b51..dbb58b4980 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/PositionOffsets.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/PositionOffsets.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ProcessingParameters.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ProcessingParameters.java
index 07b106c77c..c0779378cf 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ProcessingParameters.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ProcessingParameters.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -62,4 +62,4 @@ public final class ProcessingParameters extends StructClass {
public short[] getParamSize() {
return getShorts(20, getNumberParameters());
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Records.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Records.java
index 95c3663a75..b84afb87ca 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Records.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/Records.java
@@ -19,6 +19,7 @@ package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
import java.util.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
index bdd986f201..35f1f955b8 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SBSensorSpecific.java
@@ -22,6 +22,7 @@ import org.apache.sis.storage.gsf.specific.EchotracSpecific;
import org.apache.sis.storage.gsf.specific.MGD77Specific;
import org.apache.sis.storage.gsf.specific.NOSHDBSpecific;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SVP.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SVP.java
index 0838e94b4a..190d40c1d5 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SVP.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SVP.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -87,4 +87,4 @@ public final class SVP extends StructClass {
return getDoubles(resolvedAddress, 0, getNumberPoints());
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleFactors.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleFactors.java
index 52d07fd544..402770a179 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleFactors.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleFactors.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleInfo.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleInfo.java
index 1f533436ee..179dcf535f 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleInfo.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/ScaleInfo.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorParameters.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorParameters.java
index 21e2c69f1e..e0abfe5823 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorParameters.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorParameters.java
@@ -18,10 +18,10 @@ package org.apache.sis.storage.gsf;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
index f3c7e7d54f..9f17546989 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SensorSpecific.java
@@ -48,6 +48,7 @@ import org.apache.sis.storage.gsf.specific.SeabeamSpecific;
import org.apache.sis.storage.gsf.specific.SeamapSpecific;
import org.apache.sis.storage.gsf.specific.TypeIIISpecific;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -105,4 +106,4 @@ public final class SensorSpecific extends StructClass{
return LAYOUT;
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SingleBeamPing.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SingleBeamPing.java
index 79aed5d56d..a5e37dca1e 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SingleBeamPing.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SingleBeamPing.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/StructClass.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/StructClass.java
index bd0242df6f..0b4e17026e 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/StructClass.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/StructClass.java
@@ -34,6 +34,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathyPing.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathyPing.java
index 939ce08cad..a4855fb3a9 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathyPing.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathyPing.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
@@ -351,4 +351,4 @@ public final class SwathBathyPing extends StructClass {
// return struct.get(brb_intenLAYOUT, 3008);
// }
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathySummary.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathySummary.java
index bbed8e1f13..f66affb174 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathySummary.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/SwathBathySummary.java
@@ -17,9 +17,9 @@
package org.apache.sis.storage.gsf;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/TimeSpec.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/TimeSpec.java
index c36e817bf9..32b623cc11 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/TimeSpec.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/TimeSpec.java
@@ -57,4 +57,4 @@ public final class TimeSpec extends StructClass{
return struct.get(tv_nsecLAYOUT, 8L);
}
-}
\ No newline at end of file
+}
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDBSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDBSpecific.java
index 527b9c6d8d..563de711e7 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDBSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/BDBSpecific.java
@@ -17,11 +17,11 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSassSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSassSpecific.java
index 2e713370ca..6a49f00ce9 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSassSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/CmpSassSpecific.java
@@ -17,11 +17,11 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java
index 0638d5bffe..af6b2e0b22 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/DeltaTSpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
import org.apache.sis.storage.gsf.TimeSpec;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100Specific.java
index 8f50c7c057..71272fa816 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM100Specific.java
@@ -17,11 +17,11 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java
index 64c191ee2d..855cfcea14 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM121ASpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12Specific.java
index 7524e0691f..e945566601 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM12Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java
index eaea3ca8c9..63127eaa38 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3ImagerySpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java
index 44a02b76c0..46bf4e7ffc 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawTxSector.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawTxSector.java
index 2de4bb5868..c8f774a307 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawTxSector.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RawTxSector.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RunTime.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RunTime.java
index f374d18a8c..8b1ff798c2 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RunTime.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3RunTime.java
@@ -17,13 +17,13 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
import org.apache.sis.storage.gsf.TimeSpec;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Specific.java
index 8dbe25d55d..268bbff8fc 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM3Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java
index 94ca66fa1d..b1121d08b9 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4ImagerySpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Specific.java
index e2d32da80f..9fd9a2fa07 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4TxSector.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4TxSector.java
index 706062db88..9d911ea96e 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4TxSector.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM4TxSector.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950Specific.java
index d3c776a189..6dd69e62dc 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EM950Specific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMPUStatus.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMPUStatus.java
index 55d3606c13..f822c90ba0 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMPUStatus.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMPUStatus.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMRunTime.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMRunTime.java
index ae7ba25452..16a2378ce4 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMRunTime.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EMRunTime.java
@@ -18,13 +18,13 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
import org.apache.sis.storage.gsf.TimeSpec;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EchotracSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EchotracSpecific.java
index 968c6894ed..626758479a 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EchotracSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/EchotracSpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java
index 88e0647567..233778183c 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ElacMkIISpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java
index 043e0d8501..09bce0ab2f 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/GeoSwathPlusSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLExtraDet.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLExtraDet.java
index 2e58becc74..56b4764b17 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLExtraDet.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLExtraDet.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagerySpecific.java
index 73ab36cdd2..2e7e318f6f 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLImagerySpecific.java
@@ -22,6 +22,7 @@ import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java
index 1f16b988ae..0838f264c9 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLSpecific.java
@@ -17,11 +17,11 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLTxSector.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLTxSector.java
index 9bfa5b4218..9b9ea176c1 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLTxSector.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/KMALLTxSector.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagerySpecific.java
index 575581ccb9..65c3de6b7e 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssImagerySpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssSpecific.java
index 8e75bfc3a0..4ad27ebb23 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Klein5410BssSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77Specific.java
index ca139d231e..e78168c955 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/MGD77Specific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java
index 77487789c7..df79b8d3f5 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java
index c0bfa84864..71be3dfb13 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicImagerySpecific.java
@@ -18,13 +18,13 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
import org.apache.sis.storage.gsf.TimeSpec;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicSpecific.java
index 424f7464f1..99783ada64 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/R2SonicSpecific.java
@@ -18,13 +18,13 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
import org.apache.sis.storage.gsf.TimeSpec;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100ImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100ImagerySpecific.java
index cf4a17c9bb..c19f3165ef 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100ImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100ImagerySpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Specific.java
index cca3cd8df9..103f2a5b07 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson7100Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100ImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100ImagerySpecific.java
index 4c9916757a..f75c8db15d 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100ImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100ImagerySpecific.java
@@ -22,6 +22,7 @@ import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Specific.java
index 03afbf688b..49dd2fe0a6 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/Reson8100Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java
index a6620fa476..046bd340e9 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesImagerySpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java
index 878057977d..d9c51234ef 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/ResonTSeriesSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java
index fbfca75bb2..8343947c6e 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBAmpSpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java
index 545c6f3691..70f3ead018 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBBDBSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java
index d841b8e5c9..9e17258f9d 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBEchotracSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77Specific.java
index 1c4e72dc24..ebc3b9875d 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBMGD77Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java
index 5ea8248a80..9ba1d237df 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNOSHDBSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java
index 656ae74a8e..49c96cd548 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SBNavisoundSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java
index 67d4743d5c..7f9f100ab2 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBat8101Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java
index 7bd255c284..cd984f6cbf 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java
index 9c6f0c6a0a..d0de3c2c5c 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBatSpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java
index 6afc140e96..d50b497091 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeaBeam2112Specific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeabeamSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeabeamSpecific.java
index e55fda14ef..c8d633ba33 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeabeamSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeabeamSpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java
index 5eed90d378..9fb9400ead 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/SeamapSpecific.java
@@ -18,12 +18,12 @@ package org.apache.sis.storage.gsf.specific;
import java.lang.invoke.*;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIIISpecific.java
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIIISpecific.java
index d2dd3ccdb1..aab7d8b473 100644
---
a/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIIISpecific.java
+++
b/incubator/src/org.apache.sis.storage.gsf/main/org/apache/sis/storage/gsf/specific/TypeIIISpecific.java
@@ -17,12 +17,12 @@
package org.apache.sis.storage.gsf.specific;
import java.lang.foreign.*;
-
import static java.lang.foreign.ValueLayout.*;
import static java.lang.foreign.MemoryLayout.PathElement.*;
import org.apache.sis.storage.gsf.GSF;
import org.apache.sis.storage.gsf.StructClass;
+
/**
*
* @author Johann Sorel (Geomatys)
diff --git
a/incubator/src/org.apache.sis.storage.gsf/test/org/apache/sis/storage/gsf/StoreTest.java
b/incubator/src/org.apache.sis.storage.gsf/test/org/apache/sis/storage/gsf/StoreTest.java
index 130325b058..3e84482b21 100644
---
a/incubator/src/org.apache.sis.storage.gsf/test/org/apache/sis/storage/gsf/StoreTest.java
+++
b/incubator/src/org.apache.sis.storage.gsf/test/org/apache/sis/storage/gsf/StoreTest.java
@@ -16,5 +16,6 @@
*/
package org.apache.sis.storage.gsf;
+
public final class StoreTest {
}
diff --git
a/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
b/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
index 80e2813ab1..43a300a918 100644
---
a/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
+++
b/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
@@ -20,10 +20,9 @@ import java.io.IOException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
-import java.util.ServiceLoader;
import javax.sql.DataSource;
+import java.util.ServiceLoader;
import org.opengis.util.FactoryException;
-import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.apache.sis.setup.InstallationResources;
import org.apache.sis.metadata.sql.privy.Initializer;
import org.apache.sis.system.DataDirectory;
@@ -36,6 +35,9 @@ import static org.junit.jupiter.api.Assertions.*;
import static org.junit.jupiter.api.Assumptions.assumeTrue;
import org.apache.sis.test.TestUtilities;
+// Specific to the geoapi-3.1 and geoapi-4.0 branches:
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+
/**
* Tests {@link EmbeddedResources}.
diff --git
a/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/Generator.java
b/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/Generator.java
index 05a9c266a2..fcc3b69f99 100644
---
a/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/Generator.java
+++
b/optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/Generator.java
@@ -32,16 +32,16 @@ import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
+import org.apache.derby.jdbc.EmbeddedDataSource;
import org.opengis.util.FactoryException;
import org.opengis.referencing.crs.GeographicCRS;
-import org.apache.derby.jdbc.EmbeddedDataSource;
+import org.apache.sis.metadata.MetadataStandard;
+import org.apache.sis.metadata.sql.MetadataSource;
+import org.apache.sis.metadata.sql.MetadataStoreException;
import org.apache.sis.metadata.sql.privy.Initializer;
import org.apache.sis.metadata.sql.privy.LocalDataSource;
import org.apache.sis.system.DataDirectory;
import org.apache.sis.system.Shutdown;
-import org.apache.sis.metadata.MetadataStandard;
-import org.apache.sis.metadata.sql.MetadataSource;
-import org.apache.sis.metadata.sql.MetadataStoreException;
import org.apache.sis.referencing.factory.sql.EPSGFactory;
import org.apache.sis.referencing.factory.sql.epsg.ScriptProvider;
