From commits-return-10205-apmail-sis-commits-archive=sis.apache.org@sis.apache.org Thu Jan 4 21:48:06 2018 Return-Path: X-Original-To: apmail-sis-commits-archive@www.apache.org Delivered-To: apmail-sis-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6D3417636 for ; Thu, 4 Jan 2018 21:48:06 +0000 (UTC) Received: (qmail 62534 invoked by uid 500); 4 Jan 2018 21:48:06 -0000 Delivered-To: apmail-sis-commits-archive@sis.apache.org Received: (qmail 62506 invoked by uid 500); 4 Jan 2018 21:48:06 -0000 Mailing-List: contact commits-help@sis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sis-dev@sis.apache.org Delivered-To: mailing list commits@sis.apache.org Received: (qmail 62497 invoked by uid 99); 4 Jan 2018 21:48:06 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2018 21:48:06 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 7F3E93A0184 for ; Thu, 4 Jan 2018 21:48:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1820225 - in /sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality: DefaultQuantitativeResult.java package-info.java Date: Thu, 04 Jan 2018 21:48:02 -0000 To: commits@sis.apache.org From: desruisseaux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180104214805.7F3E93A0184@svn01-us-west.apache.org> Author: desruisseaux Date: Thu Jan 4 21:48:02 2018 New Revision: 1820225 URL: http://svn.apache.org/viewvc?rev=1820225&view=rev Log: kip (for now) commit b9138ba4701603d111a1ad5a45cefe49bddc0e00, be4322b6daa394a9b72f797002f8a32be4d07afc and 1c6335db0835583a53268e72152a0e0f1cab4231 Adaptation of commit 7ab66791cf9d495e8627a82fe7f57edbca51baa7 from Image Matter (minor fixes in maintenance and quality packages) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java?rev=1820225&r1=1820224&r2=1820225&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java [UTF-8] Thu Jan 4 21:48:02 2018 @@ -46,12 +46,14 @@ import org.opengis.util.RecordType; * * @author Martin Desruisseaux (IRD, Geomatys) * @author Touraïvane (IRD) - * @version 0.3 + * @author Cullen Rombach (Image Matters) + * @version 1.0 * @since 0.3 * @module */ @SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones. @XmlType(name = "DQ_QuantitativeResult_Type", propOrder = { + "values", "valueType", "valueUnit", "errorStatistic" @@ -139,7 +141,7 @@ public class DefaultQuantitativeResult e * @return Quantitative value or values. */ @Override -// @XmlElement(name = "value", required = true) // TODO + @XmlElement(name = "value", required = true) public List getValues() { return values = nonNullList(values, Record.class); } Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java?rev=1820225&r1=1820224&r2=1820225&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java [UTF-8] Thu Jan 4 21:48:02 2018 @@ -145,6 +145,7 @@ @XmlJavaTypeAdapter(StringAdapter.class), @XmlJavaTypeAdapter(InternationalStringAdapter.class), @XmlJavaTypeAdapter(GO_DateTime.class), + @XmlJavaTypeAdapter(GO_Record.class), @XmlJavaTypeAdapter(GO_RecordType.class), @XmlJavaTypeAdapter(GO_Boolean.class), @XmlJavaTypeAdapter(type=boolean.class, value=GO_Boolean.class) })