[sis] branch master updated (6b507d7cbd -> dff7ab60bc)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sis.git from 6b507d7cbd Merge branch 'geoapi-3.1'. add b85b941c25 Rename `GridGeometry.reduce(…)` as `selectDimensions(…)`. The previous name was confusing about what is reduced. Renamed also `CRS.reduce(…)` for consistency. add 32b875d621 Rename `GridGeometry.translate(…)` as `shiftGrid(…)` for making clearer that this method changes grid coordinates without changing real world coordinates. add 618f2ddff2 Trivial javadoc formatting for consistency. add 7e0a63e451 Add convenience method for deriving a projection from an existing one, and for resampling a grid coverage by specifying only the new CRS. add 72d03efe73 Add an option for requesting (longitude, latitude) axis order in base CRS. add 3b88cdcb7d Add GeoTIFF parameter names to Sinusoidal projection. Javadoc updates. add 75584297cb Improve a confusing error message when a CRS authority code is not recognized. add e7f297691f Preserve the sign of scale factor in automatic "grid to CRS" transform. add 68b8c2981f When unwrapping an exception, unwrap also the suppressed exceptions. add 0c35e9fa7e Preserve the type of missing values in netCDF files. Before this commit, missing values in GCOM files were always represented as floating points. After this commit, missing values declared as integers stay integers. It makes a difference when computing which value is next. add b6b4fde4a3 Add `ColorModelFactory.toString()` implementation for debugging purposes. add 5c4559bba6 Add a workaround for missing "no data" value in some GCOM files. Because the workaround may introduce two categories with same name, add a "#2", "#3", etc. suffix after duplicated names. add 5413eb996a Fix a NullPointerException caused by null ColorModel at rendering time in JavaFX application. add be44182762 Consider ARGB images as "direct". add 9160061727 Ignore files generated by UCAR netCDF library when probing content. add 94f75c1528 Add one more comment about the problem of using statistics for completing coverage metadata. add 81e26d4920 Upgrade Maven plugins and PostgreSQL dependency. add f6d4dd2ba2 Spelling fixes in comments. add 09ed02f631 Update for compatibility with Java 19: fix an ambiguity with the new Future.State enumeration. add a143312778 Merge branch 'geoapi-4.0' into geoapi-3.1 new dff7ab60bc Merge branch 'geoapi-3.1' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/gui/coverage/CoverageCanvas.java| 2 +- .../org/apache/sis/gui/dataset/FeatureList.java| 3 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 2 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 +- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 32 - .../apache/sis/coverage/grid/GridDerivation.java | 12 +- .../org/apache/sis/coverage/grid/GridExtent.java | 31 +++-- .../org/apache/sis/coverage/grid/GridGeometry.java | 49 ++-- .../sis/coverage/grid/ResampledGridCoverage.java | 7 +- .../apache/sis/coverage/grid/SliceGeometry.java| 8 +- .../sis/coverage/grid/TranslatedGridCoverage.java | 2 +- .../internal/coverage/j2d/ColorModelFactory.java | 53 ++-- .../sis/internal/coverage/j2d/ColorModelType.java | 17 ++- .../sis/internal/coverage/j2d/ColorsForRange.java | 31 - .../internal/coverage/j2d/DeferredProperty.java| 2 +- .../sis/internal/coverage/j2d/package-info.java| 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 8 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 22 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../org/apache/sis/metadata/sql/Citations.sql | 6 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 2 +- .../referencing/GeodeticObjectBuilder.java | 137 + .../referencing/provider/AlbersEqualArea.java | 2 +- .../referencing/provider/CassiniSoldner.java | 2 +- .../sis/internal/referencing/provider/ESRI.java| 13 +- .../provider/HyperbolicCassiniSoldner.java | 2 +- .../provider/LambertAzimuthalEqualArea.java| 2 +- .../LambertAzimuthalEqualAreaSpherical.java| 2 +- .../internal/referencing/provider/Mollweide.java | 3 +
[sis] 01/01: Merge branch 'geoapi-3.1'
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sis.git commit dff7ab60bc17cf7220dcd7b35dacc52df6a5a214 Merge: 6b507d7cbd a143312778 Author: Martin Desruisseaux AuthorDate: Thu Oct 13 22:00:55 2022 +0200 Merge branch 'geoapi-3.1' .../apache/sis/gui/coverage/CoverageCanvas.java| 2 +- .../org/apache/sis/gui/dataset/FeatureList.java| 3 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 2 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 +- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 32 - .../apache/sis/coverage/grid/GridDerivation.java | 12 +- .../org/apache/sis/coverage/grid/GridExtent.java | 31 +++-- .../org/apache/sis/coverage/grid/GridGeometry.java | 49 ++-- .../sis/coverage/grid/ResampledGridCoverage.java | 7 +- .../apache/sis/coverage/grid/SliceGeometry.java| 8 +- .../sis/coverage/grid/TranslatedGridCoverage.java | 2 +- .../internal/coverage/j2d/ColorModelFactory.java | 53 ++-- .../sis/internal/coverage/j2d/ColorModelType.java | 17 ++- .../sis/internal/coverage/j2d/ColorsForRange.java | 31 - .../internal/coverage/j2d/DeferredProperty.java| 2 +- .../sis/internal/coverage/j2d/package-info.java| 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 8 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 22 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../org/apache/sis/metadata/sql/Citations.sql | 6 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 2 +- .../referencing/GeodeticObjectBuilder.java | 137 + .../referencing/provider/AlbersEqualArea.java | 2 +- .../referencing/provider/CassiniSoldner.java | 2 +- .../sis/internal/referencing/provider/ESRI.java| 13 +- .../provider/HyperbolicCassiniSoldner.java | 2 +- .../provider/LambertAzimuthalEqualArea.java| 2 +- .../LambertAzimuthalEqualAreaSpherical.java| 2 +- .../internal/referencing/provider/Mollweide.java | 3 + .../internal/referencing/provider/Molodensky.java | 2 +- .../provider/ObliqueMercatorTwoPoints.java | 2 +- .../provider/ObliqueMercatorTwoPointsCenter.java | 2 +- .../internal/referencing/provider/Polyconic.java | 2 +- .../referencing/provider/SatelliteTracking.java| 4 + .../internal/referencing/provider/Sinusoidal.java | 3 + .../main/java/org/apache/sis/referencing/CRS.java | 26 +++- .../factory/CommonAuthorityFactory.java| 2 +- .../factory/GeodeticAuthorityFactory.java | 4 +- .../operation/transform/InterpolatedTransform.java | 8 +- .../referencing/GeodeticObjectBuilderTest.java | 61 + .../java/org/apache/sis/referencing/CRSTest.java | 36 +++--- .../sis/test/suite/ReferencingTestSuite.java | 1 + .../org/apache/sis/internal/util/AbstractMap.java | 2 +- .../main/java/org/apache/sis/util/Exceptions.java | 24 ++-- .../sis/util/collection/BackingStoreException.java | 3 +- ide-project/NetBeans/nbproject/project.properties | 2 +- pom.xml| 8 +- .../apache/sis/internal/earth/netcdf/GCOM_C.java | 68 +++--- .../apache/sis/internal/earth/netcdf/GCOM_W.java | 4 +- .../apache/sis/storage/landsat/MetadataReader.java | 2 +- .../org/apache/sis/internal/netcdf/Convention.java | 6 +- .../java/org/apache/sis/internal/netcdf/Node.java | 29 +++-- .../apache/sis/internal/netcdf/RasterResource.java | 25 ++-- .../org/apache/sis/internal/netcdf/Variable.java | 6 +- .../apache/sis/storage/netcdf/MetadataReader.java | 4 +- .../sis/storage/netcdf/NetcdfStoreProvider.java| 20 ++- .../apache/sis/internal/netcdf/VariableTest.java | 4 +- .../sis/internal/storage/StoreUtilities.java | 6 + .../sis/internal/storage/image/WritableStore.java | 2 +- 64 files changed, 634 insertions(+), 207 deletions(-) diff --cc application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java index da16811fc3,f3d57a34c3..db83419008 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java @@@ -22,6 -22,8 +22,7 @@@ import java.util.Collections import java.util.Spliterator; import javafx.application.Platform; import javafx.collections.ObservableListBase; + import javafx.concurrent.Worker; -import org.opengis.feature.Feature; import org.apache.sis.storage.FeatureSet; import
[sis] branch geoapi-3.1 updated (e8bfb5ea7b -> a143312778)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git from e8bfb5ea7b Merge branch 'geoapi-4.0' into geoapi-3.1. add b85b941c25 Rename `GridGeometry.reduce(…)` as `selectDimensions(…)`. The previous name was confusing about what is reduced. Renamed also `CRS.reduce(…)` for consistency. add 32b875d621 Rename `GridGeometry.translate(…)` as `shiftGrid(…)` for making clearer that this method changes grid coordinates without changing real world coordinates. add 618f2ddff2 Trivial javadoc formatting for consistency. add 7e0a63e451 Add convenience method for deriving a projection from an existing one, and for resampling a grid coverage by specifying only the new CRS. add 72d03efe73 Add an option for requesting (longitude, latitude) axis order in base CRS. add 3b88cdcb7d Add GeoTIFF parameter names to Sinusoidal projection. Javadoc updates. add 75584297cb Improve a confusing error message when a CRS authority code is not recognized. add e7f297691f Preserve the sign of scale factor in automatic "grid to CRS" transform. add 68b8c2981f When unwrapping an exception, unwrap also the suppressed exceptions. add 0c35e9fa7e Preserve the type of missing values in netCDF files. Before this commit, missing values in GCOM files were always represented as floating points. After this commit, missing values declared as integers stay integers. It makes a difference when computing which value is next. add b6b4fde4a3 Add `ColorModelFactory.toString()` implementation for debugging purposes. add 5c4559bba6 Add a workaround for missing "no data" value in some GCOM files. Because the workaround may introduce two categories with same name, add a "#2", "#3", etc. suffix after duplicated names. add 5413eb996a Fix a NullPointerException caused by null ColorModel at rendering time in JavaFX application. add be44182762 Consider ARGB images as "direct". add 9160061727 Ignore files generated by UCAR netCDF library when probing content. add 94f75c1528 Add one more comment about the problem of using statistics for completing coverage metadata. add 81e26d4920 Upgrade Maven plugins and PostgreSQL dependency. add f6d4dd2ba2 Spelling fixes in comments. add 09ed02f631 Update for compatibility with Java 19: fix an ambiguity with the new Future.State enumeration. new a143312778 Merge branch 'geoapi-4.0' into geoapi-3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/sis/gui/coverage/CoverageCanvas.java| 2 +- .../org/apache/sis/gui/dataset/FeatureList.java| 3 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 2 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 +- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 32 - .../apache/sis/coverage/grid/GridDerivation.java | 12 +- .../org/apache/sis/coverage/grid/GridExtent.java | 31 +++-- .../org/apache/sis/coverage/grid/GridGeometry.java | 49 ++-- .../sis/coverage/grid/ResampledGridCoverage.java | 7 +- .../apache/sis/coverage/grid/SliceGeometry.java| 8 +- .../sis/coverage/grid/TranslatedGridCoverage.java | 2 +- .../internal/coverage/j2d/ColorModelFactory.java | 53 ++-- .../sis/internal/coverage/j2d/ColorModelType.java | 17 ++- .../sis/internal/coverage/j2d/ColorsForRange.java | 31 - .../internal/coverage/j2d/DeferredProperty.java| 2 +- .../sis/internal/coverage/j2d/package-info.java| 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 8 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 22 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../org/apache/sis/metadata/sql/Citations.sql | 6 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 2 +- .../referencing/GeodeticObjectBuilder.java | 137 + .../referencing/provider/AlbersEqualArea.java | 2 +- .../referencing/provider/CassiniSoldner.java | 2 +- .../sis/internal/referencing/provider/ESRI.java| 13 +- .../provider/HyperbolicCassiniSoldner.java | 2 +- .../provider/LambertAzimuthalEqualArea.java| 2 +- .../LambertAzimuthalEqualAreaSpherical.java| 2 +- .../internal/referencing/provider/Mollweide.java | 3 + .../internal/referencing/provider/Molodensky.java | 2 +-
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
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 a14331277874c5a79e91828f591fb8831c3e9bb1 Merge: e8bfb5ea7b 09ed02f631 Author: Martin Desruisseaux AuthorDate: Thu Oct 13 21:49:19 2022 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../apache/sis/gui/coverage/CoverageCanvas.java| 2 +- .../org/apache/sis/gui/dataset/FeatureList.java| 3 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 3 +- .../java/org/apache/sis/gui/map/StatusBar.java | 2 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 +- .../apache/sis/coverage/grid/DimensionReducer.java | 2 +- .../apache/sis/coverage/grid/GridCoverage2D.java | 4 +- .../sis/coverage/grid/GridCoverageProcessor.java | 32 - .../apache/sis/coverage/grid/GridDerivation.java | 12 +- .../org/apache/sis/coverage/grid/GridExtent.java | 31 +++-- .../org/apache/sis/coverage/grid/GridGeometry.java | 49 ++-- .../sis/coverage/grid/ResampledGridCoverage.java | 7 +- .../apache/sis/coverage/grid/SliceGeometry.java| 8 +- .../sis/coverage/grid/TranslatedGridCoverage.java | 2 +- .../internal/coverage/j2d/ColorModelFactory.java | 53 ++-- .../sis/internal/coverage/j2d/ColorModelType.java | 17 ++- .../sis/internal/coverage/j2d/ColorsForRange.java | 31 - .../internal/coverage/j2d/DeferredProperty.java| 2 +- .../sis/internal/coverage/j2d/package-info.java| 2 +- .../apache/sis/coverage/grid/GridExtentTest.java | 8 +- .../apache/sis/coverage/grid/GridGeometryTest.java | 22 ++-- .../coverage/grid/ResampledGridCoverageTest.java | 2 +- .../coverage/grid/TranslatedGridCoverageTest.java | 2 +- .../iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../org/apache/sis/metadata/sql/Citations.sql | 6 +- .../main/java/org/apache/sis/portrayal/Canvas.java | 2 +- .../referencing/GeodeticObjectBuilder.java | 137 + .../referencing/provider/AlbersEqualArea.java | 2 +- .../referencing/provider/CassiniSoldner.java | 2 +- .../sis/internal/referencing/provider/ESRI.java| 13 +- .../provider/HyperbolicCassiniSoldner.java | 2 +- .../provider/LambertAzimuthalEqualArea.java| 2 +- .../LambertAzimuthalEqualAreaSpherical.java| 2 +- .../internal/referencing/provider/Mollweide.java | 3 + .../internal/referencing/provider/Molodensky.java | 2 +- .../provider/ObliqueMercatorTwoPoints.java | 2 +- .../provider/ObliqueMercatorTwoPointsCenter.java | 2 +- .../internal/referencing/provider/Polyconic.java | 2 +- .../referencing/provider/SatelliteTracking.java| 4 + .../internal/referencing/provider/Sinusoidal.java | 3 + .../main/java/org/apache/sis/referencing/CRS.java | 26 +++- .../factory/CommonAuthorityFactory.java| 2 +- .../factory/GeodeticAuthorityFactory.java | 4 +- .../operation/transform/InterpolatedTransform.java | 8 +- .../referencing/GeodeticObjectBuilderTest.java | 61 + .../java/org/apache/sis/referencing/CRSTest.java | 36 +++--- .../report/CoordinateReferenceSystems.java | 2 +- .../sis/test/suite/ReferencingTestSuite.java | 1 + .../org/apache/sis/internal/util/AbstractMap.java | 2 +- .../main/java/org/apache/sis/util/Exceptions.java | 24 ++-- .../sis/util/collection/BackingStoreException.java | 3 +- ide-project/NetBeans/nbproject/project.properties | 2 +- pom.xml| 8 +- .../apache/sis/internal/earth/netcdf/GCOM_C.java | 68 +++--- .../apache/sis/internal/earth/netcdf/GCOM_W.java | 4 +- .../apache/sis/storage/landsat/MetadataReader.java | 2 +- .../org/apache/sis/internal/netcdf/Convention.java | 6 +- .../java/org/apache/sis/internal/netcdf/Node.java | 29 +++-- .../apache/sis/internal/netcdf/RasterResource.java | 25 ++-- .../org/apache/sis/internal/netcdf/Variable.java | 6 +- .../apache/sis/storage/netcdf/MetadataReader.java | 4 +- .../sis/storage/netcdf/NetcdfStoreProvider.java| 20 ++- .../apache/sis/internal/netcdf/VariableTest.java | 4 +- .../sis/internal/storage/StoreUtilities.java | 6 + .../sis/internal/storage/image/WritableStore.java | 2 +- .../aggregate/ConcatenatedGridCoverage.java| 2 +- 66 files changed, 636 insertions(+), 209 deletions(-)
[sis] 01/03: Spelling fixes in comments.
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 commit f6d4dd2ba2aefff337360a3e6d91c3a2cd051d3f Author: Martin Desruisseaux AuthorDate: Sat Oct 8 12:22:58 2022 +0200 Spelling fixes in comments. --- .../src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java | 4 ++-- .../sis/metadata/iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../src/main/resources/org/apache/sis/metadata/sql/Citations.sql| 6 +++--- .../src/main/java/org/apache/sis/internal/util/AbstractMap.java | 2 +- .../main/java/org/apache/sis/internal/netcdf/RasterResource.java| 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java index f256595343..84c178f0fd 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/ValuesUnderCursor.java @@ -83,8 +83,8 @@ public abstract class ValuesUnderCursor { /** * Sets the result to the given value, then submits a task in JavaFX thread if no task is already waiting. - * If a task is already waiting to be executed, then that task will use the specified value instead than - * the value which was specified when the previous task was submitted. + * If a task is already waiting to be executed, then that task will use the specified value instead of the + * value which was specified when the previous task was submitted. */ final void setLater(final String result) { if (getAndSet(result) == null) { diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java index 7bfdfa74c8..ed0420408b 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java @@ -550,7 +550,7 @@ public class DefaultGeographicBoundingBox extends AbstractGeographicExtent imple /* * IMPLEMENTATION NOTE: For the handling of anti-meridian crossing in union and intersection operations, - * this class applies a different strategy than GeneralEnvelope. Instead than trying to work directly with + * this class applies a different strategy than GeneralEnvelope. Instead of trying to work directly with * the coordinate values without adding or removing offset (which may cause rounding errors), we apply a ±360° * shift on longitude values. This simpler strategy is okay here because the range is fixed in the code (not * an arbitrarily high range), and GeographicBoundingBox are approximations by definition anyway. diff --git a/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql b/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql index 37e4ab38d8..ae1119eefe 100644 --- a/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql +++ b/core/sis-metadata/src/main/resources/org/apache/sis/metadata/sql/Citations.sql @@ -216,9 +216,9 @@ INSERT INTO metadata."Citation" ("ID", "onlineResource", "edition", "citedRespon -- But we have to declare some organizations as "citations" because this is the kind of object required -- by the "authority" attribute of factories. -- --- Instead than repeating the organization name, the title should reference some naming authority --- in that organization. The identifier should have no codespace, and the identifier code should be --- the codespace of objects created by the authority represented by that organisation. +-- Instead of repeating the organization name, the title should reference some naming authority +-- in that organization. The identifier should have no codespace, and the identifier code should +-- be the codespace of objects created by the authority represented by that organisation. -- INSERT INTO metadata."Identifier" ("ID", "code") VALUES ('OGC', 'OGC'), diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/util/AbstractMap.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/AbstractMap.java index d1bbed5681..165156514d 100644 --- a/core/sis-utility/src/main/java/org/apache/sis/internal/util/AbstractMap.java +++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/AbstractMap.java @@ -29,7 +29,7 @@ import org.apache.sis.util.resources.Errors; /** * An alternative to {@link java.util.AbstractMap java.util.AbstractMap} using different implementation strategies. - * Instead
[sis] 02/03: Update for compatibility with Java 19: fix an ambiguity with the new Future.State enumeration.
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 commit 09ed02f6314a46a9e904b3cceb56c602192eadcc Author: Martin Desruisseaux AuthorDate: Thu Oct 13 16:14:28 2022 +0200 Update for compatibility with Java 19: fix an ambiguity with the new Future.State enumeration. --- .../src/main/java/org/apache/sis/gui/dataset/FeatureList.java | 3 ++- .../sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java index 99a45768bd..f3d57a34c3 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/dataset/FeatureList.java @@ -22,6 +22,7 @@ import java.util.Collections; import java.util.Spliterator; import javafx.application.Platform; import javafx.collections.ObservableListBase; +import javafx.concurrent.Worker; import org.opengis.feature.Feature; import org.apache.sis.storage.FeatureSet; import org.apache.sis.internal.gui.BackgroundThreads; @@ -316,7 +317,7 @@ final class FeatureList extends ObservableListBase { throw new IndexOutOfBoundsException(index); } final FeatureLoader loader = nextPageLoader; -if (loader != null && loader.getState() == FeatureLoader.State.READY) { +if (loader != null && loader.getState() == Worker.State.READY) { BackgroundThreads.execute(loader); } return null; diff --git a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java index 41dfe18c8d..05b8ee348f 100644 --- a/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java +++ b/application/sis-javafx/src/main/java/org/apache/sis/gui/map/MapCanvas.java @@ -44,6 +44,7 @@ import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.beans.value.WritableValue; import javafx.concurrent.Task; +import javafx.concurrent.Worker; import javafx.event.EventHandler; import javafx.scene.control.ContextMenu; import javafx.scene.control.ToggleGroup; @@ -1334,7 +1335,7 @@ public abstract class MapCanvas extends PlanarCanvas { assert Platform.isFxApplicationThread(); assert renderingInProgress == task : "Expected " + renderingInProgress + " but was " + task; // Keep cursor unchanged if contents changed, because caller will invoke `repaint()` again. -if (!contentsChanged() || task.getState() != Task.State.SUCCEEDED) { +if (!contentsChanged() || task.getState() != Worker.State.SUCCEEDED) { restoreCursorAfterPaint(); } renderingInProgress = null;
[sis] branch geoapi-4.0 updated (81e26d4920 -> a3a1bb0985)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git from 81e26d4920 Upgrade Maven plugins and PostgreSQL dependency. new f6d4dd2ba2 Spelling fixes in comments. new 09ed02f631 Update for compatibility with Java 19: fix an ambiguity with the new Future.State enumeration. new a3a1bb0985 Upgrade `org.apache.sis.metadata.quality` package to ISO 19157:2013. Work partially done by Alexis Gaillard. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/sis/gui/dataset/FeatureList.java| 3 +- .../java/org/apache/sis/gui/map/MapCanvas.java | 3 +- .../org/apache/sis/gui/map/ValuesUnderCursor.java | 4 +- .../apache/sis/internal/jaxb/FilterByVersion.java | 4 +- ...V_CouplingType.java => DQM_ValueStructure.java} | 24 +- .../sis/internal/jaxb/code/package-info.java | 3 +- ...D_AttributeGroup.java => DQM_BasicMeasure.java} | 42 +- ...{MD_MetadataScope.java => DQM_Description.java} | 42 +- .../metadata/{CI_Series.java => DQM_Measure.java} | 43 +- .../{CI_Series.java => DQM_Parameter.java} | 43 +- .../{CI_Contact.java => DQM_SourceReference.java} | 43 +- .../{DQ_Element.java => DQ_EvaluationMethod.java} | 44 +- .../{DQ_Element.java => DQ_MeasureReference.java} | 44 +- ... => DQ_StandaloneQualityReportInformation.java} | 46 +- .../sis/internal/jaxb/metadata/package-info.java | 3 +- .../org/apache/sis/metadata/MetadataStandard.java | 63 ++- .../org/apache/sis/metadata/PropertyAccessor.java | 4 +- .../java/org/apache/sis/metadata/SpecialCases.java | 19 +- .../sis/metadata/StandardImplementation.java | 6 +- .../iso/extent/DefaultGeographicBoundingBox.java | 2 +- .../metadata/iso/quality/AbstractCompleteness.java | 2 +- ...ractResult.java => AbstractDataEvaluation.java} | 77 ++- .../sis/metadata/iso/quality/AbstractElement.java | 567 +++-- .../iso/quality/AbstractLogicalConsistency.java| 2 +- ...bstractResult.java => AbstractMetaquality.java} | 82 +-- .../iso/quality/AbstractPositionalAccuracy.java| 12 +- .../sis/metadata/iso/quality/AbstractResult.java | 100 +++- .../iso/quality/AbstractTemporalAccuracy.java | 42 +- ...lAccuracy.java => AbstractTemporalQuality.java} | 52 +- .../iso/quality/AbstractThematicAccuracy.java | 17 +- .../DefaultAbsoluteExternalPositionalAccuracy.java | 5 +- .../quality/DefaultAccuracyOfATimeMeasurement.java | 10 +- ...lity.java => DefaultAggregationDerivation.java} | 49 +- .../metadata/iso/quality/DefaultBasicMeasure.java | 225 .../iso/quality/DefaultCompletenessCommission.java | 3 +- .../iso/quality/DefaultCompletenessOmission.java | 3 +- .../iso/quality/DefaultConceptualConsistency.java | 7 +- ...efaultUsability.java => DefaultConfidence.java} | 53 +- .../iso/quality/DefaultConformanceResult.java | 7 +- .../iso/quality/DefaultCoverageResult.java | 67 ++- .../metadata/iso/quality/DefaultDataQuality.java | 80 ++- .../DefaultDescription.java} | 120 ++--- .../DefaultDescriptiveResult.java} | 93 ++-- .../iso/quality/DefaultDomainConsistency.java | 3 +- ...ctElement.java => DefaultEvaluationMethod.java} | 311 +++ .../iso/quality/DefaultFormatConsistency.java | 5 +- ...ltUsability.java => DefaultFullInspection.java} | 51 +- .../DefaultGriddedDataPositionalAccuracy.java | 3 +- ...faultUsability.java => DefaultHomogeneity.java} | 53 +- .../DefaultIndirectEvaluation.java}| 91 ++-- .../sis/metadata/iso/quality/DefaultMeasure.java | 467 + .../iso/quality/DefaultMeasureReference.java | 201 .../DefaultNonQuantitativeAttributeAccuracy.java | 22 +- ...efaultNonQuantitativeAttributeCorrectness.java} | 56 +- .../sis/metadata/iso/quality/DefaultParameter.java | 252 + .../DefaultQuantitativeAttributeAccuracy.java | 3 +- .../iso/quality/DefaultQuantitativeResult.java | 17 +- .../DefaultRelativeInternalPositionalAccuracy.java | 3 +- ...lValidity.java => DefaultRepresentativity.java} | 51 +- .../iso/quality/DefaultSampleBasedInspection.java | 191 +++ ...alAccuracy.java => DefaultSourceReference.java} | 86 +++- .../DefaultStandaloneQualityReportInformation.java | 163 ++ .../iso/quality/DefaultTemporalConsistency.java| 8 +- .../iso/quality/DefaultTemporalValidity.java | 8 +- .../DefaultThematicClassificationCorrectness.java | 3 +- .../iso/quality/DefaultTopologicalConsistency.java | 9 +- .../sis/metadata/iso/quality/DefaultUsability.java | 19 +- ...lAccuracy.java =>