You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/10/23 18:11:04 UTC
svn commit: r1710261 [1/2] - in /sis/branches/JDK6: ./
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/
core/sis-metadata/src/main/java/org/apache/sis/internal/met...
Author: desruisseaux
Date: Fri Oct 23 16:11:03 2015
New Revision: 1710261
URL: http://svn.apache.org/viewvc?rev=1710261&view=rev
Log:
Merge XML work from the JDK7 branch.
Added:
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
- copied, changed from r1710256, sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/SensorType.java
sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
- copied unchanged from r1710256, sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/CharSequenceSubstitutionTest.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java
- copied unchanged from r1710256, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListUID.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java
- copied unchanged from r1710256, sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java
Removed:
sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/AnchorMarshallingTest.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListProxy.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListProxy.java
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/SV_CouplingType.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/package-info.java
sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/package-info.java
sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/CharSequenceAdapter.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/StringAdapter.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/URIAdapter.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/package-info.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/Country.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/LanguageCode.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/PT_FreeText.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/package-info.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListAdapter.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmx/MimeFileTypeAdapter.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractInternationalString.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/ResourceInternationalString.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/iso/package-info.java
sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 23 16:11:03 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK7:1394913-1709973
-/sis/branches/JDK8:1584960-1709972
+/sis/branches/JDK7:1394913-1710256
+/sis/branches/JDK8:1584960-1710252
/sis/trunk:1394364-1508466,1519089-1519674
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.DateType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class CI_DateTypeCode exten
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private CI_DateTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private CI_DateTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class CI_DateTypeCode exten
* @return The wrapper for the code list value.
*/
@Override
- protected CI_DateTypeCode wrap(CodeListProxy proxy) {
- return new CI_DateTypeCode(proxy);
+ protected CI_DateTypeCode wrap(final CodeListUID value) {
+ return new CI_DateTypeCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class CI_DateTypeCode exten
*/
@Override
@XmlElement(name = "CI_DateTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.OnLineFunction;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -32,9 +32,7 @@ import org.apache.sis.internal.jaxb.gmd.
* @version 0.3
* @module
*/
-public final class CI_OnLineFunctionCode
- extends CodeListAdapter<CI_OnLineFunctionCode, OnLineFunction>
-{
+public final class CI_OnLineFunctionCode extends CodeListAdapter<CI_OnLineFunctionCode, OnLineFunction> {
/**
* Empty constructor for JAXB only.
*/
@@ -42,10 +40,10 @@ public final class CI_OnLineFunctionCode
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private CI_OnLineFunctionCode(final CodeListProxy proxy) {
- super(proxy);
+ private CI_OnLineFunctionCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +52,8 @@ public final class CI_OnLineFunctionCode
* @return The wrapper for the code list value.
*/
@Override
- protected CI_OnLineFunctionCode wrap(CodeListProxy proxy) {
- return new CI_OnLineFunctionCode(proxy);
+ protected CI_OnLineFunctionCode wrap(final CodeListUID value) {
+ return new CI_OnLineFunctionCode(value);
}
/**
@@ -75,16 +73,16 @@ public final class CI_OnLineFunctionCode
*/
@Override
@XmlElement(name = "CI_OnLineFunctionCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.PresentationForm;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -32,9 +32,7 @@ import org.apache.sis.internal.jaxb.gmd.
* @version 0.3
* @module
*/
-public final class CI_PresentationFormCode
- extends CodeListAdapter<CI_PresentationFormCode, PresentationForm>
-{
+public final class CI_PresentationFormCode extends CodeListAdapter<CI_PresentationFormCode, PresentationForm> {
/**
* Empty constructor for JAXB only.
*/
@@ -42,10 +40,10 @@ public final class CI_PresentationFormCo
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private CI_PresentationFormCode(final CodeListProxy proxy) {
- super(proxy);
+ private CI_PresentationFormCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +52,8 @@ public final class CI_PresentationFormCo
* @return The wrapper for the code list value.
*/
@Override
- protected CI_PresentationFormCode wrap(CodeListProxy proxy) {
- return new CI_PresentationFormCode(proxy);
+ protected CI_PresentationFormCode wrap(final CodeListUID value) {
+ return new CI_PresentationFormCode(value);
}
/**
@@ -75,16 +73,16 @@ public final class CI_PresentationFormCo
*/
@Override
@XmlElement(name = "CI_PresentationFormCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.citation.Role;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class CI_RoleCode extends C
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private CI_RoleCode(final CodeListProxy proxy) {
- super(proxy);
+ private CI_RoleCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class CI_RoleCode extends C
* @return The wrapper for the code list value.
*/
@Override
- protected CI_RoleCode wrap(CodeListProxy proxy) {
- return new CI_RoleCode(proxy);
+ protected CI_RoleCode wrap(final CodeListUID value) {
+ return new CI_RoleCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class CI_RoleCode extends C
*/
@Override
@XmlElement(name = "CI_RoleCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DCPList.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.DistributedComputingPlatform;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -41,10 +41,10 @@ public final class DCPList extends CodeL
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private DCPList(final CodeListProxy proxy) {
- super(proxy);
+ private DCPList(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class DCPList extends CodeL
* @return The wrapper for the code list value.
*/
@Override
- protected DCPList wrap(CodeListProxy proxy) {
- return new DCPList(proxy);
+ protected DCPList wrap(final CodeListUID value) {
+ return new DCPList(value);
}
/**
@@ -74,16 +74,16 @@ public final class DCPList extends CodeL
*/
@Override
@XmlElement(name = "DCPList", namespace = Namespaces.SRV)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.quality.EvaluationMethodType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -42,10 +42,10 @@ public final class DQ_EvaluationMethodTy
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private DQ_EvaluationMethodTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private DQ_EvaluationMethodTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +54,8 @@ public final class DQ_EvaluationMethodTy
* @return The wrapper for the code list value.
*/
@Override
- protected DQ_EvaluationMethodTypeCode wrap(CodeListProxy proxy) {
- return new DQ_EvaluationMethodTypeCode(proxy);
+ protected DQ_EvaluationMethodTypeCode wrap(final CodeListUID value) {
+ return new DQ_EvaluationMethodTypeCode(value);
}
/**
@@ -75,16 +75,16 @@ public final class DQ_EvaluationMethodTy
*/
@Override
@XmlElement(name = "DQ_EvaluationMethodTypeCode")
- public CodeListProxy getElement() {
- return this.proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.AssociationType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class DS_AssociationTypeCod
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private DS_AssociationTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private DS_AssociationTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class DS_AssociationTypeCod
* @return The wrapper for the code list value.
*/
@Override
- protected DS_AssociationTypeCode wrap(CodeListProxy proxy) {
- return new DS_AssociationTypeCode(proxy);
+ protected DS_AssociationTypeCode wrap(final CodeListUID value) {
+ return new DS_AssociationTypeCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class DS_AssociationTypeCod
*/
@Override
@XmlElement(name = "DS_AssociationTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.InitiativeType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class DS_InitiativeTypeCode
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private DS_InitiativeTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private DS_InitiativeTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class DS_InitiativeTypeCode
* @return The wrapper for the code list value.
*/
@Override
- protected DS_InitiativeTypeCode wrap(CodeListProxy proxy) {
- return new DS_InitiativeTypeCode(proxy);
+ protected DS_InitiativeTypeCode wrap(final CodeListUID value) {
+ return new DS_InitiativeTypeCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class DS_InitiativeTypeCode
*/
@Override
@XmlElement(name = "DS_InitiativeTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/LegacyCharacterSet.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.CharacterSet;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -41,10 +41,10 @@ public final class LegacyCharacterSet ex
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private LegacyCharacterSet(final CodeListProxy proxy) {
- super(proxy);
+ private LegacyCharacterSet(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class LegacyCharacterSet ex
* @return The wrapper for the code list value.
*/
@Override
- protected LegacyCharacterSet wrap(CodeListProxy proxy) {
- return new LegacyCharacterSet(proxy);
+ protected LegacyCharacterSet wrap(final CodeListUID value) {
+ return new LegacyCharacterSet(value);
}
/**
@@ -74,16 +74,16 @@ public final class LegacyCharacterSet ex
*/
@Override
@XmlElement(name = "MD_CharacterSetCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.CellGeometry;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_CellGeometryCode e
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_CellGeometryCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_CellGeometryCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_CellGeometryCode e
* @return The wrapper for the code list value.
*/
@Override
- protected MD_CellGeometryCode wrap(CodeListProxy proxy) {
- return new MD_CellGeometryCode(proxy);
+ protected MD_CellGeometryCode wrap(final CodeListUID value) {
+ return new MD_CellGeometryCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_CellGeometryCode e
*/
@Override
@XmlElement(name = "MD_CellGeometryCode")
- public CodeListProxy getElement() {
- return this.proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlElem
import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.sis.xml.ValueConverter;
import org.apache.sis.internal.jaxb.Context;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -39,9 +39,9 @@ import org.apache.sis.internal.jaxb.gmd.
*/
public final class MD_CharacterSetCode extends XmlAdapter<MD_CharacterSetCode, Charset> {
/**
- * A proxy form of the {@link CodeList}.
+ * The value of the {@link CodeList}.
*/
- private CodeListProxy proxy;
+ private CodeListUID identifier;
/**
* Substitutes the adapter value read from an XML stream by the object which will
@@ -53,7 +53,7 @@ public final class MD_CharacterSetCode e
@Override
public final Charset unmarshal(final MD_CharacterSetCode adapter) throws IllegalCharsetNameException {
final Context context = Context.current();
- return Context.converter(context).toCharset(context, adapter.proxy.identifier());
+ return Context.converter(context).toCharset(context, adapter.identifier.toString());
}
/**
@@ -71,7 +71,7 @@ public final class MD_CharacterSetCode e
if (code != null) {
final Locale locale = context.getLocale();
final MD_CharacterSetCode c = new MD_CharacterSetCode();
- c.proxy = new CodeListProxy(context, "MD_CharacterSetCode", code,
+ c.identifier = new CodeListUID(context, "MD_CharacterSetCode", code,
(locale != null) ? converter.toLanguageCode(context, locale) : null,
(locale != null) ? value.displayName(locale) : value.displayName());
return c;
@@ -85,16 +85,16 @@ public final class MD_CharacterSetCode e
* @return The value to be marshalled.
*/
@XmlElement(name = "MD_CharacterSetCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.constraint.Classification;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_ClassificationCode
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_ClassificationCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_ClassificationCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_ClassificationCode
* @return The wrapper for the code list value.
*/
@Override
- protected MD_ClassificationCode wrap(CodeListProxy proxy) {
- return new MD_ClassificationCode(proxy);
+ protected MD_ClassificationCode wrap(final CodeListUID value) {
+ return new MD_ClassificationCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_ClassificationCode
*/
@Override
@XmlElement(name = "MD_ClassificationCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.CoverageContentType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -42,10 +42,10 @@ public final class MD_CoverageContentTyp
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_CoverageContentTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_CoverageContentTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +54,8 @@ public final class MD_CoverageContentTyp
* @return The wrapper for the code list value.
*/
@Override
- protected MD_CoverageContentTypeCode wrap(CodeListProxy proxy) {
- return new MD_CoverageContentTypeCode(proxy);
+ protected MD_CoverageContentTypeCode wrap(final CodeListUID value) {
+ return new MD_CoverageContentTypeCode(value);
}
/**
@@ -75,16 +75,16 @@ public final class MD_CoverageContentTyp
*/
@Override
@XmlElement(name = "MD_CoverageContentTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.Datatype;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_DatatypeCode exten
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_DatatypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_DatatypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_DatatypeCode exten
* @return The wrapper for the code list value.
*/
@Override
- protected MD_DatatypeCode wrap(CodeListProxy proxy) {
- return new MD_DatatypeCode(proxy);
+ protected MD_DatatypeCode wrap(final CodeListUID value) {
+ return new MD_DatatypeCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_DatatypeCode exten
*/
@Override
@XmlElement(name = "MD_DatatypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.DimensionNameType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -42,10 +42,10 @@ public final class MD_DimensionNameTypeC
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_DimensionNameTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_DimensionNameTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +54,8 @@ public final class MD_DimensionNameTypeC
* @return The wrapper for the code list value.
*/
@Override
- protected MD_DimensionNameTypeCode wrap(CodeListProxy proxy) {
- return new MD_DimensionNameTypeCode(proxy);
+ protected MD_DimensionNameTypeCode wrap(final CodeListUID value) {
+ return new MD_DimensionNameTypeCode(value);
}
/**
@@ -75,16 +75,16 @@ public final class MD_DimensionNameTypeC
*/
@Override
@XmlElement(name = "MD_DimensionNameTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.GeometricObjectType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -42,10 +42,10 @@ public final class MD_GeometricObjectTyp
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_GeometricObjectTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_GeometricObjectTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +54,8 @@ public final class MD_GeometricObjectTyp
* @return The wrapper for the code list value.
*/
@Override
- protected MD_GeometricObjectTypeCode wrap(CodeListProxy proxy) {
- return new MD_GeometricObjectTypeCode(proxy);
+ protected MD_GeometricObjectTypeCode wrap(final CodeListUID value) {
+ return new MD_GeometricObjectTypeCode(value);
}
/**
@@ -75,16 +75,16 @@ public final class MD_GeometricObjectTyp
*/
@Override
@XmlElement(name = "MD_GeometricObjectTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.ImagingCondition;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -42,10 +42,10 @@ public final class MD_ImagingConditionCo
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_ImagingConditionCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_ImagingConditionCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +54,8 @@ public final class MD_ImagingConditionCo
* @return The wrapper for the code list value.
*/
@Override
- protected MD_ImagingConditionCode wrap(CodeListProxy proxy) {
- return new MD_ImagingConditionCode(proxy);
+ protected MD_ImagingConditionCode wrap(final CodeListUID value) {
+ return new MD_ImagingConditionCode(value);
}
/**
@@ -75,16 +75,16 @@ public final class MD_ImagingConditionCo
*/
@Override
@XmlElement(name = "MD_ImagingConditionCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.KeywordType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_KeywordTypeCode ex
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_KeywordTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_KeywordTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_KeywordTypeCode ex
* @return The wrapper for the code list value.
*/
@Override
- protected MD_KeywordTypeCode wrap(CodeListProxy proxy) {
- return new MD_KeywordTypeCode(proxy);
+ protected MD_KeywordTypeCode wrap(final CodeListUID value) {
+ return new MD_KeywordTypeCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_KeywordTypeCode ex
*/
@Override
@XmlElement(name = "MD_KeywordTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.maintenance.MaintenanceFrequency;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -42,10 +42,10 @@ public final class MD_MaintenanceFrequen
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_MaintenanceFrequencyCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_MaintenanceFrequencyCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +54,8 @@ public final class MD_MaintenanceFrequen
* @return The wrapper for the code list value.
*/
@Override
- protected MD_MaintenanceFrequencyCode wrap(CodeListProxy proxy) {
- return new MD_MaintenanceFrequencyCode(proxy);
+ protected MD_MaintenanceFrequencyCode wrap(final CodeListUID value) {
+ return new MD_MaintenanceFrequencyCode(value);
}
/**
@@ -75,16 +75,16 @@ public final class MD_MaintenanceFrequen
*/
@Override
@XmlElement(name = "MD_MaintenanceFrequencyCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.distribution.MediumFormat;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_MediumFormatCode e
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_MediumFormatCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_MediumFormatCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_MediumFormatCode e
* @return The wrapper for the code list value.
*/
@Override
- protected MD_MediumFormatCode wrap(CodeListProxy proxy) {
- return new MD_MediumFormatCode(proxy);
+ protected MD_MediumFormatCode wrap(final CodeListUID value) {
+ return new MD_MediumFormatCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_MediumFormatCode e
*/
@Override
@XmlElement(name = "MD_MediumFormatCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.distribution.MediumName;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_MediumNameCode ext
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_MediumNameCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_MediumNameCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_MediumNameCode ext
* @return The wrapper for the code list value.
*/
@Override
- protected MD_MediumNameCode wrap(CodeListProxy proxy) {
- return new MD_MediumNameCode(proxy);
+ protected MD_MediumNameCode wrap(final CodeListUID value) {
+ return new MD_MediumNameCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_MediumNameCode ext
*/
@Override
@XmlElement(name = "MD_MediumNameCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.identification.Progress;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_ProgressCode exten
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_ProgressCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_ProgressCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_ProgressCode exten
* @return The wrapper for the code list value.
*/
@Override
- protected MD_ProgressCode wrap(CodeListProxy proxy) {
- return new MD_ProgressCode(proxy);
+ protected MD_ProgressCode wrap(final CodeListUID value) {
+ return new MD_ProgressCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_ProgressCode exten
*/
@Override
@XmlElement(name = "MD_ProgressCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.constraint.Restriction;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,28 +40,28 @@ public final class MD_RestrictionCode ex
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_RestrictionCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_RestrictionCode(final CodeListUID value) {
+ super(value);
}
/**
* Fix the spelling of words that changed between ISO 19115:2003 and ISO 19115:2014,
- * then wraps the proxy value into an adapter.
+ * then wraps the value into an adapter.
*
* <p>The spelling of "license" was changed to "licence" in latest standard, but XML
* marshalling shall use the previous spelling until XML schema are updated.</p>
*
- * @param proxy The proxy version of {@link CodeList}, to be marshalled.
+ * @param value The value version of {@link CodeList}, to be marshalled.
* @return The wrapper for the code list value.
*/
@Override
- protected MD_RestrictionCode wrap(CodeListProxy proxy) {
- if ("licence".equals(proxy.codeListValue)) {
- proxy.codeListValue = "license";
+ protected MD_RestrictionCode wrap(final CodeListUID value) {
+ if ("licence".equals(value.codeListValue)) {
+ value.codeListValue = "license";
}
- return new MD_RestrictionCode(proxy);
+ return new MD_RestrictionCode(value);
}
/**
@@ -81,16 +81,16 @@ public final class MD_RestrictionCode ex
*/
@Override
@XmlElement(name = "MD_RestrictionCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.maintenance.ScopeCode;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_ScopeCode extends
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_ScopeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_ScopeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_ScopeCode extends
* @return The wrapper for the code list value.
*/
@Override
- protected MD_ScopeCode wrap(CodeListProxy proxy) {
- return new MD_ScopeCode(proxy);
+ protected MD_ScopeCode wrap(final CodeListUID value) {
+ return new MD_ScopeCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_ScopeCode extends
*/
@Override
@XmlElement(name = "MD_ScopeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.SpatialRepresentationType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -42,10 +42,10 @@ public final class MD_SpatialRepresentat
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_SpatialRepresentationTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_SpatialRepresentationTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -54,8 +54,8 @@ public final class MD_SpatialRepresentat
* @return The wrapper for the code list value.
*/
@Override
- protected MD_SpatialRepresentationTypeCode wrap(CodeListProxy proxy) {
- return new MD_SpatialRepresentationTypeCode(proxy);
+ protected MD_SpatialRepresentationTypeCode wrap(final CodeListUID value) {
+ return new MD_SpatialRepresentationTypeCode(value);
}
/**
@@ -75,16 +75,16 @@ public final class MD_SpatialRepresentat
*/
@Override
@XmlElement(name = "MD_SpatialRepresentationTypeCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.spatial.TopologyLevel;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
/**
@@ -40,10 +40,10 @@ public final class MD_TopologyLevelCode
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MD_TopologyLevelCode(final CodeListProxy proxy) {
- super(proxy);
+ private MD_TopologyLevelCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -52,8 +52,8 @@ public final class MD_TopologyLevelCode
* @return The wrapper for the code list value.
*/
@Override
- protected MD_TopologyLevelCode wrap(CodeListProxy proxy) {
- return new MD_TopologyLevelCode(proxy);
+ protected MD_TopologyLevelCode wrap(final CodeListUID value) {
+ return new MD_TopologyLevelCode(value);
}
/**
@@ -73,16 +73,16 @@ public final class MD_TopologyLevelCode
*/
@Override
@XmlElement(name = "MD_TopologyLevelCode")
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.BandDefinition;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -41,10 +41,10 @@ public final class MI_BandDefinition ext
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MI_BandDefinition(final CodeListProxy proxy) {
- super(proxy);
+ private MI_BandDefinition(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class MI_BandDefinition ext
* @return The wrapper for the code list value.
*/
@Override
- protected MI_BandDefinition wrap(CodeListProxy proxy) {
- return new MI_BandDefinition(proxy);
+ protected MI_BandDefinition wrap(final CodeListUID value) {
+ return new MI_BandDefinition(value);
}
/**
@@ -74,16 +74,16 @@ public final class MI_BandDefinition ext
*/
@Override
@XmlElement(name = "MI_BandDefinition", namespace = Namespaces.GMI)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.Context;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -41,10 +41,10 @@ public final class MI_ContextCode extend
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MI_ContextCode(final CodeListProxy proxy) {
- super(proxy);
+ private MI_ContextCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class MI_ContextCode extend
* @return The wrapper for the code list value.
*/
@Override
- protected MI_ContextCode wrap(CodeListProxy proxy) {
- return new MI_ContextCode(proxy);
+ protected MI_ContextCode wrap(CodeListUID value) {
+ return new MI_ContextCode(value);
}
/**
@@ -74,16 +74,16 @@ public final class MI_ContextCode extend
*/
@Override
@XmlElement(name = "MI_ContextCode", namespace = Namespaces.GMI)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.GeometryType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -41,10 +41,10 @@ public final class MI_GeometryTypeCode e
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MI_GeometryTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MI_GeometryTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class MI_GeometryTypeCode e
* @return The wrapper for the code list value.
*/
@Override
- protected MI_GeometryTypeCode wrap(CodeListProxy proxy) {
- return new MI_GeometryTypeCode(proxy);
+ protected MI_GeometryTypeCode wrap(final CodeListUID value) {
+ return new MI_GeometryTypeCode(value);
}
/**
@@ -74,16 +74,16 @@ public final class MI_GeometryTypeCode e
*/
@Override
@XmlElement(name = "MI_GeometryTypeCode", namespace = Namespaces.GMI)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.ObjectiveType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -41,10 +41,10 @@ public final class MI_ObjectiveTypeCode
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MI_ObjectiveTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MI_ObjectiveTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class MI_ObjectiveTypeCode
* @return The wrapper for the code list value.
*/
@Override
- protected MI_ObjectiveTypeCode wrap(CodeListProxy proxy) {
- return new MI_ObjectiveTypeCode(proxy);
+ protected MI_ObjectiveTypeCode wrap(final CodeListUID value) {
+ return new MI_ObjectiveTypeCode(value);
}
/**
@@ -74,16 +74,16 @@ public final class MI_ObjectiveTypeCode
*/
@Override
@XmlElement(name = "MI_ObjectiveTypeCode", namespace = Namespaces.GMI)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.OperationType;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -41,10 +41,10 @@ public final class MI_OperationTypeCode
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MI_OperationTypeCode(final CodeListProxy proxy) {
- super(proxy);
+ private MI_OperationTypeCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class MI_OperationTypeCode
* @return The wrapper for the code list value.
*/
@Override
- protected MI_OperationTypeCode wrap(CodeListProxy proxy) {
- return new MI_OperationTypeCode(proxy);
+ protected MI_OperationTypeCode wrap(final CodeListUID value) {
+ return new MI_OperationTypeCode(value);
}
/**
@@ -74,16 +74,16 @@ public final class MI_OperationTypeCode
*/
@Override
@XmlElement(name = "MI_OperationTypeCode", namespace = Namespaces.GMI)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.content.PolarizationOrientation;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -44,10 +44,10 @@ public final class MI_PolarizationOrient
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MI_PolarizationOrientationCode(final CodeListProxy proxy) {
- super(proxy);
+ private MI_PolarizationOrientationCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -56,8 +56,8 @@ public final class MI_PolarizationOrient
* @return The wrapper for the code list value.
*/
@Override
- protected MI_PolarizationOrientationCode wrap(CodeListProxy proxy) {
- return new MI_PolarizationOrientationCode(proxy);
+ protected MI_PolarizationOrientationCode wrap(final CodeListUID value) {
+ return new MI_PolarizationOrientationCode(value);
}
/**
@@ -77,16 +77,16 @@ public final class MI_PolarizationOrient
*/
@Override
@XmlElement(name = "MI_PolarizationOrientationCode", namespace = Namespaces.GMI)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java?rev=1710261&r1=1710260&r2=1710261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] Fri Oct 23 16:11:03 2015
@@ -19,7 +19,7 @@ package org.apache.sis.internal.jaxb.cod
import javax.xml.bind.annotation.XmlElement;
import org.opengis.metadata.acquisition.Priority;
import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
+import org.apache.sis.internal.jaxb.gmd.CodeListUID;
import org.apache.sis.xml.Namespaces;
@@ -41,10 +41,10 @@ public final class MI_PriorityCode exten
}
/**
- * Creates a new adapter for the given proxy.
+ * Creates a new adapter for the given value.
*/
- private MI_PriorityCode(final CodeListProxy proxy) {
- super(proxy);
+ private MI_PriorityCode(final CodeListUID value) {
+ super(value);
}
/**
@@ -53,8 +53,8 @@ public final class MI_PriorityCode exten
* @return The wrapper for the code list value.
*/
@Override
- protected MI_PriorityCode wrap(CodeListProxy proxy) {
- return new MI_PriorityCode(proxy);
+ protected MI_PriorityCode wrap(final CodeListUID value) {
+ return new MI_PriorityCode(value);
}
/**
@@ -74,16 +74,16 @@ public final class MI_PriorityCode exten
*/
@Override
@XmlElement(name = "MI_PriorityCode", namespace = Namespaces.GMI)
- public CodeListProxy getElement() {
- return proxy;
+ public CodeListUID getElement() {
+ return identifier;
}
/**
* Invoked by JAXB on unmarshalling.
*
- * @param proxy The unmarshalled value.
+ * @param value The unmarshalled value.
*/
- public void setElement(final CodeListProxy proxy) {
- this.proxy = proxy;
+ public void setElement(final CodeListUID value) {
+ identifier = value;
}
}