Author: desruisseaux
Date: Sat Feb 24 16:13:58 2018
New Revision: 1825254
URL: http://svn.apache.org/viewvc?rev=1825254&view=rev
Log:
Merge from ISO 19115-3 branch.
Added:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_TelephoneTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_Duration.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeInfo.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Releasability.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyConsistencyCheck.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/MarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/xml/
- copied from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/xml/RenameListGenerator.java
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/internal/
- copied from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/internal/
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation
(legacy).xml
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation
(legacy).xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/extent/Extent
(legacy).xml
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/extent/Extent
(legacy).xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/identification/ServiceIdentification
(legacy).xml
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/identification/ServiceIdentification
(legacy).xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/lineage/ProcessStep
(legacy).xml
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/lineage/ProcessStep
(legacy).xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/quality/PositionalAccuracy
(legacy).xml
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/quality/PositionalAccuracy
(legacy).xml
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/FilterByVersion.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/UseLegacyMetadata.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Record.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Record.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_URL.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_URL.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/TransformVersion.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformVersion.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/TransformedEvent.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformedEvent.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/Transformer.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/Transformer.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingNamespaces.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingNamespaces.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingReader.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingReader.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingWriter.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/java/org/apache/sis/xml/TransformingWriter.java
sis/branches/JDK8/core/sis-utility/src/main/resources/org/apache/sis/xml/
- copied from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/main/resources/org/apache/sis/xml/
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/MetadataMock.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
- copied unchanged from r1825252,
sis/branches/ISO-19115-3/core/sis-utility/src/test/java/org/apache/sis/xml/TransformingNamespacesTest.java
Removed:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/direct/
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataTestCase.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/GO_URL.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/FilterVersion.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredNamespaces.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamReader.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/FilteredStreamWriter.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/MetadataMock.java
Modified:
sis/branches/JDK8/ (props changed)
sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
sis/branches/JDK8/core/sis-metadata/pom.xml
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ObligationCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/PT_Locale.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_ParameterDirection.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/geometry/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_ProcessStep.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/LE_Source.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Band.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_CoverageDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georectified.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Georeferenceable.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_ImageDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/MI_Metadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Responsibility.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_KeywordClass.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Scope.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/SV_OperationMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ReferenceSystemMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameter.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/replace/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/Dependencies.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/LegacyPropertyAdapter.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/OtherLocales.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyAccessor.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/PropertyComparator.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultApplicationSchemaInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultExtendedElementInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultIdentifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataExtensionInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultMetadataScope.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultPortrayalCatalogueReference.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultAcquisitionInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEnvironmentalRecord.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultEvent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultInstrument.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultObjective.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultOperation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlan.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatform.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultPlatformPass.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequestedDate.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/DefaultRequirement.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/AbstractParty.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultAddress.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultCitationDate.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultContact.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultIndividual.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOnlineResource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultOrganisation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibility.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultResponsibleParty.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultSeries.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/DefaultTelephone.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraints.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultReleasability.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultSecurityConstraints.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultAttributeGroup.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultBand.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywordClass.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationChainMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultOperationMetadata.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/OperationName.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScope.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessCommission.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultRelativeInternalPositionalAccuracy.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultThematicClassificationCorrectness.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTopologicalConsistency.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultUsability.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractGeolocationInformation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/AbstractSpatialRepresentation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultDimension.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCP.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGCPCollection.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeometricObjects.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeorectified.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGeoreferenceable.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultGridSpatialRepresentation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/DefaultVectorSpatialRepresentation.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/spatial/package-info.java
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/metadata/package-info.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/CodeListMarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/EnumMarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/code/PT_LocaleTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/internal/jaxb/metadata/replace/ServiceParameterTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/NameMapTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeNodeTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableFormatTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/TreeTableViewTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/TypeMapTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/ValueMapTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/APIVerifier.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultIdentifierTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ImmutableIdentifierTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultCitationTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultContactTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/DefaultResponsibilityTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/constraint/DefaultLegalConstraintsTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphicTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentificationTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFractionTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultResolutionTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultLineageTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/NilReasonMarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/citation/Citation.xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/extent/Extent.xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/identification/ServiceIdentification.xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/lineage/ProcessStep.xml
sis/branches/JDK8/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/quality/PositionalAccuracy.xml
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/SC_VerticalCRS.java
sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/crs/DefaultProjectedCRSTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultEllipsoidTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultTemporalDatumTest.java
sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/test/integration/MetadataTest.java
sis/branches/JDK8/core/sis-referencing/src/test/resources/org/apache/sis/test/integration/Metadata.xml
sis/branches/JDK8/core/sis-utility/pom.xml
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Context.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/NonMarshalledAuthority.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/Schemas.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_DateTime.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Distance.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_GenericName.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Measure.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/InternationalStringAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/NameAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/ObjectIdentification.html
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/UnitAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/EnumAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LocalisedCharacterString.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/TextGroup.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/package-info.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/SC_VerticalCRS.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/FileName.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileType.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileTypeAdapter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/package-info.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/package-info.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/IdentifiedObject.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/InputFactory.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/MarshalContext.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/Namespaces.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/NilObject.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/OutputFactory.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/PooledMarshaller.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/PooledUnmarshaller.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/ValueConverter.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/xml/package-info.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gmd/LanguageCodeTest.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gml/MeasureTest.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/mock/package-info.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/xml/NamespacesTest.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/xml/ReferenceResolverMock.java
sis/branches/JDK8/ide-project/NetBeans/build.xml
sis/branches/JDK8/pom.xml
sis/branches/JDK8/profiles/sis-french-profile/src/main/java/org/apache/sis/internal/profile/fra/DataIdentification.java
sis/branches/JDK8/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DataIdentificationTest.java
sis/branches/JDK8/profiles/sis-french-profile/src/test/java/org/apache/sis/internal/profile/fra/DirectReferenceSystemTest.java
sis/branches/JDK8/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
sis/branches/JDK8/storage/sis-netcdf/src/test/java/org/apache/sis/storage/netcdf/MetadataReaderTest.java
sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java
sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/StoreTest.java
Propchange: sis/branches/JDK8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 24 16:13:58 2018
@@ -1,4 +1,5 @@
/sis/branches/Android:1430670-1480699
+/sis/branches/ISO-19115-3:1804459-1825252
/sis/branches/JDK6:1394913-1508480
/sis/branches/JDK9:1773327-1803064
/sis/trunk:1394364-1508466,1519089-1519674
Modified:
sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
[UTF-8] (original)
+++
sis/branches/JDK8/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeCommandTest.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -43,12 +43,11 @@ public final strictfp class MimeTypeComm
*/
@Test
public void testWithMetadataXML() throws Exception {
- final URL url = DefaultExtentTest.getResource("Extent.xml");
- assertNotNull("Extent.xml", url);
+ final URL url = DefaultExtentTest.getTestFile(true);
final MimeTypeCommand test = new MimeTypeCommand(0,
CommandRunner.TEST, url.toString());
test.run();
final String output = test.outputBuffer.toString().trim();
- assertTrue(output, output.endsWith("Extent.xml:
application/vnd.iso.19139+xml"));
+ assertTrue(output, output.endsWith(".xml:
application/vnd.iso.19139+xml"));
}
/**
Modified:
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/GEOAPI.lst
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -74,7 +74,6 @@ Factory
FactoryException
FeatureCatalogueDescription
FeatureTypeInfo
-FeatureTypeList
Format
FormatConsistency
Formula
Modified:
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-build-helper/src/main/resources/org/apache/sis/internal/book/OGC.lst
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -133,7 +133,6 @@ MD_Distributor
MD_ExtendedElementInformation
MD_FeatureCatalogueDescription
MD_FeatureTypeInfo
-MD_FeatureTypeList
MD_Format
MD_GeometricObjectTypeCode
MD_GeometricObjects
Modified: sis/branches/JDK8/core/sis-metadata/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/pom.xml?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/pom.xml (original)
+++ sis/branches/JDK8/core/sis-metadata/pom.xml Sat Feb 24 16:13:58 2018
@@ -82,6 +82,15 @@ Implementations of metadata derived from
</roles>
</contributor>
<contributor>
+ <name>Cullen Rombach</name>
+ <organization>Image Matters</organization>
+ <organizationUrl>http://www.imagemattersllc.com</organizationUrl>
+ <timezone>-5</timezone>
+ <roles>
+ <role>developer</role>
+ </roles>
+ </contributor>
+ <contributor>
<name>Guilhem Legal</name>
<email>[email protected]</email>
<organization>Geomatys</organization>
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,17 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.citation.DateType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -72,7 +74,7 @@ public final class CI_DateTypeCode exten
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "CI_DateTypeCode")
+ @XmlElement(name = "CI_DateTypeCode", namespace = Namespaces.CIT)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,17 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.citation.OnLineFunction;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -72,7 +74,7 @@ public final class CI_OnLineFunctionCode
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "CI_OnLineFunctionCode")
+ @XmlElement(name = "CI_OnLineFunctionCode", namespace = Namespaces.CIT)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,17 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.citation.PresentationForm;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.xml.Namespaces;
/**
- * 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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -72,7 +74,7 @@ public final class CI_PresentationFormCo
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "CI_PresentationFormCode")
+ @XmlElement(name = "CI_PresentationFormCode", namespace = Namespaces.CIT)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,19 +20,22 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.citation.Role;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.0
* @since 0.3
* @module
*/
-public final class CI_RoleCode extends CodeListAdapter<CI_RoleCode, Role> {
+public class CI_RoleCode extends CodeListAdapter<CI_RoleCode, Role> {
/**
* Empty constructor for JAXB only.
*/
@@ -62,7 +65,7 @@ public final class CI_RoleCode extends C
* @return the code list class.
*/
@Override
- protected Class<Role> getCodeListClass() {
+ protected final Class<Role> getCodeListClass() {
return Role.class;
}
@@ -72,8 +75,8 @@ public final class CI_RoleCode extends C
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "CI_RoleCode")
- public CodeListUID getElement() {
+ @XmlElement(name = "CI_RoleCode", namespace = Namespaces.CIT)
+ public final CodeListUID getElement() {
return identifier;
}
@@ -82,7 +85,26 @@ public final class CI_RoleCode extends C
*
* @param value the unmarshalled value.
*/
- public void setElement(final CodeListUID value) {
+ public final void setElement(final CodeListUID value) {
identifier = value;
}
+
+ /**
+ * 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. */
+ public Since2014() {
+ }
+
+ /**
+ * Wraps the given value in an ISO 19115-3 element, unless we are
marshalling an older document.
+ *
+ * @return a non-null value only if marshalling ISO 19115-3 or newer.
+ */
+ @Override protected CI_RoleCode wrap(final CodeListUID value) {
+ return accept2014() ? super.wrap(value) : null;
+ }
+ }
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -24,12 +24,12 @@ 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 0.5
+ * @version 1.0
* @since 0.5
* @module
*/
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,16 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.quality.EvaluationMethodType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.xml.Namespaces;
/**
- * 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
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -74,7 +75,7 @@ public final class DQ_EvaluationMethodTy
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "DQ_EvaluationMethodTypeCode")
+ @XmlElement(name = "DQ_EvaluationMethodTypeCode", namespace =
Namespaces.MDQ)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,19 +20,21 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.identification.AssociationType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
-public final class DS_AssociationTypeCode extends
CodeListAdapter<DS_AssociationTypeCode, AssociationType> {
+public class DS_AssociationTypeCode extends
CodeListAdapter<DS_AssociationTypeCode, AssociationType> {
/**
* Empty constructor for JAXB only.
*/
@@ -62,7 +64,7 @@ public final class DS_AssociationTypeCod
* @return the code list class.
*/
@Override
- protected Class<AssociationType> getCodeListClass() {
+ protected final Class<AssociationType> getCodeListClass() {
return AssociationType.class;
}
@@ -72,8 +74,8 @@ public final class DS_AssociationTypeCod
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "DS_AssociationTypeCode")
- public CodeListUID getElement() {
+ @XmlElement(name = "DS_AssociationTypeCode", namespace = Namespaces.MRI)
+ public final CodeListUID getElement() {
return identifier;
}
@@ -82,7 +84,26 @@ public final class DS_AssociationTypeCod
*
* @param value the unmarshalled value.
*/
- public void setElement(final CodeListUID value) {
+ public final void setElement(final CodeListUID value) {
identifier = value;
}
+
+ /**
+ * 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. */
+ public Since2014() {
+ }
+
+ /**
+ * Wraps the given value in an ISO 19115-3 element, unless we are
marshalling an older document.
+ *
+ * @return a non-null value only if marshalling ISO 19115-3 or newer.
+ */
+ @Override protected DS_AssociationTypeCode wrap(final CodeListUID
value) {
+ return accept2014() ? super.wrap(value) : null;
+ }
+ }
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,19 +20,21 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.identification.InitiativeType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
-public final class DS_InitiativeTypeCode extends
CodeListAdapter<DS_InitiativeTypeCode, InitiativeType> {
+public class DS_InitiativeTypeCode extends
CodeListAdapter<DS_InitiativeTypeCode, InitiativeType> {
/**
* Empty constructor for JAXB only.
*/
@@ -62,7 +64,7 @@ public final class DS_InitiativeTypeCode
* @return the code list class.
*/
@Override
- protected Class<InitiativeType> getCodeListClass() {
+ protected final Class<InitiativeType> getCodeListClass() {
return InitiativeType.class;
}
@@ -72,8 +74,8 @@ public final class DS_InitiativeTypeCode
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "DS_InitiativeTypeCode")
- public CodeListUID getElement() {
+ @XmlElement(name = "DS_InitiativeTypeCode", namespace = Namespaces.MRI)
+ public final CodeListUID getElement() {
return identifier;
}
@@ -82,7 +84,26 @@ public final class DS_InitiativeTypeCode
*
* @param value the unmarshalled value.
*/
- public void setElement(final CodeListUID value) {
+ public final void setElement(final CodeListUID value) {
identifier = value;
}
+
+ /**
+ * 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. */
+ public Since2014() {
+ }
+
+ /**
+ * Wraps the given value in an ISO 19115-3 element, unless we are
marshalling an older document.
+ *
+ * @return a non-null value only if marshalling ISO 19115-3 or newer.
+ */
+ @Override protected DS_InitiativeTypeCode wrap(final CodeListUID
value) {
+ return accept2014() ? super.wrap(value) : null;
+ }
+ }
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,16 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.identification.CharacterSet;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.internal.jaxb.LegacyNamespaces;
/**
- * 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
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -73,7 +74,7 @@ public final class LegacyCharacterSet ex
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_CharacterSetCode")
+ @XmlElement(name = "MD_CharacterSetCode", namespace = LegacyNamespaces.GMD)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,16 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.spatial.CellGeometry;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.xml.Namespaces;
/**
- * 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
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -72,7 +73,7 @@ public final class MD_CellGeometryCode e
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_CellGeometryCode")
+ @XmlElement(name = "MD_CellGeometryCode", namespace = Namespaces.MSR)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -21,19 +21,21 @@ import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.XmlAdapter;
+import org.apache.sis.xml.Namespaces;
import org.apache.sis.xml.ValueConverter;
import org.apache.sis.internal.jaxb.Context;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
- * 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)
- * @version 0.5
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -90,7 +92,7 @@ public final class MD_CharacterSetCode e
*
* @return the value to be marshalled.
*/
- @XmlElement(name = "MD_CharacterSetCode")
+ @XmlElement(name = "MD_CharacterSetCode", namespace = Namespaces.LAN)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,17 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.constraint.Classification;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.xml.Namespaces;
/**
- * 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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -72,7 +74,7 @@ public final class MD_ClassificationCode
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_ClassificationCode")
+ @XmlElement(name = "MD_ClassificationCode", namespace = Namespaces.MCO)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,17 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.content.CoverageContentType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -74,7 +76,7 @@ public final class MD_CoverageContentTyp
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_CoverageContentTypeCode")
+ @XmlElement(name = "MD_CoverageContentTypeCode", namespace =
Namespaces.MRC)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,17 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.Datatype;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -72,7 +74,7 @@ public final class MD_DatatypeCode exten
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_DatatypeCode")
+ @XmlElement(name = "MD_DatatypeCode", namespace = Namespaces.MEX)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,17 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.spatial.DimensionNameType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+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)
- * @version 0.3
+ * @author Cullen Rombach (Image Matters)
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -74,7 +76,7 @@ public final class MD_DimensionNameTypeC
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_DimensionNameTypeCode")
+ @XmlElement(name = "MD_DimensionNameTypeCode", namespace = Namespaces.MSR)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,16 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.spatial.GeometricObjectType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.xml.Namespaces;
/**
- * 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
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -74,7 +75,7 @@ public final class MD_GeometricObjectTyp
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_GeometricObjectTypeCode")
+ @XmlElement(name = "MD_GeometricObjectTypeCode", namespace =
Namespaces.MSR)
public CodeListUID getElement() {
return identifier;
}
Modified:
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java?rev=1825254&r1=1825253&r2=1825254&view=diff
==============================================================================
---
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
[UTF-8] (original)
+++
sis/branches/JDK8/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
[UTF-8] Sat Feb 24 16:13:58 2018
@@ -20,15 +20,16 @@ import javax.xml.bind.annotation.XmlElem
import org.opengis.metadata.content.ImagingCondition;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
import org.apache.sis.internal.jaxb.gmd.CodeListUID;
+import org.apache.sis.xml.Namespaces;
/**
- * 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
+ * @version 1.0
* @since 0.3
* @module
*/
@@ -74,7 +75,7 @@ public final class MD_ImagingConditionCo
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_ImagingConditionCode")
+ @XmlElement(name = "MD_ImagingConditionCode", namespace = Namespaces.MRC)
public CodeListUID getElement() {
return identifier;
}
