This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 76fed8a0e307b29d364be35321fb2eb5f52d4fe2
Merge: 589b2aa29a ae3809ff1c
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Aug 30 16:26:08 2024 +0200
Merge of automatic reorganization of imports order.
.../main/org/apache/sis/io/wkt/Formatter.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 +-
.../apache/sis/storage/geopackage/GpkgStoreProviderTest.java | 1 +
.../test/org/apache/sis/storage/geopackage/GpkgStoreTest.java | 10 ++++++----
.../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 +
.../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 +
.../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 +
.../sis/storage/gimi/isobmff/iso14496_10/ISO14496_10.java | 1 +
.../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 +
.../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 +
.../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 +
.../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 +
.../sis/storage/gimi/isobmff/iso14496_12/MovieHeader.java | 1 +
.../sis/storage/gimi/isobmff/iso14496_12/OriginalFileType.java | 1 +
.../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 +
.../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 +
.../gimi/isobmff/iso23001_17/FieldInterlaceProperty.java | 1 +
.../storage/gimi/isobmff/iso23001_17/FieldInterlaceType.java | 1 +
.../gimi/isobmff/iso23001_17/FramePackingInformation.java | 1 +
.../sis/storage/gimi/isobmff/iso23001_17/ISO23001_17.java | 1 +
.../isobmff/iso23001_17/PolarizationPatternDefinition.java | 1 +
.../storage/gimi/isobmff/iso23001_17/SensorBadPixelsMap.java | 1 +
.../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 +
.../gimi/isobmff/iso23008_12/DerivedImageReference.java | 1 +
.../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 +-
.../org/apache/sis/storage/gsf/specific/DeltaTSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/EM100Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/EM121ASpecific.java | 2 +-
.../main/org/apache/sis/storage/gsf/specific/EM12Specific.java | 2 +-
.../apache/sis/storage/gsf/specific/EM3ImagerySpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/EM3RawSpecific.java | 2 +-
.../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 +-
.../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 +-
.../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 +-
.../org/apache/sis/storage/gsf/specific/KMALLExtraDet.java | 2 +-
.../apache/sis/storage/gsf/specific/KMALLImagerySpecific.java | 1 +
.../org/apache/sis/storage/gsf/specific/KMALLSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/KMALLTxSector.java | 2 +-
.../sis/storage/gsf/specific/Klein5410BssImagerySpecific.java | 2 +-
.../apache/sis/storage/gsf/specific/Klein5410BssSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/MGD77Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/NOSHDBSpecific.java | 2 +-
.../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 +-
.../org/apache/sis/storage/gsf/specific/SBAmpSpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SBBDBSpecific.java | 2 +-
.../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 +-
.../apache/sis/storage/gsf/specific/SBNavisoundSpecific.java | 2 +-
.../apache/sis/storage/gsf/specific/SeaBat8101Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SeaBatIISpecific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SeaBatSpecific.java | 2 +-
.../apache/sis/storage/gsf/specific/SeaBeam2112Specific.java | 2 +-
.../org/apache/sis/storage/gsf/specific/SeabeamSpecific.java | 2 +-
.../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 +
.../apache/sis/resources/embedded/EmbeddedResourcesTest.java | 7 ++++---
.../test/org/apache/sis/resources/embedded/Generator.java | 8 ++++----
168 files changed, 206 insertions(+), 105 deletions(-)
diff --cc
endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
index 1bb9d6cded,d99f986546..73aa117077
---
a/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
+++
b/endorsed/src/org.apache.sis.referencing/main/org/apache/sis/io/wkt/Formatter.java
@@@ -87,12 -87,9 +87,12 @@@ import org.apache.sis.geometry.Abstract
import org.apache.sis.geometry.AbstractEnvelope;
import org.apache.sis.xml.NilObject;
-// Specific to the geoapi-3.1 and geoapi-4.0 branches:
-import org.opengis.util.ControlledVocabulary;
-import org.opengis.referencing.ObjectDomain;
+// Specific to the main branch:
+import org.opengis.util.CodeList;
+import org.opengis.referencing.ReferenceIdentifier;
+import org.apache.sis.referencing.DefaultObjectDomain;
- import org.apache.sis.referencing.datum.AbstractDatum;
+import org.apache.sis.referencing.internal.Legacy;
++import org.apache.sis.referencing.datum.AbstractDatum;
/**
diff --cc
incubator/src/org.apache.sis.storage.geopackage/test/org/apache/sis/storage/geopackage/GpkgStoreTest.java
index a64f58c76d,16e3b39753..c5e817d599
---
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
@@@ -50,6 -47,11 +47,11 @@@ import org.junit.jupiter.api.parallel.E
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;
++// Specific to the main branch:
++import org.apache.sis.feature.AbstractFeature;
++import org.apache.sis.feature.AbstractIdentifiedType;
++import org.apache.sis.feature.DefaultAttributeType;
+
/**
* Tests the Geopackage store.
diff --cc
optional/src/org.apache.sis.referencing.database/test/org/apache/sis/resources/embedded/EmbeddedResourcesTest.java
index 8858f0d601,43a300a918..ce68429433
---
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
@@@ -37,6 -35,9 +35,9 @@@ import static org.junit.jupiter.api.Ass
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;
++// Specific to the main branch:
++import org.apache.sis.referencing.crs.AbstractCRS;
+
/**
* Tests {@link EmbeddedResources}.
