This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit bece843ce420f0355a4b0dc1f1effc2337594ff3
Merge: f76afb0622 3014fe6003
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Jan 17 15:27:57 2023 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1.
Contains cleanup on serialization, loggers, rounding errors (again),
javadoc.
.../java/org/apache/sis/console/AboutCommand.java | 4 +-
.../java/org/apache/sis/console/package-info.java | 2 +-
.../main/java/org/apache/sis/gui/RecentFiles.java | 14 +-
.../apache/sis/gui/coverage/CoverageCanvas.java | 7 +-
.../apache/sis/gui/coverage/GridSliceSelector.java | 8 +-
.../org/apache/sis/gui/dataset/FeatureLoader.java | 2 +
.../org/apache/sis/gui/dataset/FeatureTable.java | 9 +-
.../org/apache/sis/gui/dataset/PathAction.java | 12 +-
.../org/apache/sis/gui/dataset/ResourceCell.java | 4 +-
.../org/apache/sis/gui/dataset/ResourceEvent.java | 33 +-
.../org/apache/sis/gui/dataset/ResourceTree.java | 9 +-
.../org/apache/sis/gui/dataset/WindowHandler.java | 8 +-
.../org/apache/sis/gui/dataset/package-info.java | 2 +-
.../org/apache/sis/gui/map/GestureFollower.java | 8 +-
.../java/org/apache/sis/gui/map/MapCanvas.java | 7 +-
.../java/org/apache/sis/gui/map/MapCanvasAWT.java | 3 +
.../org/apache/sis/gui/map/OperationFinder.java | 7 +-
.../java/org/apache/sis/gui/map/StatusBar.java | 6 +-
.../org/apache/sis/gui/map/ValuesFormatter.java | 7 +-
.../org/apache/sis/gui/metadata/MetadataTree.java | 7 +-
.../org/apache/sis/gui/metadata/package-info.java | 2 +-
.../apache/sis/gui/referencing/AuthorityCodes.java | 7 +-
.../gui/referencing/PositionableProjection.java | 8 +-
.../gui/referencing/RecentReferenceSystems.java | 7 +-
.../java/org/apache/sis/gui/referencing/Utils.java | 7 +-
.../apache/sis/internal/gui/BackgroundThreads.java | 7 +-
.../apache/sis/internal/gui/ImageConverter.java | 7 +-
.../org/apache/sis/internal/gui/LogHandler.java | 10 +-
.../org/apache/sis/internal/gui/RecentChoices.java | 2 +
.../java/org/apache/sis/internal/gui/Styles.java | 7 +-
.../apache/sis/internal/gui/control/ColorCell.java | 6 +-
.../org/apache/sis/internal/gui/package-info.java | 2 +-
.../org/apache/sis/coverage/SampleRangeFormat.java | 2 +
.../coverage/grid/CoordinateOperationFinder.java | 7 +-
.../apache/sis/coverage/grid/DefaultEvaluator.java | 7 +-
.../sis/coverage/grid/GridCoverageProcessor.java | 7 +-
.../org/apache/sis/coverage/grid/GridExtent.java | 11 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 4 +-
.../apache/sis/feature/AbstractIdentifiedType.java | 9 +-
.../java/org/apache/sis/feature/FeatureFormat.java | 7 +-
.../java/org/apache/sis/feature/package-info.java | 2 +-
.../apache/sis/image/BandedSampleConverter.java | 7 +-
.../java/org/apache/sis/image/ErrorAction.java | 13 +-
.../main/java/org/apache/sis/image/MaskImage.java | 7 +-
.../java/org/apache/sis/image/ResampledImage.java | 7 +-
.../java/org/apache/sis/image/ResamplingGrid.java | 2 +
.../java/org/apache/sis/image/package-info.java | 2 +-
.../sis/internal/coverage/j2d/ImageLayout.java | 4 +
.../sis/internal/coverage/j2d/ImageUtilities.java | 15 +-
.../apache/sis/internal/feature/Geometries.java | 9 +-
.../sis/internal/feature/GeometryFactories.java | 6 +-
.../org/apache/sis/internal/feature/jts/JTS.java | 7 +-
.../sis/internal/feature/jts/package-info.java | 2 +-
.../apache/sis/internal/feature/package-info.java | 2 +-
.../java/org/apache/sis/internal/filter/Node.java | 12 +-
.../internal/filter/sqlmm/RegistryTestCase.java | 8 +-
.../apache/sis/internal/metadata/Dependencies.java | 3 +-
.../sis/internal/metadata/ServicesForUtility.java | 8 +-
.../internal/metadata/legacy/DateToTemporal.java | 25 +-
.../internal/metadata/legacy/TemporalToDate.java | 25 +-
.../sis/internal/metadata/legacy/package-info.java | 2 +-
.../sis/internal/metadata/sql/Initializer.java | 32 +-
.../sis/internal/metadata/sql/LocalDataSource.java | 14 +-
.../sis/internal/metadata/sql/package-info.java | 2 +-
.../sis/internal/simple/CitationConstant.java | 12 +-
.../apache/sis/internal/simple/package-info.java | 2 +-
.../org/apache/sis/metadata/AbstractMetadata.java | 4 +-
.../org/apache/sis/metadata/MetadataStandard.java | 2 +
.../apache/sis/metadata/PropertyInformation.java | 11 +-
.../sis/metadata/StandardImplementation.java | 15 +-
.../org/apache/sis/metadata/TreeNodeChildren.java | 4 +-
.../java/org/apache/sis/metadata/package-info.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java | 10 +-
.../org/apache/sis/metadata/sql/package-info.java | 2 +-
.../main/java/org/apache/sis/util/iso/Types.java | 18 +-
.../main/java/org/apache/sis/xml/LegacyCodes.java | 8 +-
.../java/org/apache/sis/xml/MarshallerPool.java | 14 +-
.../java/org/apache/sis/xml/NilObjectHandler.java | 4 +-
.../main/java/org/apache/sis/xml/NilReason.java | 4 +-
.../src/main/java/org/apache/sis/xml/XLink.java | 8 +-
.../src/main/java/org/apache/sis/xml/XML.java | 4 +-
.../coverage/MultiResolutionCoverageLoader.java | 2 +
.../sis/internal/map/coverage/RenderingData.java | 12 +-
.../sis/internal/map/coverage/package-info.java | 2 +-
.../main/java/org/apache/sis/portrayal/Canvas.java | 5 +-
.../org/apache/sis/portrayal/CanvasContext.java | 2 +
.../org/apache/sis/portrayal/CanvasFollower.java | 4 +-
.../java/org/apache/sis/portrayal/Observable.java | 9 +-
.../apache/sis/portrayal/TransformChangeEvent.java | 4 +-
.../gazetteer/MilitaryGridReferenceSystem.java | 8 +-
.../gazetteer/ReferencingByIdentifiers.java | 12 +-
.../sis/referencing/gazetteer/package-info.java | 2 +-
.../org/apache/sis/geometry/AbstractEnvelope.java | 4 +-
.../org/apache/sis/geometry/CoordinateFormat.java | 14 +-
.../java/org/apache/sis/geometry/Envelopes.java | 13 +-
.../apache/sis/geometry/GeneralDirectPosition.java | 6 +-
.../apache/sis/geometry/WraparoundAdjustment.java | 6 +-
.../java/org/apache/sis/geometry/package-info.java | 2 +-
.../sis/internal/referencing/Arithmetic.java | 4 +-
.../internal/referencing/DefinitionVerifier.java | 2 +-
.../sis/internal/referencing/DeprecatedCode.java | 9 +-
.../sis/internal/referencing/DeprecatedName.java | 9 +-
.../apache/sis/internal/referencing/Formulas.java | 8 +-
.../referencing/PositionalAccuracyConstant.java | 4 +
.../sis/internal/referencing/WKTKeywords.java | 6 +-
.../sis/internal/referencing/WKTUtilities.java | 9 +-
.../referencing/provider/AbstractProvider.java | 12 +-
.../referencing/provider/DatumShiftGridFile.java | 65 ++--
.../referencing/provider/DatumShiftGridGroup.java | 6 +-
.../referencing/provider/DatumShiftGridLoader.java | 62 +++-
.../provider/FranceGeocentricInterpolation.java | 361 +++++++++++----------
.../referencing/provider/GeocentricAffine.java | 7 +-
.../referencing/provider/Geographic3Dto2D.java | 6 +-
.../provider/MolodenskyInterpolation.java | 1 +
.../sis/internal/referencing/provider/NADCON.java | 93 +++---
.../sis/internal/referencing/provider/NTv2.java | 54 ++-
.../referencing/provider/VerticalOffset.java | 6 +-
.../java/org/apache/sis/io/wkt/AbstractParser.java | 14 +-
.../main/java/org/apache/sis/io/wkt/Formatter.java | 3 +
.../java/org/apache/sis/io/wkt/WKTDictionary.java | 6 +-
.../main/java/org/apache/sis/io/wkt/WKTFormat.java | 16 +-
.../sis/parameter/DefaultParameterValue.java | 12 +-
.../apache/sis/parameter/ParameterValueList.java | 6 +-
.../java/org/apache/sis/parameter/Verifier.java | 12 +-
.../org/apache/sis/parameter/package-info.java | 2 +-
.../apache/sis/referencing/AuthorityFactories.java | 11 +-
.../main/java/org/apache/sis/referencing/CRS.java | 12 +-
.../java/org/apache/sis/referencing/CommonCRS.java | 9 +-
.../sis/referencing/GeodesicsOnEllipsoid.java | 6 +-
.../apache/sis/referencing/IdentifiedObjects.java | 6 +-
.../sis/referencing/ImmutableIdentifier.java | 4 +-
.../sis/referencing/crs/DefaultEngineeringCRS.java | 4 +-
.../sis/referencing/crs/ExplicitParameters.java | 11 +-
.../apache/sis/referencing/crs/package-info.java | 2 +-
.../org/apache/sis/referencing/cs/AbstractCS.java | 11 +-
.../sis/referencing/cs/CoordinateSystems.java | 5 +-
.../sis/referencing/cs/DirectionAlongMeridian.java | 7 +-
.../sis/referencing/datum/DatumShiftGrid.java | 6 +-
.../referencing/datum/DefaultGeodeticDatum.java | 23 +-
.../factory/AuthorityFactoryIdentifier.java | 7 +-
.../factory/CommonAuthorityFactory.java | 5 +-
.../factory/ConcurrentAuthorityFactory.java | 24 +-
.../factory/GeodeticAuthorityFactory.java | 9 +-
.../referencing/factory/GeodeticObjectFactory.java | 9 +-
.../factory/IdentifiedObjectFinder.java | 8 +-
.../referencing/factory/IdentifiedObjectSet.java | 8 +-
.../factory/MultiAuthoritiesFactory.java | 9 +-
.../sis/referencing/factory/ReferenceKeeper.java | 3 +
.../factory/sql/CloseableReference.java | 7 +-
.../referencing/factory/sql/EPSGCodeFinder.java | 11 +-
.../referencing/factory/sql/EPSGDataAccess.java | 19 +-
.../sis/referencing/factory/sql/EPSGFactory.java | 3 +-
.../factory/sql/InstallationScriptProvider.java | 6 +-
.../sis/referencing/factory/sql/package-info.java | 9 +-
.../operation/AbstractCoordinateOperation.java | 12 +-
.../operation/CoordinateOperationRegistry.java | 15 +-
.../DefaultCoordinateOperationFactory.java | 2 +
.../operation/builder/LinearTransformBuilder.java | 6 +-
.../operation/builder/LocalizationGridBuilder.java | 2 +
.../operation/builder/ProjectedTransformTry.java | 12 +-
.../operation/matrix/GeneralMatrix.java | 4 +
.../referencing/operation/projection/Mercator.java | 3 +-
.../operation/projection/NormalizedProjection.java | 8 +-
.../operation/projection/Orthographic.java | 4 +-
.../operation/projection/TransverseMercator.java | 2 +
.../transform/AbstractLinearTransform.java | 4 +-
.../operation/transform/AbstractMathTransform.java | 9 +-
.../operation/transform/ConcatenatedTransform.java | 12 +-
.../operation/transform/ContextualParameters.java | 5 +-
.../transform/DefaultMathTransformFactory.java | 11 +-
.../operation/transform/InterpolatedTransform.java | 3 +
.../operation/transform/ProjectiveTransform.java | 221 ++++++++++---
.../operation/transform/WraparoundTransform.java | 7 +-
.../src/main/resources/META-INF/GIGS.properties | 80 +++++
.../referencing/provider/DatumShiftTestCase.java | 23 +-
.../FranceGeocentricInterpolationTest.java | 34 +-
.../internal/referencing/provider/NADCONTest.java | 11 +-
.../internal/referencing/provider/NTv2Test.java | 19 +-
.../factory/ConcurrentAuthorityFactoryTest.java | 6 +-
.../sis/referencing/factory/TestFactorySource.java | 8 +-
.../transform/ProjectiveTransformTest.java | 19 +-
.../transform/TransformResultComparator.java | 2 +-
.../sis/test/integration/DatumShiftTest.java | 10 +-
.../org/apache/sis/internal/jdk17/HexFormat.java | 6 +-
.../apache/sis/internal/system/CommonExecutor.java | 1 +
.../apache/sis/internal/system/Configuration.java | 91 ++++++
.../apache/sis/internal/system/DataDirectory.java | 30 +-
.../sis/internal/system/DefaultFactories.java | 5 +-
.../sis/internal/system/DelayedExecutor.java | 6 +-
.../org/apache/sis/internal/system/Loggers.java | 9 +-
.../sis/internal/system/OptionalDependency.java | 2 +-
.../internal/system/ReferenceQueueConsumer.java | 6 +-
.../org/apache/sis/internal/system/Shutdown.java | 6 +-
.../org/apache/sis/internal/system/Supervisor.java | 11 +-
.../apache/sis/internal/system/SystemListener.java | 8 +-
.../org/apache/sis/internal/system/Threads.java | 6 +-
.../apache/sis/internal/util/DefinitionURI.java | 6 +-
.../org/apache/sis/internal/util/DoubleDouble.java | 4 +
.../org/apache/sis/internal/util/Numerics.java | 3 +
.../sis/internal/util/StandardDateFormat.java | 13 +-
.../main/java/org/apache/sis/math/Fraction.java | 2 +-
.../src/main/java/org/apache/sis/math/Plane.java | 2 +
.../src/main/java/org/apache/sis/math/Vector.java | 10 +-
.../java/org/apache/sis/measure/AbstractUnit.java | 11 +-
.../apache/sis/measure/DefaultQuantityFactory.java | 2 +-
.../org/apache/sis/measure/QuantityFormat.java | 9 +-
.../main/java/org/apache/sis/measure/Scalar.java | 5 +-
.../java/org/apache/sis/measure/UnitFormat.java | 7 +-
.../java/org/apache/sis/measure/UnitRegistry.java | 13 +-
.../java/org/apache/sis/measure/UnitServices.java | 4 +-
.../src/main/java/org/apache/sis/setup/About.java | 4 +-
.../java/org/apache/sis/setup/Configuration.java | 11 +-
.../main/java/org/apache/sis/setup/OptionKey.java | 2 +-
.../java/org/apache/sis/setup/package-info.java | 2 +-
.../java/org/apache/sis/util/Configuration.java | 44 ---
.../src/main/java/org/apache/sis/util/Locales.java | 9 +-
.../src/main/java/org/apache/sis/util/Numbers.java | 2 +-
.../java/org/apache/sis/util/collection/Cache.java | 8 +-
.../apache/sis/util/collection/CodeListSet.java | 4 +-
.../sis/util/collection/DefaultTreeTable.java | 9 +-
.../sis/util/collection/FrequencySortedSet.java | 6 +-
.../apache/sis/util/collection/TreeNodeList.java | 4 +-
.../java/org/apache/sis/util/logging/Logging.java | 57 +++-
.../apache/sis/util/logging/MonolineFormatter.java | 15 +-
.../apache/sis/util/logging/PerformanceLevel.java | 7 +-
.../sis/util/resources/IndexedResourceBundle.java | 18 +-
.../apache/sis/util/resources/package-info.java | 2 +-
.../src/test/java/org/apache/sis/test/Assume.java | 7 +-
.../java/org/apache/sis/test/package-info.java | 2 +-
ide-project/NetBeans/nbproject/project.xml | 1 +
.../sis/storage/landsat/LandsatStoreProvider.java | 18 +-
.../storage/inflater/CompressionChannel.java | 6 +-
.../sis/storage/geotiff/GeoTiffStoreProvider.java | 18 +-
.../org/apache/sis/storage/geotiff/Reader.java | 6 +-
.../org/apache/sis/internal/netcdf/Decoder.java | 16 +-
.../org/apache/sis/internal/netcdf/FeatureSet.java | 2 +
.../apache/sis/internal/netcdf/package-info.java | 2 +-
.../apache/sis/storage/netcdf/MetadataReader.java | 2 +
.../sis/storage/netcdf/NetcdfStoreProvider.java | 14 +-
.../apache/sis/storage/netcdf/package-info.java | 2 +-
.../apache/sis/storage/sql/SQLStoreProvider.java | 18 +-
.../internal/storage/DocumentedStoreProvider.java | 5 +-
.../sis/internal/storage/StoreUtilities.java | 2 +
.../sis/internal/storage/csv/StoreProvider.java | 20 +-
.../storage/esri/AsciiGridStoreProvider.java | 18 +-
.../storage/esri/RawRasterStoreProvider.java | 18 +-
.../sis/internal/storage/esri/package-info.java | 2 +-
.../sis/internal/storage/folder/StoreProvider.java | 18 +-
.../sis/internal/storage/folder/package-info.java | 2 +-
.../storage/image/WorldFileStoreProvider.java | 18 +-
.../internal/storage/io/FileCacheByteChannel.java | 18 +-
.../sis/internal/storage/io/HttpByteChannel.java | 2 +-
.../sis/internal/storage/io/IOUtilities.java | 21 --
.../internal/storage/io/MemoryDataTransfer.java | 4 +-
.../internal/storage/io/RewindableLineReader.java | 7 +-
.../apache/sis/internal/storage/package-info.java | 2 +-
.../sis/internal/storage/wkt/FirstKeywordPeek.java | 1 +
.../sis/internal/storage/wkt/StoreProvider.java | 18 +-
.../sis/internal/storage/wkt/package-info.java | 2 +-
.../sis/internal/storage/xml/StoreProvider.java | 16 +
.../org/apache/sis/storage/AbstractResource.java | 12 +-
.../org/apache/sis/storage/DataStoreProvider.java | 26 +-
.../org/apache/sis/storage/ProbeInputStream.java | 4 +-
.../java/org/apache/sis/storage/ProbeReader.java | 4 +-
.../org/apache/sis/storage/StorageConnector.java | 31 +-
.../aggregate/ConcatenatedGridCoverage.java | 9 +-
.../apache/sis/storage/aggregate/package-info.java | 2 +-
.../apache/sis/storage/event/StoreListeners.java | 5 +-
.../storage/io/FileCacheByteChannelTest.java | 2 +-
.../apache/sis/test/storage/SubsampledImage.java | 4 +-
.../sis/internal/storage/gpx/StoreProvider.java | 16 +
271 files changed, 1958 insertions(+), 1282 deletions(-)
diff --cc
core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
index c70a7d5542,dd8002cada..3f9f599a80
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
+++
b/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
@@@ -19,8 -19,10 +19,9 @@@ package org.apache.sis.internal.referen
import java.util.Map;
import java.util.HashMap;
import java.util.Collection;
+ import java.util.logging.Logger;
import javax.xml.bind.annotation.XmlTransient;
import org.opengis.util.GenericName;
-import org.opengis.metadata.Identifier;
import org.opengis.parameter.ParameterDescriptor;
import org.opengis.parameter.ParameterDescriptorGroup;
import org.opengis.referencing.IdentifiedObject;
@@@ -42,11 -44,6 +43,9 @@@ import org.apache.sis.util.Workaround
import org.apache.sis.util.logging.Logging;
import org.apache.sis.internal.system.Loggers;
- import static java.util.logging.Logger.getLogger;
-
+// Branch-dependent imports
+import org.opengis.referencing.ReferenceIdentifier;
+
/**
* Base class for all providers defined in this package.
