sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1550306 [1/2] - in /sis/branches/JDK7/core: sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/ sis-ref...
Date Wed, 11 Dec 2013 23:08:33 GMT
Author: desruisseaux
Date: Wed Dec 11 23:08:32 2013
New Revision: 1550306

URL: http://svn.apache.org/r1550306
Log:
Slight modification of the policy about xlink:href. By default, write XLink attributes even if the metadata object is not nil.
The XLink is then for informative purpose. This change is made on the assumption that this behavior will be less surprising
for the users than omission of the metadata object from the XML output.

Modified:
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Event.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GeolocationInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Instrument.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Objective.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Operation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Platform.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RangeElementDescription.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RequestedDate.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Requirement.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/mock/ReferenceResolverMock.java

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -83,13 +83,8 @@ public final class TM_Primitive extends 
      */
     @XmlElement(name = "TimePeriod")
     public TimePeriod getTimePeriod() {
-        if (!skip()) {
-            final TemporalPrimitive metadata = this.metadata;
-            if (metadata instanceof Period) {
-                return new TimePeriod((Period) metadata);
-            }
-        }
-        return null;
+        final TemporalPrimitive metadata = this.metadata;
+        return (metadata instanceof Period) ? new TimePeriod((Period) metadata) : null;
     }
 
     /**
@@ -100,13 +95,8 @@ public final class TM_Primitive extends 
      */
     @XmlElement(name = "TimeInstant")
     public TimeInstant getTimeInstant() {
-        if (!skip()) {
-            final TemporalPrimitive metadata = this.metadata;
-            if (metadata instanceof Instant) {
-                return new TimeInstant((Instant) metadata);
-            }
-        }
-        return null;
+        final TemporalPrimitive metadata = this.metadata;
+        return (metadata instanceof Instant) ? new TimeInstant((Instant) metadata) : null;
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -87,14 +87,14 @@ public final class TM_PeriodDuration ext
      */
     @XmlElement(name = "TM_PeriodDuration")
     public Duration getElement() {
-        if (!skip()) try {
+        final PeriodDuration metadata = this.metadata;
+        if (metadata != null) try {
             /*
              * Get the DatatypeFactory first because if not available, then we don't need to parse
              * the calendar fields. This has the side effect of not validating the calendar fields
              * syntax (which should be integer values), but maybe this is what the user wants.
              */
             final DatatypeFactory factory = XmlUtilities.getDatatypeFactory();
-            final PeriodDuration metadata = this.metadata;
             InternationalString value;
             BigInteger years = null;
             if ((value = metadata.getYears()) != null) {

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class CI_Address extends Pr
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Address.class}
      */
     @Override
     protected Class<Address> getBoundType() {
@@ -77,7 +79,7 @@ public final class CI_Address extends Pr
      */
     @XmlElementRef
     public DefaultAddress getElement() {
-        return skip() ? null : DefaultAddress.castOrCopy(metadata);
+        return DefaultAddress.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class CI_Citation extends P
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Citation.class}
      */
     @Override
     protected Class<Citation> getBoundType() {
@@ -77,7 +79,7 @@ public final class CI_Citation extends P
      */
     @XmlElementRef
     public DefaultCitation getElement() {
-        return skip() ? null : DefaultCitation.castOrCopy(metadata);
+        return DefaultCitation.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class CI_Contact extends Pr
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Contact.class}
      */
     @Override
     protected Class<Contact> getBoundType() {
@@ -77,7 +79,7 @@ public final class CI_Contact extends Pr
      */
     @XmlElementRef
     public DefaultContact getElement() {
-        return skip() ? null : DefaultContact.castOrCopy(metadata);
+        return DefaultContact.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class CI_Date extends Prope
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code CitationDate.class}
      */
     @Override
     protected Class<CitationDate> getBoundType() {
@@ -77,7 +79,7 @@ public final class CI_Date extends Prope
      */
     @XmlElementRef
     public DefaultCitationDate getElement() {
-        return skip() ? null : DefaultCitationDate.castOrCopy(metadata);
+        return DefaultCitationDate.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class CI_OnlineResource ext
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code OnlineResource.class}
      */
     @Override
     protected Class<OnlineResource> getBoundType() {
@@ -77,7 +79,7 @@ public final class CI_OnlineResource ext
      */
     @XmlElementRef
     public DefaultOnlineResource getElement() {
-        return skip() ? null : DefaultOnlineResource.castOrCopy(metadata);
+        return DefaultOnlineResource.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class CI_ResponsibleParty e
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code ResponsibleParty.class}
      */
     @Override
     protected Class<ResponsibleParty> getBoundType() {
@@ -79,7 +81,7 @@ public final class CI_ResponsibleParty e
      */
     @XmlElementRef
     public DefaultResponsibleParty getElement() {
-        return skip() ? null : DefaultResponsibleParty.castOrCopy(metadata);
+        return DefaultResponsibleParty.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class CI_Series extends Pro
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Series.class}
      */
     @Override
     protected Class<Series> getBoundType() {
@@ -77,7 +79,7 @@ public final class CI_Series extends Pro
      */
     @XmlElementRef
     public DefaultSeries getElement() {
-        return skip() ? null : DefaultSeries.castOrCopy(metadata);
+        return DefaultSeries.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class CI_Telephone extends 
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Telephone.class}
      */
     @Override
     protected Class<Telephone> getBoundType() {
@@ -77,7 +79,7 @@ public final class CI_Telephone extends 
      */
     @XmlElementRef
     public DefaultTelephone getElement() {
-        return skip() ? null : DefaultTelephone.castOrCopy(metadata);
+        return DefaultTelephone.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class DQ_DataQuality extend
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code DataQuality.class}
      */
     @Override
     protected Class<DataQuality> getBoundType() {
@@ -77,7 +79,7 @@ public final class DQ_DataQuality extend
      */
     @XmlElementRef
     public DefaultDataQuality getElement() {
-        return skip() ? null : DefaultDataQuality.castOrCopy(metadata);
+        return DefaultDataQuality.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class DQ_Element extends Pr
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Element.class}
      */
     @Override
     protected Class<Element> getBoundType() {
@@ -77,7 +79,7 @@ public final class DQ_Element extends Pr
      */
     @XmlElementRef
     public AbstractElement getElement() {
-        return skip() ? null : AbstractElement.castOrCopy(metadata);
+        return AbstractElement.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class DQ_Result extends Pro
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Result.class}
      */
     @Override
     protected Class<Result> getBoundType() {
@@ -77,7 +79,7 @@ public final class DQ_Result extends Pro
      */
     @XmlElementRef
     public AbstractResult getElement() {
-        return skip() ? null : AbstractResult.castOrCopy(metadata);
+        return AbstractResult.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class DQ_Scope extends Prop
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Scope.class}
      */
     @Override
     protected Class<Scope> getBoundType() {
@@ -77,7 +79,7 @@ public final class DQ_Scope extends Prop
      */
     @XmlElementRef
     public DefaultScope getElement() {
-        return skip() ? null : DefaultScope.castOrCopy(metadata);
+        return DefaultScope.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class EX_Extent extends Pro
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Extent.class}
      */
     @Override
     protected Class<Extent> getBoundType() {
@@ -77,7 +79,7 @@ public final class EX_Extent extends Pro
      */
     @XmlElementRef
     public DefaultExtent getElement() {
-        return skip() ? null : DefaultExtent.castOrCopy(metadata);
+        return DefaultExtent.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class EX_GeographicBounding
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code GeographicBoundingBox.class}
      */
     @Override
     protected Class<GeographicBoundingBox> getBoundType() {
@@ -79,7 +81,7 @@ public final class EX_GeographicBounding
      */
     @XmlElementRef
     public DefaultGeographicBoundingBox getElement() {
-        return skip() ? null : DefaultGeographicBoundingBox.castOrCopy(metadata);
+        return DefaultGeographicBoundingBox.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class EX_GeographicExtent e
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code GeographicExtent.class}
      */
     @Override
     protected Class<GeographicExtent> getBoundType() {
@@ -77,7 +79,7 @@ public final class EX_GeographicExtent e
      */
     @XmlElementRef
     public AbstractGeographicExtent getElement() {
-        return skip() ? null : AbstractGeographicExtent.castOrCopy(metadata);
+        return AbstractGeographicExtent.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class EX_TemporalExtent ext
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code TemporalExtent.class}
      */
     @Override
     protected Class<TemporalExtent> getBoundType() {
@@ -77,7 +79,7 @@ public final class EX_TemporalExtent ext
      */
     @XmlElementRef
     public DefaultTemporalExtent getElement() {
-        return skip() ? null : DefaultTemporalExtent.castOrCopy(metadata);
+        return DefaultTemporalExtent.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class EX_VerticalExtent ext
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code VerticalExtent.class}
      */
     @Override
     protected Class<VerticalExtent> getBoundType() {
@@ -77,7 +79,7 @@ public final class EX_VerticalExtent ext
      */
     @XmlElementRef
     public DefaultVerticalExtent getElement() {
-        return skip() ? null : DefaultVerticalExtent.castOrCopy(metadata);
+        return DefaultVerticalExtent.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -44,6 +44,8 @@ public final class LE_Algorithm extends 
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Algorithm.class}
      */
     @Override
     protected Class<Algorithm> getBoundType() {
@@ -78,7 +80,7 @@ public final class LE_Algorithm extends 
      */
     @XmlElementRef
     public DefaultAlgorithm getElement() {
-        return skip() ? null : DefaultAlgorithm.castOrCopy(metadata);
+        return DefaultAlgorithm.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class LE_NominalResolution 
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code NominalResolution.class}
      */
     @Override
     protected Class<NominalResolution> getBoundType() {
@@ -77,7 +79,7 @@ public final class LE_NominalResolution 
      */
     @XmlElementRef
     public DefaultNominalResolution getElement() {
-        return skip() ? null : DefaultNominalResolution.castOrCopy(metadata);
+        return DefaultNominalResolution.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class LE_ProcessStepReport 
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code ProcessStepReport.class}
      */
     @Override
     protected Class<ProcessStepReport> getBoundType() {
@@ -77,7 +79,7 @@ public final class LE_ProcessStepReport 
      */
     @XmlElementRef
     public DefaultProcessStepReport getElement() {
-        return skip() ? null : DefaultProcessStepReport.castOrCopy(metadata);
+        return DefaultProcessStepReport.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class LE_Processing extends
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Processing.class}
      */
     @Override
     protected Class<Processing> getBoundType() {
@@ -77,7 +79,7 @@ public final class LE_Processing extends
      */
     @XmlElementRef
     public DefaultProcessing getElement() {
-        return skip() ? null : DefaultProcessing.castOrCopy(metadata);
+        return DefaultProcessing.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class LI_Lineage extends Pr
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Lineage.class}
      */
     @Override
     protected Class<Lineage> getBoundType() {
@@ -77,7 +79,7 @@ public final class LI_Lineage extends Pr
      */
     @XmlElementRef
     public DefaultLineage getElement() {
-        return skip() ? null : DefaultLineage.castOrCopy(metadata);
+        return DefaultLineage.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -44,6 +44,8 @@ public final class LI_ProcessStep extend
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code ProcessStep.class}
      */
     @Override
     protected Class<ProcessStep> getBoundType() {
@@ -78,7 +80,7 @@ public final class LI_ProcessStep extend
      */
     @XmlElementRef
     public DefaultProcessStep getElement() {
-        return skip() ? null : LE_ProcessStep.castOrCopy(metadata);
+        return LE_ProcessStep.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -44,6 +44,8 @@ public final class LI_Source extends Pro
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Source.class}
      */
     @Override
     protected Class<Source> getBoundType() {
@@ -78,7 +80,7 @@ public final class LI_Source extends Pro
      */
     @XmlElementRef
     public DefaultSource getElement() {
-        return skip() ? null : LE_Source.castOrCopy(metadata);
+        return LE_Source.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_AggregateInformati
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code AggregateInformation.class}
      */
     @Override
     protected Class<AggregateInformation> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_AggregateInformati
      */
     @XmlElementRef
     public DefaultAggregateInformation getElement() {
-        return skip() ? null : DefaultAggregateInformation.castOrCopy(metadata);
+        return DefaultAggregateInformation.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_ApplicationSchemaI
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code ApplicationSchemaInformation.class}
      */
     @Override
     protected Class<ApplicationSchemaInformation> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_ApplicationSchemaI
      */
     @XmlElementRef
     public DefaultApplicationSchemaInformation getElement() {
-        return skip() ? null : DefaultApplicationSchemaInformation.castOrCopy(metadata);
+        return DefaultApplicationSchemaInformation.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_BrowseGraphic exte
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code BrowseGraphic.class}
      */
     @Override
     protected Class<BrowseGraphic> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_BrowseGraphic exte
      */
     @XmlElementRef
     public DefaultBrowseGraphic getElement() {
-        return skip() ? null : DefaultBrowseGraphic.castOrCopy(metadata);
+        return DefaultBrowseGraphic.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Constraints extend
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Constraints.class}
      */
     @Override
     protected Class<Constraints> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Constraints extend
      */
     @XmlElementRef
     public DefaultConstraints getElement() {
-        return skip() ? null : DefaultConstraints.castOrCopy(metadata);
+        return DefaultConstraints.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -49,6 +49,8 @@ public final class MD_ContentInformation
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code ContentInformation.class}
      */
     @Override
     protected Class<ContentInformation> getBoundType() {
@@ -83,7 +85,6 @@ public final class MD_ContentInformation
      */
     @XmlElementRef
     public AbstractContentInformation getElement() {
-        if (skip()) return null;
         final ContentInformation metadata = this.metadata;
         if (metadata instanceof ImageDescription) {
             return MI_ImageDescription.castOrCopy((ImageDescription) metadata);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_DataIdentification
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code DataIdentification.class}
      */
     @Override
     protected Class<DataIdentification> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_DataIdentification
      */
     @XmlElementRef
     public DefaultDataIdentification getElement() {
-        return skip() ? null : DefaultDataIdentification.castOrCopy(metadata);
+        return DefaultDataIdentification.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_DigitalTransferOpt
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code DigitalTransferOptions.class}
      */
     @Override
     protected Class<DigitalTransferOptions> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_DigitalTransferOpt
      */
     @XmlElementRef
     public DefaultDigitalTransferOptions getElement() {
-        return skip() ? null : DefaultDigitalTransferOptions.castOrCopy(metadata);
+        return DefaultDigitalTransferOptions.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Dimension extends 
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Dimension.class}
      */
     @Override
     protected Class<Dimension> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Dimension extends 
      */
     @XmlElementRef
     public DefaultDimension getElement() {
-        return skip() ? null : DefaultDimension.castOrCopy(metadata);
+        return DefaultDimension.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Distribution exten
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Distribution.class}
      */
     @Override
     protected Class<Distribution> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Distribution exten
      */
     @XmlElementRef
     public DefaultDistribution getElement() {
-        return skip() ? null : DefaultDistribution.castOrCopy(metadata);
+        return DefaultDistribution.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Distributor extend
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Distributor.class}
      */
     @Override
     protected Class<Distributor> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Distributor extend
      */
     @XmlElementRef
     public DefaultDistributor getElement() {
-        return skip() ? null : DefaultDistributor.castOrCopy(metadata);
+        return DefaultDistributor.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_ExtendedElementInf
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code ExtendedElementInformation.class}
      */
     @Override
     protected Class<ExtendedElementInformation> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_ExtendedElementInf
      */
     @XmlElementRef
     public DefaultExtendedElementInformation getElement() {
-        return skip() ? null : DefaultExtendedElementInformation.castOrCopy(metadata);
+        return DefaultExtendedElementInformation.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_FeatureTypeList ex
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code FeatureTypeList.class}
      */
     @Override
     protected Class<FeatureTypeList> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_FeatureTypeList ex
      */
     @XmlElementRef
     public DefaultFeatureTypeList getElement() {
-        return skip() ? null : DefaultFeatureTypeList.castOrCopy(metadata);
+        return DefaultFeatureTypeList.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Format extends Pro
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Format.class}
      */
     @Override
     protected Class<Format> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Format extends Pro
      */
     @XmlElementRef
     public DefaultFormat getElement() {
-        return skip() ? null : DefaultFormat.castOrCopy(metadata);
+        return DefaultFormat.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_GeometricObjects e
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code GeometricObjects.class}
      */
     @Override
     protected Class<GeometricObjects> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_GeometricObjects e
      */
     @XmlElementRef
     public DefaultGeometricObjects getElement() {
-        return skip() ? null : DefaultGeometricObjects.castOrCopy(metadata);
+        return DefaultGeometricObjects.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Identification ext
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Identification.class}
      */
     @Override
     protected Class<Identification> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Identification ext
      */
     @XmlElementRef
     public AbstractIdentification getElement() {
-        return skip() ? null : AbstractIdentification.castOrCopy(metadata);
+        return AbstractIdentification.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -48,6 +48,8 @@ public final class MD_Identifier extends
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Identifier.class}
      */
     @Override
     protected Class<Identifier> getBoundType() {
@@ -82,7 +84,6 @@ public final class MD_Identifier extends
      */
     @XmlElementRef
     public DefaultIdentifier getElement() {
-        if (skip()) return null;
         final Identifier metadata = this.metadata;
         if (metadata instanceof ReferenceIdentifier) {
             return null;
@@ -108,11 +109,9 @@ public final class MD_Identifier extends
      */
     @XmlElement(name = "RS_Identifier")
     public ImmutableIdentifier getReferenceIdentifier() {
-        if (!skip()) {
-            final Identifier metadata = this.metadata;
-            if (metadata instanceof ReferenceIdentifier) {
-                return ImmutableIdentifier.castOrCopy((ReferenceIdentifier) metadata);
-            }
+        final Identifier metadata = this.metadata;
+        if (metadata instanceof ReferenceIdentifier) {
+            return ImmutableIdentifier.castOrCopy((ReferenceIdentifier) metadata);
         }
         return null;
     }

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Keywords extends P
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Keywords.class}
      */
     @Override
     protected Class<Keywords> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Keywords extends P
      */
     @XmlElementRef
     public DefaultKeywords getElement() {
-        return skip() ? null : DefaultKeywords.castOrCopy(metadata);
+        return DefaultKeywords.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_MaintenanceInforma
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code MaintenanceInformation.class}
      */
     @Override
     protected Class<MaintenanceInformation> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_MaintenanceInforma
      */
     @XmlElementRef
     public DefaultMaintenanceInformation getElement() {
-        return skip() ? null : DefaultMaintenanceInformation.castOrCopy(metadata);
+        return DefaultMaintenanceInformation.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Medium extends Pro
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Medium.class}
      */
     @Override
     protected Class<Medium> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Medium extends Pro
      */
     @XmlElementRef
     public DefaultMedium getElement() {
-        return skip() ? null : DefaultMedium.castOrCopy(metadata);
+        return DefaultMedium.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -42,6 +42,8 @@ public final class MD_Metadata extends P
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Metadata.class}
      */
     @Override
     protected Class<Metadata> getBoundType() {
@@ -76,7 +78,7 @@ public final class MD_Metadata extends P
      */
     @XmlElementRef
     public DefaultMetadata getElement() {
-        return skip() ? null : DefaultMetadata.castOrCopy(metadata);
+        return DefaultMetadata.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_MetadataExtensionI
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code MetadataExtensionInformation.class}
      */
     @Override
     protected Class<MetadataExtensionInformation> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_MetadataExtensionI
      */
     @XmlElementRef
     public DefaultMetadataExtensionInformation getElement() {
-        return skip() ? null : DefaultMetadataExtensionInformation.castOrCopy(metadata);
+        return DefaultMetadataExtensionInformation.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_PortrayalCatalogue
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code PortrayalCatalogueReference.class}
      */
     @Override
     protected Class<PortrayalCatalogueReference> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_PortrayalCatalogue
      */
     @XmlElementRef
     public DefaultPortrayalCatalogueReference getElement() {
-        return skip() ? null : DefaultPortrayalCatalogueReference.castOrCopy(metadata);
+        return DefaultPortrayalCatalogueReference.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_RangeDimension ext
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code RangeDimension.class}
      */
     @Override
     protected Class<RangeDimension> getBoundType() {
@@ -79,7 +81,6 @@ public final class MD_RangeDimension ext
      */
     @XmlElementRef
     public DefaultRangeDimension getElement() {
-        if (skip()) return null;
         final RangeDimension metadata = this.metadata;
         if (metadata instanceof Band) {
             return MI_Band.castOrCopy((Band) metadata);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_RepresentativeFrac
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code RepresentativeFraction.class}
      */
     @Override
     protected Class<RepresentativeFraction> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_RepresentativeFrac
      */
     @XmlElementRef
     public DefaultRepresentativeFraction getElement() {
-        return skip() ? null : DefaultRepresentativeFraction.castOrCopy(metadata);
+        return DefaultRepresentativeFraction.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Resolution extends
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Resolution.class}
      */
     @Override
     protected Class<Resolution> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Resolution extends
      */
     @XmlElementRef
     public DefaultResolution getElement() {
-        return skip() ? null : DefaultResolution.castOrCopy(metadata);
+        return DefaultResolution.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_ScopeDescription e
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code ScopeDescription.class}
      */
     @Override
     protected Class<ScopeDescription> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_ScopeDescription e
      */
     @XmlElementRef
     public DefaultScopeDescription getElement() {
-        return skip() ? null : DefaultScopeDescription.castOrCopy(metadata);
+        return DefaultScopeDescription.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -49,6 +49,8 @@ public final class MD_SpatialRepresentat
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code SpatialRepresentation.class}
      */
     @Override
     protected Class<SpatialRepresentation> getBoundType() {
@@ -83,7 +85,6 @@ public final class MD_SpatialRepresentat
      */
     @XmlElementRef
     public AbstractSpatialRepresentation getElement() {
-        if (skip()) return null;
         final SpatialRepresentation metadata = this.metadata;
         if (metadata instanceof Georectified) {
             return MI_Georectified.castOrCopy((Georectified) metadata);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MD_StandardOrderProce
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code StandardOrderProcess.class}
      */
     @Override
     protected Class<StandardOrderProcess> getBoundType() {
@@ -79,7 +81,7 @@ public final class MD_StandardOrderProce
      */
     @XmlElementRef
     public DefaultStandardOrderProcess getElement() {
-        return skip() ? null : DefaultStandardOrderProcess.castOrCopy(metadata);
+        return DefaultStandardOrderProcess.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -43,6 +43,8 @@ public final class MD_Usage extends Prop
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code Usage.class}
      */
     @Override
     protected Class<Usage> getBoundType() {
@@ -77,7 +79,7 @@ public final class MD_Usage extends Prop
      */
     @XmlElementRef
     public DefaultUsage getElement() {
-        return skip() ? null : DefaultUsage.castOrCopy(metadata);
+        return DefaultUsage.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MI_AcquisitionInforma
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code AcquisitionInformation.class}
      */
     @Override
     protected Class<AcquisitionInformation> getBoundType() {
@@ -79,7 +81,7 @@ public final class MI_AcquisitionInforma
      */
     @XmlElementRef
     public DefaultAcquisitionInformation getElement() {
-        return skip() ? null : DefaultAcquisitionInformation.castOrCopy(metadata);
+        return DefaultAcquisitionInformation.castOrCopy(metadata);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java?rev=1550306&r1=1550305&r2=1550306&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java [UTF-8] Wed Dec 11 23:08:32 2013
@@ -45,6 +45,8 @@ public final class MI_EnvironmentalRecor
      * Returns the GeoAPI interface which is bound by this adapter.
      * This method is indirectly invoked by the private constructor
      * below, so it shall not depend on the state of this object.
+     *
+     * @return {@code EnvironmentalRecord.class}
      */
     @Override
     protected Class<EnvironmentalRecord> getBoundType() {
@@ -79,7 +81,7 @@ public final class MI_EnvironmentalRecor
      */
     @XmlElementRef
     public DefaultEnvironmentalRecord getElement() {
-        return skip() ? null : DefaultEnvironmentalRecord.castOrCopy(metadata);
+        return DefaultEnvironmentalRecord.castOrCopy(metadata);
     }
 
     /**



Mime
View raw message