sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 02/03: Merge branch 'geoapi-4.0' into geoapi-3.1.
Date Mon, 06 May 2019 12:48:27 GMT
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 6944f6c5eb015b4ebe36a66a2c2734fae36d8964
Merge: 0018ef8 43a1a89
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Mon May 6 12:14:49 2019 +0200

    Merge branch 'geoapi-4.0' into geoapi-3.1.

 .../src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java  | 3 +--
 .../sis/metadata/iso/identification/DefaultDataIdentification.java  | 1 -
 .../test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java | 6 ++----
 pom.xml                                                             | 6 +++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --cc core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
index 4dedc6c,f7bb052..8a8ad79
--- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
@@@ -364,15 -350,4 +364,14 @@@ public class DefaultDataIdentification 
      private Collection<PT_Locale> getOtherLocales() {
          return FilterByVersion.CURRENT_METADATA.accept() ? OtherLocales.filter(getLocalesAndCharsets())
: null;
      }
 +
 +    /**
 +     * Returns the character coding for the metadata set (used in legacy ISO 19157 format).
 +     *
 +     * @see #getCharacterSets()
 +     */
-     @Dependencies("getLocalesAndCharsets")
 +    @XmlElement(name = "characterSet", namespace = LegacyNamespaces.GMD)
 +    private Collection<Charset> getCharacterSet() {
 +        return FilterByVersion.LEGACY_METADATA.accept() ? LocaleAndCharset.getCharacterSets(getLocalesAndCharsets())
: null;
 +    }
  }


Mime
View raw message