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 1437fa191c2a13fc2bfffcb010a511b852479a1f Merge: 0a621ef6cf 2639c21ad3 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sun Feb 26 16:24:59 2023 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../org/apache/sis/console/MimeTypeCommand.java | 4 +- .../apache/sis/gui/coverage/CoverageCanvas.java | 2 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 55 +++- .../java/org/apache/sis/gui/map/MapCanvasAWT.java | 9 +- .../map/RenderingTask.java} | 29 +- .../apache/sis/internal/gui/BackgroundThreads.java | 13 +- .../apache/sis/internal/gui/DataStoreOpener.java | 62 ++-- .../apache/sis/internal/gui/io/FileAccessItem.java | 365 +++++++++++++++++---- .../apache/sis/internal/gui/io/FileAccessView.java | 41 ++- .../apache/sis/internal/gui/io/package-info.java | 2 +- .../org/apache/sis/internal/setup/FXFinder.java | 5 +- .../apache/sis/cloud/aws/s3/CachedByteChannel.java | 20 +- core/sis-build-helper/pom.xml | 1 + .../apache/sis/internal/book/CodeColorizer.java | 16 +- .../org/apache/sis/internal/doclet/Doclet.java | 3 +- .../org/apache/sis/internal/doclet/Rewriter.java | 4 +- .../org/apache/sis/internal/doclet/Taglet.java | 3 +- .../org/apache/sis/internal/unopkg/JavaMaker.java | 5 +- .../sis/coverage/grid/BufferedGridCoverage.java | 17 +- .../org/apache/sis/coverage/grid/GridExtent.java | 2 +- .../java/org/apache/sis/image/MaskedImage.java | 2 +- .../java/org/apache/sis/image/PlanarImage.java | 2 +- .../org/apache/sis/image/PixelIteratorTest.java | 4 +- .../sis/internal/metadata/sql/LocalDataSource.java | 7 +- .../org/apache/sis/metadata/sql/Citations.sql | 2 +- .../sis/metadata/iso/citation/CitationsTest.java | 2 +- .../sis/metadata/sql/MetadataSourceTest.java | 2 +- .../org/apache/sis/xml/RenameListGenerator.java | 6 +- .../sis/internal/map/coverage/RenderingData.java | 31 +- .../org/apache/sis/geometry/AbstractEnvelope.java | 16 +- .../org/apache/sis/geometry/GeneralEnvelope.java | 10 +- .../referencing/PositionalAccuracyConstant.java | 2 +- .../apache/sis/internal/referencing/Resources.java | 5 + .../sis/internal/referencing/Resources.properties | 1 + .../internal/referencing/Resources_fr.properties | 1 + .../apache/sis/internal/referencing/j2d/Tile.java | 5 +- .../internal/referencing/j2d/TileOrganizer.java | 5 +- .../referencing/provider/DatumShiftGridFile.java | 16 +- .../referencing/provider/DatumShiftGridLoader.java | 26 +- .../provider/FranceGeocentricInterpolation.java | 25 +- .../sis/internal/referencing/provider/NADCON.java | 25 +- .../sis/internal/referencing/provider/NTv2.java | 16 +- .../referencing/provider/PolarStereographicA.java | 21 +- .../referencing/provider/PolarStereographicB.java | 26 +- .../main/java/org/apache/sis/io/wkt/Colors.java | 2 +- .../java/org/apache/sis/io/wkt/WKTDictionary.java | 2 +- .../sis/referencing/AbstractIdentifiedObject.java | 1 + .../java/org/apache/sis/referencing/Builder.java | 2 + .../apache/sis/referencing/GeodeticCalculator.java | 4 - .../operation/transform/AbstractMathTransform.java | 1 + .../FranceGeocentricInterpolationTest.java | 6 +- .../internal/referencing/provider/NADCONTest.java | 17 +- .../internal/referencing/provider/NTv2Test.java | 27 +- .../factory/sql/epsg/DataScriptFormatter.java | 3 +- .../sis/test/integration/DatumShiftTest.java | 15 +- .../sis/internal/converter/PathConverter.java | 5 +- .../sis/internal/converter/StringConverter.java | 2 +- .../apache/sis/internal/system/CommonExecutor.java | 2 +- .../apache/sis/internal/system/DataDirectory.java | 3 +- .../internal/util/ArgumentCheckByAssertion.java | 30 +- .../org/apache/sis/internal/util/DoubleDouble.java | 2 +- .../src/main/java/org/apache/sis/io/IO.java | 2 +- .../main/java/org/apache/sis/measure/Range.java | 43 +-- .../src/main/java/org/apache/sis/util/Static.java | 100 +++--- .../java/org/apache/sis/util/collection/Cache.java | 2 +- .../org/apache/sis/util/collection/RangeSet.java | 45 ++- .../org/apache/sis/util/logging/Initializer.java | 3 +- .../apache/sis/util/logging/MonolineFormatter.java | 18 +- .../internal/converter/StringConverterTest.java | 3 +- .../org/apache/sis/test/ProjectDirectories.java | 3 +- .../apache/sis/util/collection/RangeSetTest.java | 51 ++- ide-project/NetBeans/README.txt | 31 -- pom.xml | 5 - .../java/org/apache/sis/storage/landsat/Band.java | 3 +- .../apache/sis/storage/landsat/LandsatStore.java | 56 ++-- .../sis/storage/landsat/LandsatStoreProvider.java | 3 +- .../apache/sis/storage/landsat/package-info.java | 2 +- .../org/apache/sis/internal/geotiff/Resources.java | 6 + .../sis/internal/geotiff/Resources.properties | 1 + .../sis/internal/geotiff/Resources_fr.properties | 1 + .../storage/inflater/CompressionChannel.java | 2 +- .../org/apache/sis/storage/geotiff/CRSBuilder.java | 72 +++- .../org/apache/sis/storage/geotiff/DataCube.java | 2 +- .../org/apache/sis/storage/geotiff/DataSubset.java | 47 ++- .../org/apache/sis/storage/geotiff/GeoCodes.java | 8 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 26 +- .../org/apache/sis/storage/geotiff/Reader.java | 1 + .../apache/sis/storage/geotiff/GeoCodesTest.java | 73 +++++ .../apache/sis/test/suite/GeoTiffTestSuite.java | 1 + .../org/apache/sis/internal/netcdf/Decoder.java | 11 +- .../sis/internal/netcdf/impl/ChannelDecoder.java | 7 +- .../sis/internal/netcdf/impl/package-info.java | 2 +- .../sis/internal/netcdf/ucar/DecoderWrapper.java | 20 +- .../sis/internal/netcdf/ucar/package-info.java | 2 +- .../org/apache/sis/storage/netcdf/NetcdfStore.java | 22 +- .../org/apache/sis/internal/netcdf/TestCase.java | 6 +- .../sis/storage/netcdf/MetadataReaderTest.java | 17 +- .../storage/netcdf/NetcdfStoreProviderTest.java | 15 +- .../sis/internal/sql/postgis/RasterReader.java | 14 +- .../sis/internal/storage/GridResourceWrapper.java | 26 +- .../apache/sis/internal/storage/URIDataStore.java | 3 +- .../sis/internal/storage/csv/package-info.java | 2 +- .../sis/internal/storage/esri/AsciiGridStore.java | 29 +- .../sis/internal/storage/esri/RasterStore.java | 2 +- .../sis/internal/storage/esri/RawRasterStore.java | 32 +- .../sis/internal/storage/esri/WritableStore.java | 3 + .../internal/storage/folder/ConcurrentCloser.java | 113 +++++++ .../apache/sis/internal/storage/folder/Store.java | 38 +-- .../internal/storage/image/SingleImageStore.java | 37 +-- .../sis/internal/storage/image/WorldFileStore.java | 51 +-- .../storage/image/WorldFileStoreProvider.java | 4 +- ...ageStore.java => WritableSingleImageStore.java} | 61 ++-- .../sis/internal/storage/image/WritableStore.java | 3 + .../sis/internal/storage/image/package-info.java | 2 +- .../sis/internal/storage/io/ByteRangeChannel.java | 46 +++ .../sis/internal/storage/io/ChannelDataInput.java | 45 +-- .../sis/internal/storage/io/ChannelFactory.java | 32 +- .../internal/storage/io/FileCacheByteChannel.java | 252 ++++++++++---- .../sis/internal/storage/io/HttpByteChannel.java | 14 +- .../sis/internal/storage/io/IOUtilities.java | 16 +- .../storage/io/InputStreamArrayGetter.java | 135 ++++++++ .../org/apache/sis/internal/storage/wkt/Store.java | 25 +- .../org/apache/sis/internal/storage/xml/Store.java | 24 +- .../java/org/apache/sis/storage/DataStore.java | 5 + .../org/apache/sis/storage/StorageConnector.java | 31 +- .../sis/storage/aggregate/MergeStrategy.java | 2 +- .../apache/sis/storage/event/StoreListeners.java | 9 +- .../apache/sis/storage/tiling/TileMatrixSet.java | 1 + .../sis/internal/storage/folder/StoreTest.java | 3 +- .../internal/storage/io/ComputedInputStream.java | 4 +- .../storage/io/FileCacheByteChannelTest.java | 18 +- .../storage/io/InputStreamArrayGetterTest.java | 62 ++++ .../apache/sis/test/suite/StorageTestSuite.java | 1 + .../org/apache/sis/internal/storage/gpx/Store.java | 3 + .../internal/storage/xml/stream/StaxDataStore.java | 27 +- 135 files changed, 2029 insertions(+), 898 deletions(-)
