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 c2534df1525571e39710a7a0399e4c544694f851
Merge: 171730a 6b413e8
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Jan 20 19:03:57 2022 +0100

    Merge branch 'geoapi-4.0' into geoapi-3.1

 application/sis-javafx/pom.xml                     |   4 +-
 .../src/main/artifact/conf/logging.properties      |  12 +-
 .../java/org/apache/sis/gui/dataset/LogViewer.java | 158 +++++++++---
 .../apache/sis/gui/dataset/ResourceExplorer.java   |   2 +-
 .../org/apache/sis/gui/metadata/MetadataTree.java  |   4 +-
 .../org/apache/sis/internal/gui/GUIUtilities.java  |  64 +++++
 .../org/apache/sis/internal/gui/LogHandler.java    | 177 +++++++++++---
 .../sis/internal/gui/PropertyValueFormatter.java   |  16 +-
 .../org/apache/sis/internal/gui/PropertyView.java  | 114 +++------
 .../org/apache/sis/internal/gui/Resources.java     |   5 +
 .../apache/sis/internal/gui/Resources.properties   |   1 +
 .../sis/internal/gui/Resources_fr.properties       |   1 +
 .../org/apache/sis/internal/gui/TextFormats.java   | 132 ++++++++++
 .../apache/sis/internal/gui/GUIUtilitiesTest.java  |  81 +++++-
 core/sis-build-helper/pom.xml                      |  10 +-
 core/sis-cql/pom.xml                               |   4 +-
 .../apache/sis/coverage/grid/DimensionReducer.java |   2 +-
 .../org/apache/sis/coverage/grid/GridExtent.java   |   2 +
 .../org/apache/sis/coverage/grid/GridGeometry.java |  66 ++++-
 .../sis/coverage/grid/GridDerivationTest.java      |  27 ++
 .../apache/sis/coverage/grid/GridGeometryTest.java |  36 ++-
 .../org/apache/sis/metadata/MetadataStandard.java  |   4 +-
 .../org/apache/sis/metadata/MetadataVisitor.java   |   4 +-
 .../org/apache/sis/metadata/TreeTableView.java     |   4 +-
 .../org/apache/sis/metadata/sql/Dispatcher.java    |   4 +-
 .../java/org/apache/sis/geometry/Envelopes.java    |  13 +-
 .../sis/internal/referencing/AxesMapper.java       | 160 ++++++++++++
 .../sis/internal/referencing/AxisDirections.java   |  59 ++---
 .../apache/sis/internal/referencing/Resources.java |  19 +-
 .../sis/internal/referencing/Resources.properties  |   5 +-
 .../internal/referencing/Resources_fr.properties   |   5 +-
 .../sis/referencing/cs/CoordinateSystems.java      |  26 +-
 .../sis/referencing/cs/DirectionAlongMeridian.java |  15 +-
 .../apache/sis/referencing/cs/package-info.java    |   2 +-
 .../factory/ConcurrentAuthorityFactory.java        |  13 +-
 .../referencing/factory/FactoryDataException.java  |  13 +-
 .../referencing/factory/GeodeticObjectFactory.java |  30 ++-
 .../factory/IdentifiedObjectFinder.java            |  28 ++-
 .../sis/referencing/factory/package-info.java      |   2 +-
 .../referencing/factory/sql/EPSGCodeFinder.java    |   9 +-
 .../referencing/factory/sql/EPSGDataAccess.java    |  10 +-
 .../operation/AbstractCoordinateOperation.java     |   2 +-
 .../operation/CoordinateOperationRegistry.java     |   4 +-
 .../operation/DefaultConcatenatedOperation.java    |  12 +-
 .../operation/builder/LinearTransformBuilder.java  |  12 +-
 .../operation/builder/LocalizationGridBuilder.java |   2 +-
 .../builder/LocalizationGridException.java         | 114 +++++++++
 .../operation/builder/ProjectedTransformTry.java   |   2 +-
 .../operation/projection/ConformalProjection.java  |   2 +-
 .../operation/projection/ObliqueMercator.java      |  12 +-
 .../sis/internal/referencing/AxesMapperTest.java   |  97 ++++++++
 .../internal/referencing/AxisDirectionsTest.java   |  27 +-
 .../operation/projection/ObliqueMercatorTest.java  |  32 ++-
 .../sis/test/suite/ReferencingTestSuite.java       |   1 +
 .../org/apache/sis/internal/system/Semaphores.java |  26 +-
 .../apache/sis/internal/system/package-info.java   |   2 +-
 .../apache/sis/internal/util/PropertyFormat.java   |   4 +-
 .../main/java/org/apache/sis/util/Exceptions.java  |   5 +-
 .../apache/sis/util/logging/PerformanceLevel.java  |  25 +-
 .../apache/sis/util/resources/KeyConstants.java    |   2 +-
 .../org/apache/sis/util/resources/Vocabulary.java  |  10 +
 .../sis/util/resources/Vocabulary.properties       |   2 +
 .../sis/util/resources/Vocabulary_fr.properties    |   2 +
 ide-project/NetBeans/nbproject/genfiles.properties |   4 +-
 ide-project/NetBeans/nbproject/project.xml         |   4 +
 pom.xml                                            |   8 +-
 .../apache/sis/internal/earth/netcdf/GCOM_C.java   |   2 +-
 .../apache/sis/internal/earth/netcdf/GCOM_W.java   |   2 +-
 src/main/config/logging.properties                 |   8 +-
 .../java/org/apache/sis/internal/netcdf/Axis.java  |  16 ++
 .../org/apache/sis/internal/netcdf/Dimension.java  |  16 +-
 .../java/org/apache/sis/internal/netcdf/Grid.java  |  18 +-
 .../apache/sis/internal/netcdf/GridCacheValue.java |  22 +-
 .../org/apache/sis/internal/netcdf/Linearizer.java | 139 +++++++++--
 .../apache/sis/internal/netcdf/NamedElement.java   |   6 +-
 .../org/apache/sis/internal/netcdf/Variable.java   |  24 +-
 .../sis/internal/netcdf/ucar/DimensionWrapper.java |  13 +-
 .../sis/internal/storage/AbstractResource.java     |  19 ++
 .../apache/sis/internal/storage/folder/Store.java  |   2 +-
 .../sis/internal/storage/xml/AbstractProvider.java |  29 +--
 .../org/apache/sis/storage/DataStoreProvider.java  | 272 +++++++++++++++------
 .../apache/sis/storage/event/QuietLogRecord.java   |  70 ------
 .../apache/sis/storage/event/StoreListeners.java   |  59 +++--
 .../org/apache/sis/storage/event/package-info.java |   3 +-
 .../apache/sis/storage/DataStoreProviderTest.java  |  28 +--
 .../internal/storage/xml/stream/StaxDataStore.java |  10 +-
 .../sis/internal/storage/gpx/ReaderTest.java       |   8 +-
 .../sis/internal/storage/gpx/WriterTest.java       |  17 +-
 88 files changed, 1937 insertions(+), 602 deletions(-)

diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 4048b15,fde32dd..f00261f
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
  build.xml.data.CRC32=58e6b21c
  build.xml.script.CRC32=462eaba0
  build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=0142681e
 -nbproject/build-impl.xml.data.CRC32=f706d4ab
 -nbproject/build-impl.xml.script.CRC32=6b1e829a
++nbproject/build-impl.xml.data.CRC32=4e7b2ef2
 +nbproject/build-impl.xml.script.CRC32=7ab9bfcf
- nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48
+ nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.101.0.48

Reply via email to