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 c6991bf27754890ffa04d55c77e2c1fd062324dc Merge: a63fa19 434ffd0 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Sun Jan 2 01:34:55 2022 +0100 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/gui/coverage/ImagePropertyExplorer.java | 54 +-- .../dataset/{CopyAction.java => PathAction.java} | 38 +- .../org/apache/sis/gui/dataset/ResourceTree.java | 8 +- .../org/apache/sis/gui/metadata/MetadataTree.java | 159 ++++++-- .../sis/gui/metadata/StandardMetadataTree.java | 73 ++-- .../apache/sis/internal/gui/ExceptionReporter.java | 3 +- .../sis/internal/gui/PropertyValueFormatter.java | 85 ++++ .../org/apache/sis/internal/gui/PropertyView.java | 55 ++- .../org/apache/sis/internal/gui/Resources.java | 15 + .../apache/sis/internal/gui/Resources.properties | 3 + .../sis/internal/gui/Resources_fr.properties | 3 + .../org/apache/sis/coverage/SampleDimension.java | 75 ++-- .../org/apache/sis/feature/DefaultFeatureType.java | 12 +- .../sis/feature/builder/FeatureTypeBuilder.java | 13 +- .../org/apache/sis/filter/ArithmeticFunction.java | 8 +- .../org/apache/sis/filter/AssociationValue.java | 234 +++++++++++ .../org/apache/sis/filter/ConvertFunction.java | 26 +- .../apache/sis/filter/DefaultFilterFactory.java | 4 +- .../java/org/apache/sis/filter/LeafExpression.java | 14 +- .../java/org/apache/sis/filter/Optimization.java | 2 +- .../java/org/apache/sis/filter/PropertyValue.java | 205 ++++++---- .../sis/internal/coverage/SampleDimensions.java | 41 -- .../sis/internal/coverage/j2d/Colorizer.java | 20 +- .../sis/internal/feature/FeatureExpression.java | 49 +-- .../apache/sis/internal/feature/package-info.java | 2 +- .../sis/internal/filter/GeometryConverter.java | 8 +- .../sis/internal/filter/sqlmm/SpatialFunction.java | 25 +- .../sis/internal/filter/sqlmm/package-info.java | 2 +- .../org/apache/sis/filter/LogicalFilterTest.java | 4 +- .../java/org/apache/sis/filter/PeriodLiteral.java | 2 +- .../sis/internal/filter/FunctionNamesTest.java | 4 +- .../org/apache/sis/util/iso/DefaultLocalName.java | 8 +- .../org/apache/sis/util/iso/DefaultMemberName.java | 2 +- .../apache/sis/util/iso/DefaultNameFactory.java | 4 +- .../org/apache/sis/util/iso/DefaultScopedName.java | 4 +- .../org/apache/sis/util/iso/DefaultTypeName.java | 4 +- .../java/org/apache/sis/util/iso/TypeNames.java | 2 +- .../apache/sis/metadata/TreeTableFormatTest.java | 2 +- .../org/apache/sis/metadata/TreeTableViewTest.java | 2 +- .../extent/DefaultGeographicBoundingBoxTest.java | 5 +- .../DefaultDataIdentificationTest.java | 2 +- .../sis/internal/map/coverage/RenderingData.java | 17 +- .../internal/referencing/WraparoundApplicator.java | 57 +-- .../sis/internal/referencing/package-info.java | 2 +- .../apache/sis/internal/util/PropertyFormat.java | 37 +- .../java/org/apache/sis/internal/util/Strings.java | 28 +- .../java/org/apache/sis/internal/util/XPaths.java | 58 ++- .../org/apache/sis/internal/util/XPointer.java | 113 ++++++ .../org/apache/sis/internal/util/package-info.java | 2 +- .../java/org/apache/sis/measure/UnitFormat.java | 3 +- .../sis/util/collection/TreeTableFormat.java | 2 +- .../java/org/apache/sis/util/resources/Errors.java | 5 + .../apache/sis/util/resources/Errors.properties | 1 + .../apache/sis/util/resources/Errors_fr.properties | 1 + .../org/apache/sis/util/resources/Vocabulary.java | 15 + .../sis/util/resources/Vocabulary.properties | 3 + .../sis/util/resources/Vocabulary_fr.properties | 3 + .../org/apache/sis/internal/util/XPathsTest.java | 16 +- .../util/{XPathsTest.java => XPointerTest.java} | 36 +- .../java/org/apache/sis/measure/UnitsTest.java | 2 +- .../apache/sis/test/suite/UtilityTestSuite.java | 3 +- .../java/org/apache/sis/storage/landsat/Band.java | 2 +- .../sis/internal/geotiff/SchemaModifier.java | 16 +- .../sis/internal/storage/inflater/CCITTRLE.java | 8 +- .../storage/inflater/CompressionChannel.java | 6 +- .../storage/inflater/HorizontalPredictor.java | 443 +++++++++++---------- .../sis/internal/storage/inflater/Inflater.java | 12 +- .../apache/sis/internal/storage/inflater/LZW.java | 8 +- .../sis/internal/storage/inflater/PackBits.java | 8 +- .../internal/storage/inflater/PixelChannel.java | 4 +- .../storage/inflater/PredictorChannel.java | 11 +- .../apache/sis/internal/storage/inflater/ZIP.java | 8 +- .../internal/storage/inflater/package-info.java | 2 +- .../apache/sis/storage/geotiff/GeoTiffStore.java | 2 +- .../sis/storage/geotiff/ImageFileDirectory.java | 9 +- .../apache/sis/storage/geotiff/NativeMetadata.java | 36 +- .../java/org/apache/sis/storage/geotiff/Tags.java | 14 +- .../apache/sis/storage/geotiff/XMLMetadata.java | 289 ++++++++++++++ .../internal/storage/inflater/CCITTRLETest.java | 2 +- .../org/apache/sis/internal/netcdf/CRSBuilder.java | 47 ++- .../sis/internal/sql/postgis/RasterReader.java | 6 +- .../org/apache/sis/storage/sql/SQLStoreTest.java | 4 +- .../sis/internal/storage/TiledGridCoverage.java | 27 +- .../sis/internal/storage/TiledGridResource.java | 1 + .../sis/internal/storage/io/IOUtilities.java | 23 +- .../java/org/apache/sis/storage/FeatureQuery.java | 129 ++++-- .../org/apache/sis/storage/FeatureQueryTest.java | 177 ++++++-- 87 files changed, 2151 insertions(+), 828 deletions(-) diff --cc core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java index b445930,9d8c298..9571ad9 --- a/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java +++ b/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java @@@ -96,9 -97,8 +96,9 @@@ public final strictfp class TreeTableFo " │ │ ├─East bound longitude…… 180°E\n" + " │ │ ├─South bound latitude…… 90°S\n" + " │ │ ├─North bound latitude…… 90°N\n" + - " │ │ └─Extent type code……………… true\n" + + " │ │ └─Extent type code……………… True\n" + - " │ └─Organisation……………………………………………… Kōdansha\n" + + " │ ├─Organisation……………………………………………… Kōdansha\n" + + " │ └─Role…………………………………………………………………… Editor\n" + " ├─Presentation form (1 of 2)…………………… Document digital\n" + " ├─Presentation form (2 of 2)…………………… Document hardcopy\n" + " └─ISBN……………………………………………………………………………… 9782505004509\n", text);