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 b2d141b5e948e7cd0f65e3720ca2e5b1f143d88a Merge: 1eaa4fa82c db22d5470c Author: Martin Desruisseaux <[email protected]> AuthorDate: Thu Jun 30 11:22:59 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 application/sis-console/src/main/artifact/README | 6 +- .../org/apache/sis/console/TransformCommand.java | 4 +- application/sis-javafx/pom.xml | 5 + application/sis-javafx/src/main/artifact/README | 4 +- .../main/java/org/apache/sis/gui/DataViewer.java | 13 +- .../apache/sis/gui/coverage/CoverageCanvas.java | 286 ++++--- .../apache/sis/gui/coverage/CoverageControls.java | 107 +-- .../apache/sis/gui/coverage/CoverageExplorer.java | 128 ++- .../apache/sis/gui/coverage/CoverageStyling.java | 12 +- .../org/apache/sis/gui/coverage/GridControls.java | 45 +- .../apache/sis/gui/coverage/GridSliceSelector.java | 638 +++++++++++++++ .../java/org/apache/sis/gui/coverage/GridView.java | 95 ++- .../org/apache/sis/gui/coverage/GridViewSkin.java | 19 +- .../org/apache/sis/gui/coverage/ImageRequest.java | 181 ++--- .../gui/coverage/MultiResolutionImageLoader.java | 74 +- .../apache/sis/gui/coverage/ViewAndControls.java | 188 +++-- .../org/apache/sis/gui/coverage/package-info.java | 2 +- .../org/apache/sis/gui/dataset/DataWindow.java | 116 --- .../org/apache/sis/gui/dataset/FeatureTable.java | 6 +- .../java/org/apache/sis/gui/dataset/LoadEvent.java | 47 -- .../java/org/apache/sis/gui/dataset/LogViewer.java | 2 +- .../org/apache/sis/gui/dataset/ResourceEvent.java | 2 +- .../apache/sis/gui/dataset/ResourceExplorer.java | 170 ++-- .../org/apache/sis/gui/dataset/ResourceTree.java | 113 +-- .../org/apache/sis/gui/dataset/SelectedData.java | 91 --- .../org/apache/sis/gui/dataset/WindowHandler.java | 474 +++++++++++ .../org/apache/sis/gui/dataset/WindowManager.java | 246 ++---- .../org/apache/sis/gui/dataset/package-info.java | 2 +- .../org/apache/sis/gui/map/GestureFollower.java | 293 +++++++ .../java/org/apache/sis/gui/map/MapCanvas.java | 339 +++++++- .../java/org/apache/sis/gui/map/MapCanvasAWT.java | 16 +- .../main/java/org/apache/sis/gui/map/MapMenu.java | 4 +- .../org/apache/sis/gui/map/OperationFinder.java | 8 +- .../java/org/apache/sis/gui/map/StatusBar.java | 863 ++++++++++++++++----- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 74 +- .../java/org/apache/sis/gui/map/package-info.java | 2 +- .../org/apache/sis/gui/metadata/MetadataTree.java | 4 +- .../main/java/org/apache/sis/gui/package-info.java | 2 +- .../apache/sis/gui/referencing/AuthorityCodes.java | 4 +- .../org/apache/sis/gui/referencing/MenuSync.java | 291 +++++-- .../sis/gui/referencing/ObjectStringConverter.java | 14 +- .../gui/referencing/PositionableProjection.java | 4 +- .../gui/referencing/RecentReferenceSystems.java | 391 +++++++--- .../java/org/apache/sis/gui/referencing/Utils.java | 4 +- .../apache/sis/internal/gui/BackgroundThreads.java | 28 +- .../apache/sis/internal/gui/DataStoreOpener.java | 106 ++- .../apache/sis/internal/gui/ExceptionReporter.java | 62 +- .../org/apache/sis/internal/gui/GUIUtilities.java | 54 +- .../apache/sis/internal/gui/ImageConverter.java | 4 +- .../sis/internal/gui/OptionalDataDownloader.java | 2 +- .../org/apache/sis/internal/gui/PrivateAccess.java | 54 ++ .../org/apache/sis/internal/gui/Resources.java | 15 + .../apache/sis/internal/gui/Resources.properties | 3 + .../sis/internal/gui/Resources_fr.properties | 3 + .../java/org/apache/sis/internal/gui/Styles.java | 13 +- .../org/apache/sis/internal/gui/ToolbarButton.java | 8 +- .../internal/gui/control/ColorColumnHandler.java | 5 +- .../sis/internal/gui/control/SyncWindowList.java | 252 ++++++ .../sis/internal/gui/control/TabularWidget.java | 99 +++ .../sis/internal/gui/control/ValueColorMapper.java | 26 +- .../sis/internal/gui/control/package-info.java | 2 +- .../org/apache/sis/internal/gui/package-info.java | 2 +- .../apache/sis/gui/coverage/CoverageCanvasApp.java | 4 +- .../sis/gui/coverage/GridSliceSelectorApp.java | 80 ++ .../java/org/apache/sis/openoffice/CalcAddins.java | 3 +- .../org/apache/sis/internal/book/Assembler.java | 111 +-- .../book/{Resources.java => Characters.java} | 37 +- .../apache/sis/internal/book/CodeColorizer.java | 37 +- .../org/apache/sis/internal/book/Resources_en.java | 33 - .../org/apache/sis/internal/book/Resources_fr.java | 47 -- .../org/apache/sis/internal/book/package-info.java | 8 +- .../org/apache/sis/internal/doclet/Rewriter.java | 3 +- .../sis/coverage/grid/BufferedGridCoverage.java | 82 +- .../sis/coverage/grid/ConvertedGridCoverage.java | 66 +- .../coverage/grid/CoordinateOperationFinder.java | 8 +- .../apache/sis/coverage/grid/DomainLinearizer.java | 2 +- .../org/apache/sis/coverage/grid/GridCoverage.java | 17 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 5 +- .../sis/coverage/grid/GridCoverageBuilder.java | 2 +- .../sis/coverage/grid/GridCoverageProcessor.java | 86 +- .../apache/sis/coverage/grid/GridDerivation.java | 39 +- .../apache/sis/coverage/grid/GridEvaluator.java | 207 ++++- .../org/apache/sis/coverage/grid/GridExtent.java | 368 ++++++--- .../apache/sis/coverage/grid/GridExtentCRS.java | 266 ++++++- .../org/apache/sis/coverage/grid/GridGeometry.java | 124 ++- .../apache/sis/coverage/grid/ImageRenderer.java | 18 +- .../sis/coverage/grid/ResampledGridCoverage.java | 13 +- .../apache/sis/coverage/grid/ReshapedImage.java | 31 +- .../apache/sis/coverage/grid/SliceGeometry.java | 9 +- .../org/apache/sis/coverage/grid/package-info.java | 2 +- .../java/org/apache/sis/feature/FeatureFormat.java | 4 +- .../java/org/apache/sis/image/AnnotatedImage.java | 9 +- .../java/org/apache/sis/image/BandSelectImage.java | 23 +- .../apache/sis/image/BandedSampleConverter.java | 60 +- .../java/org/apache/sis/image/ComputedImage.java | 27 + .../main/java/org/apache/sis/image/DataType.java | 14 +- .../java/org/apache/sis/image/ErrorAction.java | 5 +- .../java/org/apache/sis/image/ImageAdapter.java | 11 +- .../java/org/apache/sis/image/ImageProcessor.java | 18 +- .../main/java/org/apache/sis/image/MaskImage.java | 32 +- .../java/org/apache/sis/image/MaskedImage.java | 9 +- .../java/org/apache/sis/image/PlanarImage.java | 10 + .../sis/image/PositionalConsistencyImage.java | 23 +- .../java/org/apache/sis/image/PrefetchedImage.java | 30 +- .../java/org/apache/sis/image/RecoloredImage.java | 8 +- .../java/org/apache/sis/image/ResampledImage.java | 13 +- .../org/apache/sis/image/SourceAlignedImage.java | 28 +- .../org/apache/sis/image/StatisticsCalculator.java | 2 +- .../java/org/apache/sis/image/Visualization.java | 26 +- .../java/org/apache/sis/image/package-info.java | 2 +- .../sis/internal/coverage/CoverageCombiner.java | 4 +- .../internal/coverage/j2d/ColorModelFactory.java | 2 +- .../sis/internal/coverage/j2d/ImageUtilities.java | 4 +- .../org/apache/sis/internal/feature/Resources.java | 5 + .../sis/internal/feature/Resources.properties | 1 + .../sis/internal/feature/Resources_fr.properties | 1 + .../org/apache/sis/internal/feature/jts/JTS.java | 25 +- .../java/org/apache/sis/internal/filter/Node.java | 2 +- .../internal/filter/sqlmm/FunctionWithSRID.java | 8 +- .../sis/internal/filter/sqlmm/OneGeometry.java | 4 +- .../sis/internal/filter/sqlmm/TwoGeometries.java | 4 +- .../sis/internal/filter/sqlmm/package-info.java | 2 +- .../coverage/grid/ConvertedGridCoverageTest.java | 47 +- .../sis/coverage/grid/GridDerivationTest.java | 33 +- .../apache/sis/coverage/grid/GridExtentTest.java | 80 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 59 +- .../apache/sis/image/StatisticsCalculatorTest.java | 6 +- .../apache/sis/internal/feature/jts/JTSTest.java | 16 + .../internal/filter/sqlmm/RegistryTestCase.java | 5 +- .../sis/internal/filter/sqlmm/SQLMMTest.java | 69 +- .../java/org/apache/sis/internal/jaxb/Context.java | 3 +- .../apache/sis/internal/metadata/AxisNames.java | 4 +- .../sis/internal/metadata/ServicesForUtility.java | 6 +- .../sis/internal/metadata/sql/Initializer.java | 7 +- .../sis/internal/metadata/sql/LocalDataSource.java | 4 +- .../sis/internal/simple/CitationConstant.java | 4 +- .../apache/sis/metadata/PropertyInformation.java | 5 +- .../sis/metadata/StandardImplementation.java | 5 +- .../apache/sis/metadata/sql/CachedStatement.java | 3 +- .../main/java/org/apache/sis/util/iso/Types.java | 4 +- .../main/java/org/apache/sis/xml/LegacyCodes.java | 4 +- .../java/org/apache/sis/xml/MarshallerPool.java | 4 +- .../src/main/java/org/apache/sis/xml/XLink.java | 4 +- .../identification/DefaultBrowseGraphicTest.java | 6 +- .../sis/test/xml/AnnotationConsistencyCheck.java | 2 +- .../coverage/MultiResolutionCoverageLoader.java | 28 +- .../sis/internal/map/coverage/RenderingData.java | 121 ++- .../sis/internal/map/coverage/package-info.java | 2 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 139 ++-- .../org/apache/sis/portrayal/CanvasExtent.java | 10 +- .../org/apache/sis/portrayal/CanvasFollower.java | 534 +++++++++++++ .../java/org/apache/sis/portrayal/MapLayer.java | 1 - .../java/org/apache/sis/portrayal/MapLayers.java | 2 - .../java/org/apache/sis/portrayal/Observable.java | 24 +- .../org/apache/sis/portrayal/PlanarCanvas.java | 40 +- .../apache/sis/portrayal/TransformChangeEvent.java | 380 +++++++++ .../org/apache/sis/portrayal/package-info.java | 2 +- .../apache/sis/internal/gazetteer/Resources.java | 5 + .../sis/internal/gazetteer/Resources.properties | 1 + .../sis/internal/gazetteer/Resources_fr.properties | 1 + .../referencing/gazetteer/GazetteerFactory.java | 106 +++ .../gazetteer/GeohashReferenceSystem.java | 214 ++++- .../gazetteer/MilitaryGridReferenceSystem.java | 208 ++++- .../gazetteer/ReferencingByIdentifiers.java | 140 +++- .../sis/referencing/gazetteer/package-info.java | 2 +- .../gazetteer/GazetteerFactoryTest.java | 55 ++ .../gazetteer/GeohashReferenceSystemTest.java | 111 ++- .../gazetteer/MilitaryGridReferenceSystemTest.java | 32 +- .../gazetteer/ReferencingByIdentifiersTest.java | 8 +- .../suite/ReferencingByIdentifiersTestSuite.java | 5 +- .../org/apache/sis/geometry/CoordinateFormat.java | 94 ++- .../org/apache/sis/geometry/DirectPosition2D.java | 14 +- .../java/org/apache/sis/geometry/Envelopes.java | 132 +++- .../apache/sis/geometry/WraparoundAdjustment.java | 4 +- .../java/org/apache/sis/geometry/package-info.java | 2 +- .../sis/internal/referencing/DatabaseListener.java | 4 +- .../apache/sis/internal/referencing/Formulas.java | 17 +- .../internal/referencing/ServicesForMetadata.java | 4 +- .../sis/internal/referencing/j2d/AffineMatrix.java | 42 +- .../referencing/j2d/AffineTransform2D.java | 57 +- .../sis/internal/referencing/j2d/package-info.java | 2 +- .../sis/internal/referencing/package-info.java | 2 +- .../referencing/provider/AbstractProvider.java | 4 +- .../referencing/provider/Equirectangular.java | 2 +- .../referencing/provider/GeocentricAffine.java | 4 +- .../java/org/apache/sis/io/wkt/AbstractParser.java | 3 +- .../sis/parameter/DefaultParameterValue.java | 3 +- .../org/apache/sis/parameter/ParameterFormat.java | 18 +- .../org/apache/sis/parameter/package-info.java | 2 +- .../main/java/org/apache/sis/referencing/CRS.java | 9 +- .../java/org/apache/sis/referencing/CommonCRS.java | 3 +- .../apache/sis/referencing/IdentifiedObjects.java | 3 +- .../sis/referencing/crs/DefaultProjectedCRS.java | 3 +- .../sis/referencing/crs/DefaultTemporalCRS.java | 48 +- .../apache/sis/referencing/crs/package-info.java | 2 +- .../org/apache/sis/referencing/cs/AbstractCS.java | 3 +- .../org/apache/sis/referencing/cs/AxisName.java | 84 ++ .../sis/referencing/cs/CoordinateSystems.java | 24 +- .../sis/referencing/cs/DirectionAlongMeridian.java | 4 +- .../apache/sis/referencing/cs/package-info.java | 2 +- .../sis/referencing/datum/DefaultEllipsoid.java | 21 +- .../referencing/datum/DefaultGeodeticDatum.java | 5 +- .../apache/sis/referencing/datum/package-info.java | 2 +- .../factory/CommonAuthorityFactory.java | 4 +- .../factory/ConcurrentAuthorityFactory.java | 4 +- .../referencing/factory/GeodeticObjectFactory.java | 3 +- .../factory/sql/CloseableReference.java | 4 +- .../referencing/factory/sql/EPSGCodeFinder.java | 3 +- .../referencing/factory/sql/EPSGDataAccess.java | 6 +- .../operation/AbstractCoordinateOperation.java | 3 +- .../operation/CoordinateOperationRegistry.java | 4 +- .../operation/matrix/AffineTransforms2D.java | 2 +- .../operation/projection/Initializer.java | 2 +- .../referencing/operation/projection/Mercator.java | 84 +- .../operation/projection/NormalizedProjection.java | 3 +- .../operation/transform/ConcatenatedTransform.java | 4 +- .../transform/ConcatenatedTransform2D.java | 2 +- .../operation/transform/ContextualParameters.java | 32 +- .../transform/DefaultMathTransformFactory.java | 6 +- .../transform/PassThroughTransform2D.java | 2 +- .../operation/transform/WraparoundTransform.java | 10 +- .../operation/transform/package-info.java | 2 +- .../apache/sis/geometry/CoordinateFormatTest.java | 11 +- .../org/apache/sis/geometry/EnvelopesTest.java | 22 +- .../sis/internal/referencing/FormulasTest.java | 15 +- .../referencing/crs/DefaultTemporalCRSTest.java | 15 +- .../sis/referencing/cs/CoordinateSystemsTest.java | 13 +- .../referencing/datum/DefaultEllipsoidTest.java | 14 +- .../factory/ConcurrentAuthorityFactoryTest.java | 4 +- .../sis/referencing/factory/TestFactorySource.java | 6 +- .../operation/projection/MercatorTest.java | 50 +- .../apache/sis/internal/system/DataDirectory.java | 4 +- .../sis/internal/system/DefaultFactories.java | 6 +- .../sis/internal/system/DelayedExecutor.java | 4 +- .../org/apache/sis/internal/system/Loggers.java | 4 +- .../internal/system/ReferenceQueueConsumer.java | 4 +- .../org/apache/sis/internal/system/Shutdown.java | 4 +- .../org/apache/sis/internal/system/Threads.java | 4 +- .../apache/sis/internal/util/AbstractIterator.java | 2 +- .../apache/sis/internal/util/CollectionsExt.java | 2 +- .../org/apache/sis/internal/util/Constants.java | 2 +- .../apache/sis/internal/util/DefinitionURI.java | 5 +- .../org/apache/sis/internal/util/package-info.java | 2 +- .../main/java/org/apache/sis/io/package-info.java | 2 +- .../src/main/java/org/apache/sis/math/Vector.java | 3 +- .../org/apache/sis/measure/AbstractConverter.java | 3 + .../java/org/apache/sis/measure/AbstractUnit.java | 4 +- .../java/org/apache/sis/measure/NumberRange.java | 36 +- .../java/org/apache/sis/measure/UnitFormat.java | 4 +- .../java/org/apache/sis/measure/UnitServices.java | 4 +- .../main/java/org/apache/sis/measure/Units.java | 1 + .../java/org/apache/sis/measure/package-info.java | 2 +- .../src/main/java/org/apache/sis/setup/About.java | 22 +- .../main/java/org/apache/sis/setup/OptionKey.java | 8 +- .../java/org/apache/sis/util/ArgumentChecks.java | 29 +- .../main/java/org/apache/sis/util/Exceptions.java | 48 +- .../src/main/java/org/apache/sis/util/Locales.java | 3 +- .../org/apache/sis/util/collection/WeakEntry.java | 3 +- .../org/apache/sis/util/logging/DualLogger.java | 107 --- .../apache/sis/util/logging/DualLoggerFactory.java | 89 --- .../org/apache/sis/util/logging/LoggerAdapter.java | 806 ------------------- .../org/apache/sis/util/logging/LoggerFactory.java | 153 ---- .../java/org/apache/sis/util/logging/Logging.java | 123 +-- .../apache/sis/util/logging/MonolineFormatter.java | 8 +- .../apache/sis/util/logging/PerformanceLevel.java | 30 +- .../org/apache/sis/util/logging/package-info.java | 31 +- .../java/org/apache/sis/util/package-info.java | 2 +- .../sis/util/resources/IndexedResourceBundle.java | 16 +- .../org/apache/sis/util/resources/Vocabulary.java | 18 +- .../sis/util/resources/Vocabulary.properties | 4 +- .../sis/util/resources/Vocabulary_fr.properties | 6 +- .../apache/sis/util/resources/package-info.java | 2 +- .../org/apache/sis/measure/NumberRangeTest.java | 43 +- .../java/org/apache/sis/test/LoggingWatcher.java | 2 +- .../apache/sis/test/suite/UtilityTestSuite.java | 1 - .../org/apache/sis/util/logging/DummyLogger.java | 114 --- .../apache/sis/util/logging/LoggerAdapterTest.java | 74 -- .../sis/util/logging/PerformanceLevelTest.java | 38 +- ide-project/NetBeans/nbproject/project.properties | 2 +- pom.xml | 5 +- storage/sis-earth-observation/pom.xml | 2 +- .../org/apache/sis/storage/landsat/BandGroup.java | 14 +- .../apache/sis/storage/landsat/LandsatStore.java | 5 +- .../apache/sis/storage/landsat/package-info.java | 2 +- .../storage/inflater/CompressionChannel.java | 28 +- .../storage/inflater/HorizontalPredictor.java | 49 +- .../sis/internal/storage/inflater/Inflater.java | 5 +- .../internal/storage/inflater/PixelChannel.java | 2 +- .../storage/inflater/PredictorChannel.java | 34 +- .../internal/storage/inflater/package-info.java | 2 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 26 +- .../sis/storage/geotiff/GridGeometryBuilder.java | 2 +- .../sis/storage/geotiff/ImageFileDirectory.java | 23 +- .../sis/storage/geotiff/MultiResolutionImage.java | 31 +- .../java/org/apache/sis/storage/geotiff/Type.java | 7 +- .../apache/sis/storage/geotiff/package-info.java | 2 +- .../org/apache/sis/internal/netcdf/Decoder.java | 8 +- .../sis/internal/netcdf/DiscreteSampling.java | 24 +- .../org/apache/sis/internal/netcdf/FeatureSet.java | 11 +- .../org/apache/sis/internal/netcdf/Raster.java | 38 +- .../apache/sis/internal/netcdf/RasterResource.java | 26 +- .../apache/sis/internal/netcdf/package-info.java | 2 +- .../sis/internal/netcdf/ucar/DecoderWrapper.java | 5 +- .../sis/internal/netcdf/ucar/FeaturesWrapper.java | 5 +- .../sis/internal/netcdf/ucar/package-info.java | 2 +- .../org/apache/sis/storage/netcdf/NetcdfStore.java | 5 +- .../apache/sis/storage/netcdf/package-info.java | 2 +- .../apache/sis/internal/netcdf/FeatureSetTest.java | 17 +- .../apache/sis/internal/shapefile/AutoChecker.java | 4 +- .../sis/storage/shapefile/InputFeatureStream.java | 3 +- .../jdbc/AbstractTestBaseForInternalJDBC.java | 3 +- .../sis/storage/shapefile/ShapeFileTest.java | 4 +- .../java/org/apache/sis/storage/sql/SQLStore.java | 5 +- .../org/apache/sis/storage/sql/package-info.java | 2 +- .../internal/storage/DocumentedStoreProvider.java | 4 +- .../org/apache/sis/internal/storage/Resources.java | 5 + .../sis/internal/storage/Resources.properties | 1 + .../sis/internal/storage/Resources_fr.properties | 1 + .../apache/sis/internal/storage/StoreResource.java | 29 +- .../sis/internal/storage/StoreUtilities.java | 3 +- .../sis/internal/storage/TiledGridCoverage.java | 4 +- .../org/apache/sis/internal/storage/csv/Store.java | 5 +- .../sis/internal/storage/csv/package-info.java | 2 +- .../sis/internal/storage/esri/AsciiGridStore.java | 3 +- .../sis/internal/storage/esri/RasterStore.java | 3 +- .../sis/internal/storage/esri/RawRasterStore.java | 3 +- .../sis/internal/storage/esri/WritableStore.java | 3 +- .../sis/internal/storage/esri/package-info.java | 2 +- .../apache/sis/internal/storage/folder/Store.java | 5 +- .../sis/internal/storage/folder/package-info.java | 2 +- .../sis/internal/storage/image/WorldFileStore.java | 48 +- .../sis/internal/storage/image/WritableStore.java | 3 +- .../sis/internal/storage/image/package-info.java | 2 +- .../org/apache/sis/internal/storage/wkt/Store.java | 5 +- .../sis/internal/storage/wkt/package-info.java | 2 +- .../org/apache/sis/internal/storage/xml/Store.java | 5 +- .../sis/internal/storage/xml/package-info.java | 2 +- .../sis/storage/AbstractGridCoverageResource.java | 2 +- .../org/apache/sis/storage/CoverageSubset.java | 5 +- .../java/org/apache/sis/storage/DataStore.java | 18 +- .../java/org/apache/sis/storage/FeatureSubset.java | 5 +- .../org/apache/sis/storage/StorageConnector.java | 14 + .../sis/storage/event/CascadedStoreEvent.java | 131 ++++ .../org/apache/sis/storage/event/CloseEvent.java | 62 ++ .../org/apache/sis/storage/event/StoreEvent.java | 47 +- .../apache/sis/storage/event/StoreListener.java | 6 +- .../apache/sis/storage/event/StoreListeners.java | 332 ++++++-- .../org/apache/sis/storage/event/package-info.java | 2 +- .../java/org/apache/sis/storage/package-info.java | 2 +- .../storage/io/ChannelImageInputStreamTest.java | 1 + .../java/org/apache/sis/storage/DataStoreMock.java | 15 +- .../sis/storage/event/StoreListenersTest.java | 39 +- .../apache/sis/test/storage/SubsampledImage.java | 27 +- .../org/apache/sis/internal/storage/gpx/Store.java | 5 +- .../sis/internal/storage/gpx/package-info.java | 2 +- .../internal/storage/xml/stream/StaxDataStore.java | 4 + 356 files changed, 10350 insertions(+), 4555 deletions(-) diff --cc core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java index 2e24b2640c,1f5b3b8b2d..320aebdd9e --- a/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java +++ b/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterFormat.java @@@ -39,9 -39,10 +39,11 @@@ import javax.measure.Unit import org.opengis.parameter.*; import org.opengis.util.ScopedName; import org.opengis.util.GenericName; + import org.opengis.util.InternationalString; + import org.opengis.util.ControlledVocabulary; import org.opengis.metadata.Identifier; import org.opengis.referencing.IdentifiedObject; +import org.opengis.referencing.ReferenceIdentifier; import org.opengis.referencing.operation.OperationMethod; import org.apache.sis.measure.Range; diff --cc pom.xml index 5a4e7e17e1,ef8fb26a2c..1ec987cb4a --- a/pom.xml +++ b/pom.xml @@@ -557,8 -557,8 +557,8 @@@ <maven.compiler.target>8</maven.compiler.target> <sis.plugin.version>${project.version}</sis.plugin.version> <sis.non-free.version>1.2</sis.non-free.version> <!-- Used only if "non-free" profile is activated. --> - <javafx.version>17</javafx.version> <!-- Used only if "javafx" profile is activated. --> + <javafx.version>18.0.1</javafx.version> <!-- Used only if "javafx" profile is activated. --> - <geoapi.version>4.0-SNAPSHOT</geoapi.version> + <geoapi.version>3.1-SNAPSHOT</geoapi.version> </properties> <profiles>
