sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1550857 [1/3] - in /sis/trunk: ./ application/sis-console/src/test/java/org/apache/sis/console/ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-build-helper/src/site/apt/ core/sis-metadata/src/main/java/org/apa...
Date Sat, 14 Dec 2013 00:15:39 GMT
Author: desruisseaux
Date: Sat Dec 14 00:15:36 2013
New Revision: 1550857

URL: http://svn.apache.org/r1550857
Log:
Merge from the JDK6 branch.

Added:
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/
      - copied from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/UUIDMarshallingTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/XLinkMarshallingTest.java
    sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/metadata/
      - copied from r1550853, sis/branches/JDK6/core/sis-metadata/src/test/resources/org/apache/sis/metadata/
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/Code.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/
      - copied from r1550853, sis/branches/JDK6/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java
      - copied unchanged from r1550853, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/util/Emptiable.java
Removed:
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/CustomMetadataTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/ImageryMarshallingTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MetadataMarshallingTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/ObjectReferenceMarshallingTest.java
    sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_IdentifierCode.java
Modified:
    sis/trunk/   (props changed)
    sis/trunk/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeSCTest.java
    sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
    sis/trunk/core/sis-build-helper/src/site/apt/index.apt
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RepresentativeFraction.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Resolution.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ScopeDescription.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_SpatialRepresentation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_StandardOrderProcess.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Usage.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_AcquisitionInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_EnvironmentalRecord.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Event.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GCP.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_GeolocationInformation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Instrument.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Objective.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Operation.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Plan.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Platform.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_PlatformPass.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RangeElementDescription.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_RequestedDate.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MI_Requirement.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MX_DataFile.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_Identifier.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/RS_ReferenceSystem.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ExcludedSet.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/AbstractMetadata.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/Pruner.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/ValueExistencePolicy.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ImmutableIdentifier.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/citation/Citations.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/AllMetadataTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/citation/HardCodedCitations.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractDirectPosition.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/AbstractEnvelope.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/Envelope2D.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralDirectPosition.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_Ellipsoid.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_GeodeticDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_ImageDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_PrimeMeridian.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_TemporalDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CD_VerticalDatum.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_Identifier.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/RS_IdentifierSingleton.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/io/wkt/Formatter.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/AbstractIdentifiedObjectTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/referencing/datum/DefaultPrimeMeridianTest.java
    sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/LegacyNamespaces.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Boolean.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_CharacterString.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Decimal32.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Integer64.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_Real.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_RecordType.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/PropertyType.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleIdentifiedObject.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/URIParser.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/LenientComparable.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverters.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/Cache.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/Pooled.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/ReferenceResolver.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/XML.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/URIParserTest.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/ReferenceResolverMock.java
    sis/trunk/ide-project/NetBeans/nbproject/project.xml
    sis/trunk/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/xml/MimeTypeDetectorTest.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1548775-1550841
  Merged /sis/branches/JDK6:r1548777-1550853

Modified: sis/trunk/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeSCTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeSCTest.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeSCTest.java [UTF-8] (original)
+++ sis/trunk/application/sis-console/src/test/java/org/apache/sis/console/MimeTypeSCTest.java [UTF-8] Sat Dec 14 00:15:36 2013
@@ -17,7 +17,7 @@
 package org.apache.sis.console;
 
 import java.net.URL;
-import org.apache.sis.xml.MetadataMarshallingTest;
+import org.apache.sis.metadata.iso.extent.DefaultExtentTest;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -42,11 +42,11 @@ public final strictfp class MimeTypeSCTe
      */
     @Test
     public void testWithMetadataXML() throws Exception {
-        final URL url = MetadataMarshallingTest.class.getResource("Extent.xml");
+        final URL url = DefaultExtentTest.getResource("Extent.xml");
         assertNotNull("Extent.xml", url);
         final MimeTypeSC test = new MimeTypeSC(0, SubCommand.TEST, url.toString());
         test.run();
         final String output = test.outputBuffer.toString().trim();
-        assertTrue(output, output.endsWith("org/apache/sis/xml/Extent.xml: application/vnd.iso.19139+xml"));
+        assertTrue(output, output.endsWith("org/apache/sis/metadata/iso/extent/Extent.xml: application/vnd.iso.19139+xml"));
     }
 }

Modified: sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java [UTF-8] Sat Dec 14 00:15:36 2013
@@ -24,12 +24,13 @@ import com.sun.tools.doclets.formats.htm
 
 /**
  * The <code>@scmUrl</code> tag for inserting a URL to a file in the source code repository.
- * This tag shall contain a keyword, for example <code>{@scmUrl gmd-data}</code>.
+ * This tag shall contain a keyword, for example <code>{@scmUrl metadata}</code>.
  * Valid keywords are:
  *
  * <table class="sis>
- *   <tr><th>Keyword</th>   <th>path</th></tr>
- *   <tr><td>gmd-data</td>  <td>core/sis-metadata/src/test/resources/org/apache/sis/xml</td></tr>
+ *   <tr><th>Keyword</th>     <th>path</th></tr>
+ *   <tr><td>metadata</td>    <td>core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso</td></tr>
+ *   <tr><td>referencing</td> <td>core/sis-referencing/src/test/resources/org/apache/sis/referencing</td></tr>
  * </table>
  *
  * The URL never contain trailing <code>'/'</code> character.
@@ -78,8 +79,11 @@ public final class SourceRepositoryURL e
         final StringBuilder url = new StringBuilder("http://svn.apache.org/repos/asf/sis/trunk");
         final String keyword = tag.text();
         /* switch (keyword) */ {
-            if (keyword.equals("gmd-data")) {
-                url.append("/core/sis-metadata/src/test/resources/org/apache/sis/xml");
+            if (keyword.equals("metadata")) {
+                url.append("/core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso");
+            }
+            else if (keyword.equals("referencing")) {
+                url.append("/core/sis-referencing/src/test/resources/org/apache/sis/referencing");
             }
             else {
                 ConfigurationImpl.getInstance().root.printWarning(tag.position(), "Unknown keyword: " + keyword);

Modified: sis/trunk/core/sis-build-helper/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-build-helper/src/site/apt/index.apt?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-build-helper/src/site/apt/index.apt [UTF-8] (original)
+++ sis/trunk/core/sis-build-helper/src/site/apt/index.apt [UTF-8] Sat Dec 14 00:15:36 2013
@@ -51,7 +51,7 @@ Building Apache SIS
 |                      | <<<java>>>, <<<xml>>>, <<<sql>>>, <<<wkt>>>, <<<text>>>, <<<math>>> or <<<shell>>>.       |
 *----------------------+-------------------------------------------------------------------------------------------+
 | <<<\{@scmUrl\}>>>    | An inline taglet for a URL to the source code repository. The only word inside the taglet |
-|                      | shall be <<<gmd-data>>>.                                                                  |
+|                      | shall be <<<metadata>>> or <<<referencing>>>.                                             |
 *----------------------+-------------------------------------------------------------------------------------------+
 | <<<\{@section\}>>>   | An inline taglet for the title of a new section in the javadoc.                           |
 *----------------------+-------------------------------------------------------------------------------------------+

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TM_Primitive.java [UTF-8] Sat Dec 14 00:15:36 2013
@@ -23,7 +23,6 @@ import org.apache.sis.internal.geoapi.te
 import org.opengis.temporal.TemporalPrimitive;
 import org.apache.sis.internal.jaxb.Context;
 import org.apache.sis.internal.jaxb.XmlUtilities;
-import org.apache.sis.internal.jaxb.LegacyNamespaces;
 import org.apache.sis.internal.jaxb.gco.PropertyType;
 import org.apache.sis.internal.util.TemporalUtilities;
 import org.apache.sis.util.resources.Errors;
@@ -77,17 +76,6 @@ public final class TM_Primitive extends 
     }
 
     /**
-     * Returns {@code true} if the user asked to format a GML 3.2 document, or {@code false} for GML 3.1 or older.
-     * The only difference managed by this class is the namespace.
-     *
-     * <p>This method will be removed in a future SIS version if we find a better way to support evolution
-     * of GML schemas.</p>
-     */
-    private static boolean isGML32() {
-        return Context.isGMLVersion(Context.current(), LegacyNamespaces.VERSION_3_2);
-    }
-
-    /**
      * Returns the {@code TimePeriod} generated from the metadata value.
      * This method is systematically called at marshalling-time by JAXB.
      *
@@ -95,13 +83,8 @@ public final class TM_Primitive extends 
      */
     @XmlElement(name = "TimePeriod")
     public TimePeriod getTimePeriod() {
-        if (!skip() && isGML32()) {
-            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;
     }
 
     /**
@@ -112,13 +95,8 @@ public final class TM_Primitive extends 
      */
     @XmlElement(name = "TimeInstant")
     public TimeInstant getTimeInstant() {
-        if (!skip() && isGML32()) {
-            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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gts/TM_PeriodDuration.java [UTF-8] Sat Dec 14 00:15:36 2013
@@ -87,7 +87,7 @@ public final class TM_PeriodDuration ext
      */
     @XmlElement(name = "TM_PeriodDuration")
     public Duration getElement() {
-        if (!skip() && metadata instanceof org.apache.sis.internal.geoapi.temporal.PeriodDuration) try {
+        if (metadata instanceof org.apache.sis.internal.geoapi.temporal.PeriodDuration) 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

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Address.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Citation.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Contact.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Date.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_OnlineResource.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_ResponsibleParty.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Series.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/CI_Telephone.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_DataQuality.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Element.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Result.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/DQ_Scope.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_Extent.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicBoundingBox.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_GeographicExtent.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_TemporalExtent.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/EX_VerticalExtent.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Algorithm.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_NominalResolution.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_ProcessStepReport.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LE_Processing.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Lineage.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_ProcessStep.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/LI_Source.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_AggregateInformation.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ApplicationSchemaInformation.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_BrowseGraphic.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Constraints.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ContentInformation.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DataIdentification.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_DigitalTransferOptions.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Dimension.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distribution.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Distributor.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_ExtendedElementInformation.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_FeatureTypeList.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Format.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_GeometricObjects.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identification.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Identifier.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Keywords.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MaintenanceInformation.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Medium.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_Metadata.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_MetadataExtensionInformation.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_PortrayalCatalogueReference.java [UTF-8] Sat Dec 14 00:15:36 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/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java?rev=1550857&r1=1550856&r2=1550857&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/MD_RangeDimension.java [UTF-8] Sat Dec 14 00:15:36 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);



Mime
View raw message