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 74d119635edbcc8ab4812fd9f688f04dcfeb1123 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Tue Nov 15 17:13:06 2022 +0100 Constructor argument should be `CharSequence` instead of `InternationalString` for consistency with similar constructors in the rest of metadata packages. --- .../apache/sis/metadata/iso/quality/DefaultDescription.java | 10 ++++++++++ .../sis/metadata/iso/quality/DefaultDescriptiveResult.java | 7 ++++--- .../sis/metadata/iso/quality/DefaultIndirectEvaluation.java | 5 +++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescription.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescription.java index 5e55eaf6e0..53337934f1 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescription.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescription.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.opengis.util.InternationalString; import org.opengis.metadata.quality.Description; import org.opengis.metadata.identification.BrowseGraphic; +import org.apache.sis.util.iso.Types; import org.apache.sis.xml.Namespaces; @@ -76,6 +77,15 @@ public class DefaultDescription extends ISOMetadata implements Description { public DefaultDescription() { } + /** + * Constructs a description initialized with the given text. + * + * @param text text description, or {@code null} if none. + */ + public DefaultDescription(final CharSequence text) { + textDescription = Types.toInternationalString(text); + } + /** * Constructs a new instance initialized with the values from the specified metadata object. * This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java index d7b7868f33..96b6c1dbe8 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDescriptiveResult.java @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.opengis.util.InternationalString; import org.opengis.metadata.quality.DescriptiveResult; +import org.apache.sis.util.iso.Types; /** @@ -71,10 +72,10 @@ public class DefaultDescriptiveResult extends AbstractResult implements Descript /** * Creates a conformance result initialized to the given values. * - * @param statement statement against which data is being evaluated, or {@code null}. + * @param text statement against which data is being evaluated, or {@code null}. */ - public DefaultDescriptiveResult(final InternationalString statement) { - this.statement = statement; + public DefaultDescriptiveResult(final CharSequence text) { + statement = Types.toInternationalString(text); } /** diff --git a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java index 05fa85596b..474eebaf4a 100644 --- a/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java +++ b/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultIndirectEvaluation.java @@ -21,6 +21,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.opengis.util.InternationalString; import org.opengis.metadata.quality.IndirectEvaluation; +import org.apache.sis.util.iso.Types; /** @@ -73,8 +74,8 @@ public class DefaultIndirectEvaluation extends AbstractDataEvaluation implements * * @param source information on which data are used as sources, or {@code null}. */ - public DefaultIndirectEvaluation(final InternationalString source) { - deductiveSource = source; + public DefaultIndirectEvaluation(final CharSequence source) { + deductiveSource = Types.toInternationalString(source); } /**