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 bf56b15 Renamed getCenterPoint() as getCentrePoint() for compliance with ISO 19115:2014. new 6640cc3 Update for GeoAPI change: Medium.name property type changed from MediumName to Citation. https://issues.apache.org/jira/browse/SIS-389 new f15686f In Metadata, java.nio.charset.Charset should be associated to java.util.Locale. This issue is described at https://github.com/opengeospatial/geoapi/issues/28 and is required for https://issues.apache.org/jira/browse/SIS-402 resolution. This work required improvement in many SIS internal classes (ModifiableMetadata, PropertyAccessor, Merger, TreeFormat, PT_Locale, etc…) for allowing the use of java.util.Map in addition of java.util.Collection in metadata properties. The 2 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/internal/book/GEOAPI.lst | 1 - .../resources/org/apache/sis/internal/book/OGC.lst | 1 - .../sis/internal/jaxb/code/MD_MediumNameCode.java | 4 +- .../sis/internal/jaxb/lan/LocaleAdapter.java | 62 ++++ .../sis/internal/jaxb/lan/LocaleAndCharset.java | 400 +++++++++++++++++++++ .../apache/sis/internal/jaxb/lan/OtherLocales.java | 150 ++++++++ .../apache/sis/internal/jaxb/lan/PT_Locale.java | 216 ++++++++--- .../internal/metadata/LegacyPropertyAdapter.java | 24 +- .../org/apache/sis/internal/metadata/Merger.java | 83 ++++- .../sis/internal/metadata/MetadataUtilities.java | 41 +++ .../apache/sis/internal/metadata/OtherLocales.java | 189 ---------- .../sis/internal/metadata/legacy/MediumName.java | 207 +++++++++++ .../internal/metadata/legacy}/package-info.java | 9 +- .../apache/sis/internal/simple/SimpleMetadata.java | 20 +- .../apache/sis/metadata/ModifiableMetadata.java | 170 +++++++-- .../org/apache/sis/metadata/PropertyAccessor.java | 48 ++- .../java/org/apache/sis/metadata/SpecialCases.java | 30 +- .../java/org/apache/sis/metadata/TreeNode.java | 61 +++- .../org/apache/sis/metadata/TreeNodeChildren.java | 51 +-- .../apache/sis/metadata/iso/DefaultMetadata.java | 221 +++++++----- .../DefaultFeatureCatalogueDescription.java | 76 ++-- .../sis/metadata/iso/content/package-info.java | 4 +- .../metadata/iso/distribution/DefaultMedium.java | 50 ++- .../metadata/iso/distribution/package-info.java | 2 - .../identification/DefaultDataIdentification.java | 114 +++--- .../metadata/iso/identification/package-info.java | 6 +- .../org/apache/sis/metadata/iso/package-info.java | 6 +- .../sis/internal/jaxb/lan/LanguageCodeTest.java | 6 +- .../sis/internal/jaxb/lan/OtherLocalesTest.java | 112 ++++++ .../sis/internal/jaxb/lan/PT_LocaleTest.java | 12 +- .../apache/sis/internal/metadata/MergerTest.java | 13 +- .../internal/metadata/MetadataUtilitiesTest.java | 32 +- .../sis/internal/metadata/OtherLocalesTest.java | 129 ------- .../apache/sis/metadata/PropertyAccessorTest.java | 9 +- .../sis/metadata/PropertyConsistencyCheck.java | 17 +- .../apache/sis/metadata/iso/AllMetadataTest.java | 2 +- .../sis/metadata/iso/CustomMetadataTest.java | 1 + .../sis/metadata/iso/DefaultMetadataTest.java | 10 +- .../DefaultDataIdentificationTest.java | 40 +-- .../org/apache/sis/test/mock/MetadataMock.java | 15 +- .../apache/sis/test/suite/MetadataTestSuite.java | 2 +- .../sis/test/xml/AnnotationConsistencyCheck.java | 17 +- .../apache/sis/test/integration/MetadataTest.java | 11 +- .../apache/sis/internal/util/CollectionsExt.java | 21 ++ .../sis/internal/util/TreeFormatCustomization.java | 8 + .../sis/util/collection/TreeTableFormat.java | 32 +- .../earthobservation/LandsatReaderTest.java | 2 +- .../apache/sis/internal/storage/xml/StoreTest.java | 6 +- 48 files changed, 2010 insertions(+), 733 deletions(-) create mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/LocaleAndCharset.java create mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/lan/OtherLocales.java delete mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java create mode 100644 core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/legacy/MediumName.java copy {storage/sis-xmlstore/src/main/java/org/apache/sis/storage/gps => core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/legacy}/package-info.java (87%) create mode 100644 core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/lan/OtherLocalesTest.java delete mode 100644 core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/OtherLocalesTest.java