Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B0459200D6F for ; Mon, 1 Jan 2018 18:46:59 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AEC04160C37; Mon, 1 Jan 2018 17:46:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3689C160C11 for ; Mon, 1 Jan 2018 18:46:57 +0100 (CET) Received: (qmail 7942 invoked by uid 500); 1 Jan 2018 17:46:56 -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 7932 invoked by uid 99); 1 Jan 2018 17:46:56 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Jan 2018 17:46:56 +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 925713A0198 for ; Mon, 1 Jan 2018 17:46:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1819779 [1/2] - in /sis/branches/ISO-19115-3: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/ core/sis-metadata/src/main/java/org/apache/sis/internal/j... Date: Mon, 01 Jan 2018 17:46:51 -0000 To: commits@sis.apache.org From: desruisseaux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20180101174654.925713A0198@svn01-us-west.apache.org> archived-at: Mon, 01 Jan 2018 17:46:59 -0000 Author: desruisseaux Date: Mon Jan 1 17:46:50 2018 New Revision: 1819779 URL: http://svn.apache.org/viewvc?rev=1819779&view=rev Log: Documentation update: replace some "ISO 19139" by "ISO 19139:2007", "ISO 19115:2003" or "ISO 19115-3" depending on the context. There is no code change in this commit. Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java sis/branches/ISO-19115-3/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamResolver.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java sis/branches/ISO-19115-3/pom.xml Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link DateType}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link DateType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link OnLineFunction}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link OnLineFunction} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link PresentationForm}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link PresentationForm} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link Role}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Role} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) @@ -92,8 +92,8 @@ public class CI_RoleCode extends CodeLis } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends CI_RoleCode { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link TelephoneType}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link TelephoneType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cullen Rombach (Image Matters) * @author Martin Desruisseaux (Geomatys) @@ -91,8 +91,8 @@ public class CI_TelephoneTypeCode extend } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends CI_TelephoneTypeCode { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link DistributedComputingPlatform}, in order to integrate the value in an element - * respecting the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link DistributedComputingPlatform} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Martin Desruisseaux (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link EvaluationMethodType}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about the - * handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link EvaluationMethodType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link AssociationType}, in order to integrate the value in a element - * complying with ISO-19139 standard. See package documentation to have more information - * about the handling of CodeList in ISO-19139. + * JAXB adapter for {@link AssociationType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Guilhem Legal (Geomatys) * @author Cullen Rombach (Image Matters) @@ -91,8 +91,8 @@ public class DS_AssociationTypeCode exte } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends DS_AssociationTypeCode { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link InitiativeType}, in order to integrate the value in a element - * complying with ISO-19139 standard. See package documentation to have more information - * about the handling of CodeList in ISO-19139. + * JAXB adapter for {@link InitiativeType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Guilhem Legal (Geomatys) * @author Cullen Rombach (Image Matters) @@ -91,8 +91,8 @@ public class DS_InitiativeTypeCode exten } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends DS_InitiativeTypeCode { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link CharacterSet}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link CharacterSet} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.5 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link CellGeometry}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link CellGeometry} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -29,9 +29,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link Charset}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Charset} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Martin Desruisseaux (Geomatys) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link Classification}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Classification} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link CoverageContentType}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about the - * handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link CoverageContentType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link Datatype}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Datatype} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link DimensionNameType}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about the - * handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link DimensionNameType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link GeometricObjectType}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about the - * handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link GeometricObjectType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link ImagingCondition}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link ImagingCondition} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link KeywordType}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link KeywordType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link MaintenanceFrequency}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about the - * handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link MaintenanceFrequency} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link MediumFormat}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about the - * handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link MediumFormat} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link MediumName}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link MediumName} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -22,9 +22,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link Obligation}, in order to wraps the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Obligation} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.5 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -24,9 +24,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link PixelOrientation}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link PixelOrientation} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link MD_ProgressCode}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Progress} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link Restriction}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Restriction} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link ScopeCode}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link ScopeCode} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Cullen Rombach (Image Matters) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link SpatialRepresentationType}, in order to integrate the value in an - * element respecting the ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link SpatialRepresentationType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -22,9 +22,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link TopicCategory}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link TopicCategory} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Guihem Legal (Geomatys) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -23,9 +23,9 @@ import org.apache.sis.internal.jaxb.gmd. /** - * JAXB adapter for {@link TopologyLevel}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information about - * the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link TopologyLevel} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 0.3 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link BandDefinition}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link BandDefinition} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link Context}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Context} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link GeometryType}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link GeometryType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link ObjectiveType}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link ObjectiveType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link OperationType}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link OperationType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link PolarizationOrientation}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link PolarizationOrientation} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @author Guilhem Legal (Geomatys) Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link Priority}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Priority} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link Sequence}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Sequence} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link TransferFunctionType}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link TransferFunctionType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link Trigger}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Trigger} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Cédric Briançon (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -33,9 +33,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link Locale}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link Locale} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * *

This adapter formats the locale like below:

* @@ -112,7 +112,8 @@ public final class PT_Locale extends Xml Charset characterEncoding; /** - * {@code true} if marshalling ISO 19139:2007, or {@code false} if marshalling ISO 19115-3. + * {@code true} if marshalling an element from the ISO 19115:2003 model, + * or {@code false} if marshalling an element from the ISO 19115:2014 model. */ private boolean isLegacyMetadata; @@ -134,7 +135,7 @@ public final class PT_Locale extends Xml } /** - * Gets the language code for this PT_Locale. Used in ISO 19139. + * Gets the language code for this PT_Locale. Used in ISO 19115:2003 model. */ @XmlElement(name = "languageCode", namespace = LegacyNamespaces.GMD) private LanguageCode getLanguageCode() { @@ -142,7 +143,7 @@ public final class PT_Locale extends Xml } /** - * Sets the language code for this PT_Locale. Used in ISO 19139. + * Sets the language code for this PT_Locale. Used in ISO 19115:2003 model. */ @SuppressWarnings("unused") private void setLanguageCode(LanguageCode newValue) { @@ -158,7 +159,7 @@ public final class PT_Locale extends Xml } /** - * Sets the language code for this PT_Locale. Used in ISO 19139. + * Sets the language code for this PT_Locale. Used in ISO 19115:2003 model. */ @SuppressWarnings("unused") private void setLanguage(LanguageCode newValue) { Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -25,9 +25,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link CouplingType}, in order to integrate the value in an element respecting - * the ISO-19139 standard. See package documentation for more information about the handling - * of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link CouplingType} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Martin Desruisseaux (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -24,9 +24,9 @@ import org.apache.sis.xml.Namespaces; /** - * JAXB adapter for {@link ParameterDirection}, in order to integrate the value in an element - * complying with ISO-19139 standard. See package documentation for more information - * about the handling of {@code CodeList} in ISO-19139. + * JAXB adapter for {@link ParameterDirection} + * in order to wrap the value in an XML element as specified by ISO 19115-3 standard. + * See package documentation for more information about the handling of {@code CodeList} in ISO 19115-3. * * @author Martin Desruisseaux (Geomatys) * @version 1.0 Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -198,8 +198,8 @@ public class TM_PeriodDuration extends P } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends TM_PeriodDuration { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -92,8 +92,8 @@ public class CI_Citation extends Propert } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends CI_Citation { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -105,8 +105,8 @@ public class MD_Identifier extends Prope } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends MD_Identifier { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -91,8 +91,8 @@ public class MD_KeywordClass extends Pro } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends MD_KeywordClass { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -92,8 +92,8 @@ public class MD_Medium extends PropertyT } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends MD_Medium { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -92,8 +92,8 @@ public class MD_Releasability extends Pr } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends MD_Releasability { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -92,8 +92,8 @@ public class MD_Scope extends PropertyTy } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends MD_Scope { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -26,7 +26,7 @@ import org.apache.sis.internal.jaxb.gco. * JAXB adapter mapping the GeoAPI {@link Identifier} to an implementation class that can * be marshalled. See the package documentation for more information about JAXB and interfaces. * - *

The XML produced by this adapter shall be compliant to the ISO 19139 syntax.

+ *

The XML produced by this adapter shall be compliant to the ISO 19115-3 syntax.

* * Note that a class of the same name is defined in the {@link org.apache.sis.internal.jaxb.referencing} * package, which serves the same purpose (wrapping exactly the same interface) but using the GML syntax Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -91,8 +91,8 @@ public class SV_OperationMetadata extend } /** - * Wraps the value only if marshalling ISO 19115-3 element. - * Otherwise (i.e. if marshalling a legacy ISO 19139:2007 document), omit the element. + * Wraps the value only if marshalling an element from the ISO 19115:2003 metadata model. + * Otherwise (i.e. if marshalling according legacy ISO 19115:2014 model), omits the element. */ public static final class Since2014 extends SV_OperationMetadata { /** Empty constructor used only by JAXB. */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -59,7 +59,7 @@ public class ReferenceSystemMetadata ext private static final long serialVersionUID = 2810145397032096087L; /** - * {@code true} if marshalling ISO 19139:2007, or {@code false} if marshalling ISO 19115-3. + * {@code true} if marshalling ISO 19115:2003 model, or {@code false} if marshalling ISO 19115:2014 model. */ private boolean isLegacyMetadata; @@ -118,8 +118,8 @@ public class ReferenceSystemMetadata ext } /** - * Gets the name for this reference system metadata (used in ISO 19139 format). - * This method can be invoked during ISO 19139 marshalling. + * Gets the name for this reference system metadata (used in ISO 19115:2003 model). + * This method can be invoked during marshalling of legacy XML documents. */ @XmlElement(name = "referenceSystemIdentifier", namespace = LegacyNamespaces.GMD) @XmlJavaTypeAdapter(RS_Identifier.class) @@ -128,7 +128,7 @@ public class ReferenceSystemMetadata ext } /** - * Sets the name for this reference system metadata (used in ISO 19139 format). + * Sets the name for this reference system metadata (used in ISO 19115:2003 model). */ @SuppressWarnings("unused") private void setLegacyName(final Identifier name) { Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -68,8 +68,8 @@ import static org.apache.sis.util.collec * except {@link #equals(Object, Object, ComparisonMode)} and {@link #freeze(Object)}. * *
  • Extra properties defined by the {@link IdentifiedObject} interface. Those properties - * invisible in the ISO 19115 model, but appears in ISO 19139 XML marshalling. So we do - * the same in the SIS implementation: invisible in map and tree view, but visible in + * invisible in the ISO 19115-1 model, but appears in ISO 19115-3 XML marshalling. So we + * do the same in the SIS implementation: invisible in map and tree view, but visible in * XML marshalling.
    • * * @@ -100,8 +100,8 @@ class PropertyAccessor { /** * Additional getter to declare in every list of getter methods that do not already provide * their own {@code getIdentifiers()} method. We handle this method specially because it is - * needed for XML marshalling in ISO 19139 compliant document, while not part of abstract - * ISO 19115 specification. + * needed for XML marshalling in ISO 19115-3 compliant document, while not part of abstract + * ISO 19115-1 specification. * * @see IdentifiedObject#getIdentifiers() */ Modified: sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java URL: http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java?rev=1819779&r1=1819778&r2=1819779&view=diff ============================================================================== --- sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] (original) +++ sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java [UTF-8] Mon Jan 1 17:46:50 2018 @@ -132,13 +132,13 @@ import org.apache.sis.xml.Namespaces; */ @SuppressWarnings("CloneableClassWithoutClone") // ModifiableMetadata needs shallow clones. @XmlType(name = "MD_Metadata_Type", propOrder = { - // Attributes new in ISO 19115-3 + // Attributes new in ISO 19115:2014 "metadataIdentifier", "defaultLocale", "parentMetadata", "metadataScope", - // Legacy ISO 19139:2007 attributes + // Legacy ISO 19115:2003 attributes "fileIdentifier", "language", "characterSet", @@ -149,19 +149,19 @@ import org.apache.sis.xml.Namespaces; // Common to both formats "contacts", - // Attributes new in ISO 19115-3 + // Attributes new in ISO 19115:2014 "dates", "metadataStandard", "otherLocales", - // Legacy ISO 19139:2007 attributes + // Legacy ISO 19115:2003 attributes "dateStamp", "metadataStandardName", "metadataStandardVersion", "dataSetUri", "locales", - // Common to both formats + // Common to both metadata models "spatialRepresentationInfo", "referenceSystemInfo", "metadataExtensionInfo",