Author: desruisseaux
Date: Sun Feb 4 16:51:13 2018
New Revision: 1823099
URL: http://svn.apache.org/viewvc?rev=1823099&view=rev
Log:
For code list adapters, move namespace declaration in the @XmlElement instead
than @XmlType.
This is a little bit more accurate since we have no good name for those
@XmlType,
and this clarification make annotation verification a little bit easier.
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/test/java/org/apache/sis/test/xml/PackageVerifier.java
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.DateType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.CIT)
public final class CI_DateTypeCode extends CodeListAdapter<CI_DateTypeCode,
DateType> {
/**
* Empty constructor for JAXB only.
@@ -76,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.OnLineFunction;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.CIT)
public final class CI_OnLineFunctionCode extends
CodeListAdapter<CI_OnLineFunctionCode, OnLineFunction> {
/**
* Empty constructor for JAXB only.
@@ -76,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.PresentationForm;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.CIT)
public final class CI_PresentationFormCode extends
CodeListAdapter<CI_PresentationFormCode, PresentationForm> {
/**
* Empty constructor for JAXB only.
@@ -76,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.Role;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -36,7 +35,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.CIT)
public class CI_RoleCode extends CodeListAdapter<CI_RoleCode, Role> {
/**
* Empty constructor for JAXB only.
@@ -77,7 +75,7 @@ public class CI_RoleCode extends CodeLis
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "CI_RoleCode")
+ @XmlElement(name = "CI_RoleCode", namespace = Namespaces.CIT)
public final CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.TelephoneType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 1.0
* @module
*/
-@XmlType(namespace = Namespaces.CIT)
public class CI_TelephoneTypeCode extends
CodeListAdapter<CI_TelephoneTypeCode, TelephoneType> {
/**
* Empty constructor for JAXB only.
@@ -76,7 +74,7 @@ public class CI_TelephoneTypeCode extend
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "CI_TelephoneTypeCode")
+ @XmlElement(name = "CI_TelephoneTypeCode", namespace = Namespaces.CIT)
public final CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.DistributedComputingPlatform;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.5
* @module
*/
-@XmlType(namespace = Namespaces.SRV)
public final class DCPList extends CodeListAdapter<DCPList,
DistributedComputingPlatform> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class DCPList extends CodeL
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "DCPList")
+ @XmlElement(name = "DCPList", namespace = Namespaces.SRV)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.quality.EvaluationMethodType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MDQ)
public final class DQ_EvaluationMethodTypeCode
extends CodeListAdapter<DQ_EvaluationMethodTypeCode,
EvaluationMethodType>
{
@@ -77,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.AssociationType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRI)
public class DS_AssociationTypeCode extends
CodeListAdapter<DS_AssociationTypeCode, AssociationType> {
/**
* Empty constructor for JAXB only.
@@ -76,7 +74,7 @@ public class DS_AssociationTypeCode exte
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "DS_AssociationTypeCode")
+ @XmlElement(name = "DS_AssociationTypeCode", namespace = Namespaces.MRI)
public final CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.InitiativeType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRI)
public class DS_InitiativeTypeCode extends
CodeListAdapter<DS_InitiativeTypeCode, InitiativeType> {
/**
* Empty constructor for JAXB only.
@@ -76,7 +74,7 @@ public class DS_InitiativeTypeCode exten
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "DS_InitiativeTypeCode")
+ @XmlElement(name = "DS_InitiativeTypeCode", namespace = Namespaces.MRI)
public final CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.CharacterSet;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.internal.jaxb.Lega
* @module
*/
@SuppressWarnings("deprecation")
-@XmlType(namespace = LegacyNamespaces.GMD)
public final class LegacyCharacterSet extends
CodeListAdapter<LegacyCharacterSet, CharacterSet> {
/**
* Empty constructor for JAXB only.
@@ -76,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.CellGeometry;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MSR)
public final class MD_CellGeometryCode extends
CodeListAdapter<MD_CellGeometryCode, CellGeometry> {
/**
* Empty constructor for JAXB only.
@@ -75,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -19,7 +19,6 @@ package org.apache.sis.internal.jaxb.cod
import java.util.Locale;
import java.nio.charset.Charset;
import java.nio.charset.IllegalCharsetNameException;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.xml.Namespaces;
@@ -40,7 +39,6 @@ import org.apache.sis.internal.jaxb.gmd.
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.LAN)
public final class MD_CharacterSetCode extends XmlAdapter<MD_CharacterSetCode,
Charset> {
/**
* Empty constructor for JAXB only.
@@ -94,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.constraint.Classification;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MCO)
public final class MD_ClassificationCode extends
CodeListAdapter<MD_ClassificationCode, Classification> {
/**
* Empty constructor for JAXB only.
@@ -76,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.CoverageContentType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRC)
public final class MD_CoverageContentTypeCode
extends CodeListAdapter<MD_CoverageContentTypeCode,
CoverageContentType>
{
@@ -78,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.Datatype;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MEX)
public final class MD_DatatypeCode extends CodeListAdapter<MD_DatatypeCode,
Datatype> {
/**
* Empty constructor for JAXB only.
@@ -76,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.DimensionNameType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MSR)
public final class MD_DimensionNameTypeCode
extends CodeListAdapter<MD_DimensionNameTypeCode, DimensionNameType>
{
@@ -78,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.GeometricObjectType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MSR)
public final class MD_GeometricObjectTypeCode
extends CodeListAdapter<MD_GeometricObjectTypeCode,
GeometricObjectType>
{
@@ -77,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/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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.ImagingCondition;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRC)
public final class MD_ImagingConditionCode
extends CodeListAdapter<MD_ImagingConditionCode, ImagingCondition>
{
@@ -77,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;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.KeywordType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRI)
public final class MD_KeywordTypeCode extends
CodeListAdapter<MD_KeywordTypeCode, KeywordType> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MD_KeywordTypeCode ex
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_KeywordTypeCode")
+ @XmlElement(name = "MD_KeywordTypeCode", namespace = Namespaces.MRI)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.maintenance.MaintenanceFrequency;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MMI)
public final class MD_MaintenanceFrequencyCode
extends CodeListAdapter<MD_MaintenanceFrequencyCode,
MaintenanceFrequency>
{
@@ -78,7 +76,7 @@ public final class MD_MaintenanceFrequen
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_MaintenanceFrequencyCode")
+ @XmlElement(name = "MD_MaintenanceFrequencyCode", namespace =
Namespaces.MMI)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.distribution.MediumFormat;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRD)
public final class MD_MediumFormatCode extends
CodeListAdapter<MD_MediumFormatCode, MediumFormat> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MD_MediumFormatCode e
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_MediumFormatCode")
+ @XmlElement(name = "MD_MediumFormatCode", namespace = Namespaces.MRD)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.distribution.MediumName;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.internal.jaxb.Lega
* @since 0.3
* @module
*/
-@XmlType(namespace = LegacyNamespaces.GMD)
public final class MD_MediumNameCode extends
CodeListAdapter<MD_MediumNameCode, MediumName> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MD_MediumNameCode ext
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_MediumNameCode")
+ @XmlElement(name = "MD_MediumNameCode", namespace = LegacyNamespaces.GMD)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.annotation.Obligation;
import org.apache.sis.internal.jaxb.gmd.EnumAdapter;
@@ -33,12 +32,11 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MEX)
public final class MD_ObligationCode extends EnumAdapter<MD_ObligationCode,
Obligation> {
/**
* The enumeration value.
*/
- @XmlElement(name = "MD_ObligationCode")
+ @XmlElement(name = "MD_ObligationCode", namespace = Namespaces.MEX)
private String value;
/**
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.PixelOrientation;
import org.apache.sis.internal.jaxb.gmd.EnumAdapter;
@@ -34,12 +33,11 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MSR)
public final class MD_PixelOrientationCode extends
EnumAdapter<MD_PixelOrientationCode, PixelOrientation> {
/**
* The enumeration value.
*/
- @XmlElement(name = "MD_PixelOrientationCode")
+ @XmlElement(name = "MD_PixelOrientationCode", namespace = Namespaces.MSR)
private String value;
/**
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.Progress;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MCC)
public final class MD_ProgressCode extends CodeListAdapter<MD_ProgressCode,
Progress> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MD_ProgressCode exten
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_ProgressCode")
+ @XmlElement(name = "MD_ProgressCode", namespace = Namespaces.MCC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MCO)
public final class MD_RestrictionCode extends
CodeListAdapter<MD_RestrictionCode, Restriction> {
/**
* Empty constructor for JAXB only.
@@ -84,7 +82,7 @@ public final class MD_RestrictionCode ex
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_RestrictionCode")
+ @XmlElement(name = "MD_RestrictionCode", namespace = Namespaces.MCO)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.maintenance.ScopeCode;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MCC)
public final class MD_ScopeCode extends CodeListAdapter<MD_ScopeCode,
ScopeCode> {
/**
* Empty constructor for JAXB only.
@@ -76,7 +74,7 @@ public final class MD_ScopeCode extends
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_ScopeCode")
+ @XmlElement(name = "MD_ScopeCode", namespace = Namespaces.MCC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.SpatialRepresentationType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MCC)
public final class MD_SpatialRepresentationTypeCode
extends CodeListAdapter<MD_SpatialRepresentationTypeCode,
SpatialRepresentationType>
{
@@ -77,7 +75,7 @@ public final class MD_SpatialRepresentat
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_SpatialRepresentationTypeCode")
+ @XmlElement(name = "MD_SpatialRepresentationTypeCode", namespace =
Namespaces.MCC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.TopicCategory;
import org.apache.sis.internal.jaxb.gmd.EnumAdapter;
@@ -35,12 +34,11 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRI)
public final class MD_TopicCategoryCode extends
EnumAdapter<MD_TopicCategoryCode, TopicCategory> {
/**
* The enumeration value.
*/
- @XmlElement(name = "MD_TopicCategoryCode")
+ @XmlElement(name = "MD_TopicCategoryCode", namespace = Namespaces.MRI)
private String value;
/**
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.TopologyLevel;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MSR)
public final class MD_TopologyLevelCode extends
CodeListAdapter<MD_TopologyLevelCode, TopologyLevel> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MD_TopologyLevelCode
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MD_TopologyLevelCode")
+ @XmlElement(name = "MD_TopologyLevelCode", namespace = Namespaces.MSR)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.BandDefinition;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRC)
public final class MI_BandDefinition extends
CodeListAdapter<MI_BandDefinition, BandDefinition> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_BandDefinition ext
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_BandDefinition")
+ @XmlElement(name = "MI_BandDefinition", namespace = Namespaces.MRC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.Context;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MAC)
public final class MI_ContextCode extends CodeListAdapter<MI_ContextCode,
Context> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_ContextCode extend
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_ContextCode")
+ @XmlElement(name = "MI_ContextCode", namespace = Namespaces.MAC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.GeometryType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MAC)
public final class MI_GeometryTypeCode extends
CodeListAdapter<MI_GeometryTypeCode, GeometryType> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_GeometryTypeCode e
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_GeometryTypeCode")
+ @XmlElement(name = "MI_GeometryTypeCode", namespace = Namespaces.MAC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.ObjectiveType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MAC)
public final class MI_ObjectiveTypeCode extends
CodeListAdapter<MI_ObjectiveTypeCode, ObjectiveType> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_ObjectiveTypeCode
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_ObjectiveTypeCode")
+ @XmlElement(name = "MI_ObjectiveTypeCode", namespace = Namespaces.MAC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.OperationType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MAC)
public final class MI_OperationTypeCode extends
CodeListAdapter<MI_OperationTypeCode, OperationType> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_OperationTypeCode
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_OperationTypeCode")
+ @XmlElement(name = "MI_OperationTypeCode", namespace = Namespaces.MAC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.PolarizationOrientation;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -35,7 +34,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.GMI)
public final class MI_PolarizationOrientationCode
extends CodeListAdapter<MI_PolarizationOrientationCode,
PolarizationOrientation>
{
@@ -78,7 +76,7 @@ public final class MI_PolarizationOrient
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_PolarizationOrientationCode")
+ @XmlElement(name = "MI_PolarizationOrientationCode", namespace =
Namespaces.GMI)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.Priority;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MAC)
public final class MI_PriorityCode extends CodeListAdapter<MI_PriorityCode,
Priority> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_PriorityCode exten
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_PriorityCode")
+ @XmlElement(name = "MI_PriorityCode", namespace = Namespaces.MAC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.Sequence;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MAC)
public final class MI_SequenceCode extends CodeListAdapter<MI_SequenceCode,
Sequence> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_SequenceCode exten
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_SequenceCode")
+ @XmlElement(name = "MI_SequenceCode", namespace = Namespaces.MAC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.TransferFunctionType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MRC)
public final class MI_TransferFunctionTypeCode
extends CodeListAdapter<MI_TransferFunctionTypeCode,
TransferFunctionType>
{
@@ -77,7 +75,7 @@ public final class MI_TransferFunctionTy
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_TransferFunctionTypeCode")
+ @XmlElement(name = "MI_TransferFunctionTypeCode", namespace =
Namespaces.MRC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.Trigger;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.MAC)
public final class MI_TriggerCode extends CodeListAdapter<MI_TriggerCode,
Trigger> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class MI_TriggerCode extend
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "MI_TriggerCode")
+ @XmlElement(name = "MI_TriggerCode", namespace = Namespaces.MAC)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -69,12 +69,11 @@ import org.apache.sis.xml.Namespaces;
* @since 0.3
* @module
*/
-@XmlType(namespace = Namespaces.LAN)
public final class PT_Locale extends XmlAdapter<PT_Locale, Locale> {
/**
* The attributes wrapped in a {@code "PT_Locale"} element.
*/
- @XmlElement(name = "PT_Locale")
+ @XmlElement(name = "PT_Locale", namespace = Namespaces.LAN)
private Wrapper element;
/**
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.CouplingType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
@@ -34,7 +33,6 @@ import org.apache.sis.xml.Namespaces;
* @since 0.5
* @module
*/
-@XmlType(namespace = Namespaces.SRV)
public final class SV_CouplingType extends CodeListAdapter<SV_CouplingType,
CouplingType> {
/**
* Empty constructor for JAXB only.
@@ -75,7 +73,7 @@ public final class SV_CouplingType exten
* @return the value to be marshalled.
*/
@Override
- @XmlElement(name = "SV_CouplingType")
+ @XmlElement(name = "SV_CouplingType", namespace = Namespaces.SRV)
public CodeListUID getElement() {
return identifier;
}
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=1823099&r1=1823098&r2=1823099&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] Sun Feb 4 16:51:13 2018
@@ -16,7 +16,6 @@
*/
package org.apache.sis.internal.jaxb.code;
-import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import org.opengis.parameter.ParameterDirection;
import org.apache.sis.internal.jaxb.gmd.EnumAdapter;
@@ -33,12 +32,11 @@ import org.apache.sis.xml.Namespaces;
* @since 0.5
* @module
*/
-@XmlType(namespace = Namespaces.SRV)
public final class SV_ParameterDirection extends
EnumAdapter<SV_ParameterDirection, ParameterDirection> {
/**
* The enumeration value.
*/
- @XmlElement(name = "SV_ParameterDirection")
+ @XmlElement(name = "SV_ParameterDirection", namespace = Namespaces.SRV)
private String value;
/**
Modified:
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
URL:
http://svn.apache.org/viewvc/sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java?rev=1823099&r1=1823098&r2=1823099&view=diff
==============================================================================
---
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
[UTF-8] (original)
+++
sis/branches/ISO-19115-3/core/sis-metadata/src/test/java/org/apache/sis/test/xml/PackageVerifier.java
[UTF-8] Sun Feb 4 16:51:13 2018
@@ -139,9 +139,7 @@ final strictfp class PackageVerifier {
{
final XmlType xmlType =
type.getDeclaredAnnotation(XmlType.class);
final XmlRootElement xmlRoot =
type.getDeclaredAnnotation(XmlRootElement.class);
- if (xmlRoot == null && xmlType == null) {
- return;
- }
+ XmlElement codeList = null;
/*
* Get the type name and namespace from the @XmlType or
@XmlRootElement annotations.
* If both of them are present, verify that they are consistent (same
namespace and
@@ -160,11 +158,26 @@ final strictfp class PackageVerifier {
}
SchemaCompliance.verifyNamingConvention(type.getName(),
className, xmlType.name(), SchemaCompliance.TYPE_SUFFIX);
}
- } else {
+ } else if (xmlType != null) {
namespace = xmlType.namespace();
final String name = xmlType.name();
- className = name.equals(AnnotationConsistencyCheck.DEFAULT)
- ? type.getSimpleName() : SchemaCompliance.trim(name,
SchemaCompliance.TYPE_SUFFIX);
+ className = SchemaCompliance.trim(name,
SchemaCompliance.TYPE_SUFFIX);
+ } else {
+ /*
+ * If there is neither @XmlRootElement or @XmlType annotation, it
may be a code list as implemented
+ * in the org.apache.sis.internal.jaxb.code package. Those
adapters have a single @XmlElement which
+ * is to be interpreted as if it was the actual type.
+ */
+ for (final Method method : type.getDeclaredMethods()) {
+ final XmlElement e =
method.getDeclaredAnnotation(XmlElement.class);
+ if (e != null) {
+ if (codeList != null) return;
+ codeList = e;
+ }
+ }
+ if (codeList == null) return;
+ namespace = codeList.namespace();
+ className = codeList.name();
}
/*
* Verify that the namespace declared on the class is not redundant
with the namespace
@@ -204,6 +217,7 @@ final strictfp class PackageVerifier {
if (!namespace.equals(expectedNS)) {
throw new SchemaException(String.format("%s shall be associated to
namespace %s", className, expectedNS));
}
+ if (codeList != null) return; // If the class was a
code list, we are done.
for (final Method method : type.getDeclaredMethods()) {
final XmlElement element =
method.getDeclaredAnnotation(XmlElement.class);
if (element == null) {
