sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1510395 [1/2] - in /sis/trunk: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/ core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/ core/s...
Date Mon, 05 Aug 2013 08:56:15 GMT
Author: desruisseaux
Date: Mon Aug  5 08:56:14 2013
New Revision: 1510395

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

Added:
    sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/Extent.xml
      - copied unchanged from r1510391, sis/branches/JDK6/core/sis-metadata/src/test/resources/org/apache/sis/xml/Extent.xml
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk7/StandardOpenOption.java
      - copied unchanged from r1510391, sis/branches/JDK6/core/sis-utility/src/main/java/org/apache/sis/internal/jdk7/StandardOpenOption.java
Modified:
    sis/trunk/   (props changed)
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/xml/MetadataMarshallingTest.java
    sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/PositionalAccuracy.xml
    sis/trunk/core/sis-metadata/src/test/resources/org/apache/sis/xml/ProcessStep.xml
    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/gmd/CodeListAdapter.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/jdk7/Files.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilReason.java
    sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/IOUtilities.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreProvider.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java
    sis/trunk/storage/sis-storage/src/main/java/org/apache/sis/storage/ProbeResult.java

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1509301-1510378
  Merged /sis/branches/JDK6:r1509317-1510391

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.DateType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.citation.Dat
  */
 public final class CI_DateTypeCode extends CodeListAdapter<CI_DateTypeCode, DateType> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(DateType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public CI_DateTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.OnLineFunction;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class CI_OnLineFunctionCode
         extends CodeListAdapter<CI_OnLineFunctionCode, OnLineFunction>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(OnLineFunction.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public CI_OnLineFunctionCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.PresentationForm;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class CI_PresentationFormCo
         extends CodeListAdapter<CI_PresentationFormCode, PresentationForm>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(PresentationForm.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public CI_PresentationFormCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.citation.Role;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.citation.Rol
  */
 public final class CI_RoleCode extends CodeListAdapter<CI_RoleCode, Role> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Role.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public CI_RoleCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.quality.EvaluationMethodType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class DQ_EvaluationMethodTy
         extends CodeListAdapter<DQ_EvaluationMethodTypeCode, EvaluationMethodType>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(EvaluationMethodType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public DQ_EvaluationMethodTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.AssociationType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.identificati
  */
 public final class DS_AssociationTypeCode extends CodeListAdapter<DS_AssociationTypeCode, AssociationType> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(AssociationType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public DS_AssociationTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.InitiativeType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.identificati
  */
 public final class DS_InitiativeTypeCode extends CodeListAdapter<DS_InitiativeTypeCode, InitiativeType> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(InitiativeType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public DS_InitiativeTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.CellGeometry;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.spatial.Cell
  */
 public final class MD_CellGeometryCode extends CodeListAdapter<MD_CellGeometryCode, CellGeometry> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(CellGeometry.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_CellGeometryCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.CharacterSet;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.identificati
  */
 public final class MD_CharacterSetCode extends CodeListAdapter<MD_CharacterSetCode, CharacterSet> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(CharacterSet.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_CharacterSetCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.constraint.Classification;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.constraint.C
  */
 public final class MD_ClassificationCode extends CodeListAdapter<MD_ClassificationCode, Classification> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Classification.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_ClassificationCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.CoverageContentType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class MD_CoverageContentTyp
         extends CodeListAdapter<MD_CoverageContentTypeCode, CoverageContentType>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(CoverageContentType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_CoverageContentTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.Datatype;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.Datatype;
  */
 public final class MD_DatatypeCode extends CodeListAdapter<MD_DatatypeCode, Datatype> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Datatype.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_DatatypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.DimensionNameType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class MD_DimensionNameTypeC
         extends CodeListAdapter<MD_DimensionNameTypeCode, DimensionNameType>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(DimensionNameType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_DimensionNameTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.GeometricObjectType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class MD_GeometricObjectTyp
         extends CodeListAdapter<MD_GeometricObjectTypeCode, GeometricObjectType>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(GeometricObjectType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_GeometricObjectTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.ImagingCondition;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class MD_ImagingConditionCo
         extends CodeListAdapter<MD_ImagingConditionCode, ImagingCondition>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(ImagingCondition.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_ImagingConditionCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.KeywordType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.identificati
  */
 public final class MD_KeywordTypeCode extends CodeListAdapter<MD_KeywordTypeCode, KeywordType> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(KeywordType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_KeywordTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.maintenance.MaintenanceFrequency;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class MD_MaintenanceFrequen
         extends CodeListAdapter<MD_MaintenanceFrequencyCode, MaintenanceFrequency>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(MaintenanceFrequency.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_MaintenanceFrequencyCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.distribution.MediumFormat;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.distribution
  */
 public final class MD_MediumFormatCode extends CodeListAdapter<MD_MediumFormatCode, MediumFormat> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(MediumFormat.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_MediumFormatCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.distribution.MediumName;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.distribution
  */
 public final class MD_MediumNameCode extends CodeListAdapter<MD_MediumNameCode, MediumName> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(MediumName.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_MediumNameCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.PixelOrientation;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class MD_PixelOrientationCo
         extends CodeListAdapter<MD_PixelOrientationCode, PixelOrientation>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(PixelOrientation.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_PixelOrientationCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.Progress;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.identificati
  */
 public final class MD_ProgressCode extends CodeListAdapter<MD_ProgressCode, Progress> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Progress.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_ProgressCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.constraint.Restriction;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.constraint.R
  */
 public final class MD_RestrictionCode extends CodeListAdapter<MD_RestrictionCode, Restriction> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Restriction.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_RestrictionCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.maintenance.ScopeCode;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.maintenance.
  */
 public final class MD_ScopeCode extends CodeListAdapter<MD_ScopeCode, ScopeCode> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(ScopeCode.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_ScopeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.SpatialRepresentationType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ public final class MD_SpatialRepresentat
         extends CodeListAdapter<MD_SpatialRepresentationTypeCode, SpatialRepresentationType>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(SpatialRepresentationType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_SpatialRepresentationTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.identification.TopicCategory;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -36,13 +36,6 @@ import org.opengis.metadata.identificati
  */
 public final class MD_TopicCategoryCode extends CodeListAdapter<MD_TopicCategoryCode, TopicCategory> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(TopicCategory.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_TopicCategoryCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.spatial.TopologyLevel;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 
 
 /**
@@ -34,13 +34,6 @@ import org.opengis.metadata.spatial.Topo
  */
 public final class MD_TopologyLevelCode extends CodeListAdapter<MD_TopologyLevelCode, TopologyLevel> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(TopologyLevel.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MD_TopologyLevelCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.BandDefinition;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_BandDefinition extends CodeListAdapter<MI_BandDefinition, BandDefinition> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(BandDefinition.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_BandDefinition() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Context;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_ContextCode extends CodeListAdapter<MI_ContextCode, Context> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Context.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_ContextCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.GeometryType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_GeometryTypeCode extends CodeListAdapter<MI_GeometryTypeCode, GeometryType> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(GeometryType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_GeometryTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.ObjectiveType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_ObjectiveTypeCode extends CodeListAdapter<MI_ObjectiveTypeCode, ObjectiveType> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(ObjectiveType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_ObjectiveTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.OperationType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_OperationTypeCode extends CodeListAdapter<MI_OperationTypeCode, OperationType> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(OperationType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_OperationTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.PolarizationOrientation;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -38,13 +38,6 @@ public final class MI_PolarizationOrient
         extends CodeListAdapter<MI_PolarizationOrientationCode, PolarizationOrientation>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(PolarizationOrientation.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_PolarizationOrientationCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Priority;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_PriorityCode extends CodeListAdapter<MI_PriorityCode, Priority> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Priority.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_PriorityCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Sequence;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_SequenceCode extends CodeListAdapter<MI_SequenceCode, Sequence> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Sequence.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_SequenceCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.content.TransferFunctionType;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -37,13 +37,6 @@ public final class MI_TransferFunctionTy
         extends CodeListAdapter<MI_TransferFunctionTypeCode, TransferFunctionType>
 {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(TransferFunctionType.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_TransferFunctionTypeCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -16,10 +16,10 @@
  */
 package org.apache.sis.internal.jaxb.code;
 
-import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
-import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import javax.xml.bind.annotation.XmlElement;
 import org.opengis.metadata.acquisition.Trigger;
+import org.apache.sis.internal.jaxb.gmd.CodeListAdapter;
+import org.apache.sis.internal.jaxb.gmd.CodeListProxy;
 import org.apache.sis.xml.Namespaces;
 
 
@@ -35,13 +35,6 @@ import org.apache.sis.xml.Namespaces;
  */
 public final class MI_TriggerCode extends CodeListAdapter<MI_TriggerCode, Trigger> {
     /**
-     * Ensures that the adapted code list class is loaded.
-     */
-    static {
-        ensureClassLoaded(Trigger.class);
-    }
-
-    /**
      * Empty constructor for JAXB only.
      */
     public MI_TriggerCode() {

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimeInstant.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -38,7 +38,7 @@ import org.apache.sis.internal.jaxb.XmlU
  * @module
  */
 @XmlRootElement(name="TimeInstant")
-@XmlType(name = "TimeInstantType")
+//@XmlType(name = "TimeInstantType") // TODO: Omitted for now for allowing external modules to define their own type.
 public final class TimeInstant extends GMLAdapter {
     /**
      * The date, optionally with its time component. The time component is omitted

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriod.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -37,7 +37,7 @@ import org.apache.sis.internal.jaxb.Cont
  * @module
  */
 @XmlRootElement(name="TimePeriod")
-@XmlType(name = "TimePeriodType", propOrder = {
+@XmlType(/*name = "TimePeriodType",*/ propOrder = { // TODO: Omitted for now for allowing external modules to define their own type.
     "begin",
     "end"
 })

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/TimePeriodBound.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -28,7 +28,7 @@ import org.apache.sis.internal.geoapi.te
 /**
  * The {@linkplain TimePeriod#begin begin} or {@linkplain TimePeriod#end end} position in
  * a {@link TimePeriod}. This information is encoded in different way depending if we are
- * reading or formatting a GML2 or GML2 file.
+ * reading or formatting a GML2 or GML3 file.
  *
  * @author  Guilhem Legal (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)
@@ -137,7 +137,7 @@ public abstract class TimePeriodBound {
      *   </gml:TimePeriod>
      * }
      */
-    @XmlType(name = "TimeInstantPropertyType")
+    //@XmlType(name = "TimeInstantPropertyType") // TODO: Omitted for now for allowing external modules to define their own type.
     public static final class GML2 extends TimePeriodBound {
         /**
          * The time.

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/MetadataUtilities.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -19,23 +19,22 @@ package org.apache.sis.internal.metadata
 import java.util.Date;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
+import org.apache.sis.xml.NilReason;
 import org.apache.sis.util.Static;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.metadata.InvalidMetadataException;
+import org.apache.sis.internal.jaxb.PrimitiveTypeProperties;
 
 import static org.apache.sis.metadata.iso.ISOMetadata.LOGGER;
 
-// Related to JDK7
-import org.apache.sis.internal.jdk7.Objects;
-
 
 /**
  * Miscellaneous utility methods for metadata.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.4
  * @module
  */
 public final class MetadataUtilities extends Static {
@@ -78,59 +77,22 @@ public final class MetadataUtilities ext
     }
 
     /**
-     * Sets the bit under the given mask for the given boolean value.
-     * This method uses two bits as below:
-     *
-     * <ul>
-     *   <li>{@code 00} - {@code null}</li>
-     *   <li>{@code 10} - {@code Boolean.FALSE}</li>
-     *   <li>{@code 11} - {@code Boolean.TRUE}</li>
-     * </ul>
-     *
-     * @param  flags The set of bits to modify for the given boolean value.
-     * @param  mask  The bit mask, which much have exactly two consecutive bits set.
-     * @param  value The boolean value to store in the {@code flags}, or {@code null}.
-     * @return The updated {@code flags}.
-     */
-    public static int setBoolean(int flags, final int mask, final Boolean value) {
-        assert 3 << Integer.numberOfTrailingZeros(mask) == mask : mask;
-        if (value == null) {
-            flags &= ~mask;
-        } else {
-            flags |= mask;
-            if (!value) {
-                flags &= ~(mask & (mask >>> 1));
-            }
-        }
-        assert Objects.equals(getBoolean(flags, mask), value) : value;
-        return flags;
-    }
-
-    /**
-     * Returns the boolean value for the bits under the given mask.
-     * This method is the reverse of {@link #setBoolean(int, int, Boolean)}.
-     *
-     * @param  flags The set of bits from which to read the boolean value under the given mask.
-     * @param  mask  The bit mask, which much have exactly two consecutive bits set.
-     * @return The boolean value under the given mask (may be {@code null}).
-     */
-    public static Boolean getBoolean(int flags, final int mask) {
-        flags &= mask;
-        return (flags == 0) ? null : Boolean.valueOf(flags == mask);
-    }
-
-    /**
-     * Makes sure that the given inclusion is non-null, then returns its value.
+     * Makes sure that the given inclusion is non-nil, then returns its value.
+     * If the given inclusion is {@code null}, then the default value is {@code true}.
      *
      * @param  value The {@link org.opengis.metadata.extent.GeographicBoundingBox#getInclusion()} value.
      * @return The given value as a primitive type.
-     * @throws InvalidMetadataException if the given value is null.
+     * @throws InvalidMetadataException if the given value is nil.
      */
     public static boolean getInclusion(final Boolean value) throws InvalidMetadataException {
         if (value == null) {
-            throw new InvalidMetadataException(Errors.format(Errors.Keys.MissingValueForProperty_1, "inclusion"));
+            return true;
+        }
+        final boolean p = value;
+        if (p || value == Boolean.FALSE || !(PrimitiveTypeProperties.property(value) instanceof NilReason)) {
+            return p;
         }
-        return value;
+        throw new InvalidMetadataException(Errors.format(Errors.Keys.MissingValueForProperty_1, "inclusion"));
     }
 
     /**

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -25,9 +25,6 @@ import org.opengis.util.GenericName;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.content.FeatureCatalogueDescription;
 
-import static org.apache.sis.internal.metadata.MetadataUtilities.getBoolean;
-import static org.apache.sis.internal.metadata.MetadataUtilities.setBoolean;
-
 
 /**
  * Information identifying the feature catalogue.
@@ -36,7 +33,7 @@ import static org.apache.sis.internal.me
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
  * @since   0.3 (derived from geotk-2.1)
- * @version 0.3
+ * @version 0.4
  * @module
  */
 @XmlType(name = "MD_FeatureCatalogueDescription_Type", propOrder = {
@@ -53,28 +50,26 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = -3626075463499626813L;
+    private static final long serialVersionUID = -3626075463499626815L;
 
     /**
-     * Mask for the {@code compliant} {@link Boolean} value.
-     * Needs 2 bits since the values can be {@code true}, {@code false} or {@code null}.
+     * Whether or not the cited feature catalogue complies with ISO 19110.
      *
-     * @see #booleans
+     * <p>Implementation note: we need to store the reference to the {@code Boolean} instance instead
+     * than using bitmask because {@link org.apache.sis.internal.jaxb.PrimitiveTypeProperties} may
+     * associate some properties to that particular instance.</p>
      */
-    private static final byte COMPLIANT_MASK = 3; // 0b011
+    private Boolean compliant;
 
     /**
-     * Mask for the {@code includedWithDataset} {@code boolean} value.
-     * Needs only 1 bit because the value can not be {@code null}.
-     *
-     * @see #booleans
+     * Language(s) used within the catalogue
      */
-    private static final byte INCLUDED_MASK = 4; // 0b100
+    private Collection<Locale> languages;
 
     /**
-     * Language(s) used within the catalogue
+     * Whether or not the feature catalogue is included with the dataset.
      */
-    private Collection<Locale> languages;
+    private boolean includedWithDataset;
 
     /**
      * Subset of feature types from cited feature catalogue occurring in dataset.
@@ -87,15 +82,6 @@ public class DefaultFeatureCatalogueDesc
     private Collection<Citation> featureCatalogueCitations;
 
     /**
-     * The set of {@code boolean} and {@link Boolean} values.
-     * Bits are read and written using the {@code *_MASK} constants.
-     *
-     * @see #COMPLIANT_MASK
-     * @see #INCLUDED_MASK
-     */
-    private byte booleans;
-
-    /**
      * Constructs an initially empty feature catalogue description.
      */
     public DefaultFeatureCatalogueDescription() {
@@ -113,8 +99,8 @@ public class DefaultFeatureCatalogueDesc
     public DefaultFeatureCatalogueDescription(final FeatureCatalogueDescription object) {
         super(object);
         if (object != null) {
-            booleans                  = object.isIncludedWithDataset() ? INCLUDED_MASK : 0;
-            booleans                  = (byte) setBoolean(booleans, COMPLIANT_MASK, object.isCompliant());
+            compliant                 = object.isCompliant();
+            includedWithDataset       = object.isIncludedWithDataset();
             languages                 = copyCollection(object.getLanguages(), Locale.class);
             featureTypes              = copyCollection(object.getFeatureTypes(), GenericName.class);
             featureCatalogueCitations = copyCollection(object.getFeatureCatalogueCitations(), Citation.class);
@@ -154,7 +140,7 @@ public class DefaultFeatureCatalogueDesc
     @Override
     @XmlElement(name = "complianceCode")
     public Boolean isCompliant() {
-        return getBoolean(booleans, COMPLIANT_MASK);
+        return compliant;
     }
 
     /**
@@ -164,7 +150,7 @@ public class DefaultFeatureCatalogueDesc
      */
     public void setCompliant(final Boolean newValue) {
         checkWritePermission();
-        booleans = (byte) setBoolean(booleans, COMPLIANT_MASK, newValue);
+        compliant = newValue;
     }
 
     /**
@@ -195,7 +181,7 @@ public class DefaultFeatureCatalogueDesc
     @Override
     @XmlElement(name = "includedWithDataset", required = true)
     public boolean isIncludedWithDataset() {
-        return (booleans & INCLUDED_MASK) != 0;
+        return includedWithDataset;
     }
 
     /**
@@ -205,11 +191,7 @@ public class DefaultFeatureCatalogueDesc
      */
     public void setIncludedWithDataset(final boolean newValue) {
         checkWritePermission();
-        if (newValue) {
-            booleans |= INCLUDED_MASK;
-        } else {
-            booleans &= ~INCLUDED_MASK;
-        }
+        includedWithDataset = newValue;
     }
 
     /**

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -25,9 +25,6 @@ import org.opengis.metadata.content.Imag
 import org.opengis.metadata.content.ImagingCondition;
 import org.apache.sis.measure.ValueRange;
 
-import static org.apache.sis.internal.metadata.MetadataUtilities.getBoolean;
-import static org.apache.sis.internal.metadata.MetadataUtilities.setBoolean;
-
 
 /**
  * Information about an image's suitability for use.
@@ -36,7 +33,7 @@ import static org.apache.sis.internal.me
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
  * @since   0.3 (derived from geotk-2.1)
- * @version 0.3
+ * @version 0.4
  * @module
  */
 @XmlType(name = "MD_ImageDescription_Type", propOrder = {
@@ -59,47 +56,7 @@ public class DefaultImageDescription ext
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 1756867502303578674L;
-
-    /**
-     * Mask for the {@code triangulationIndicator} {@link Boolean} value.
-     * Needs 2 bits since the values can be {@code true}, {@code false} or {@code null}.
-     *
-     * @see #booleans
-     */
-    private static final short TRIANGULATION_MASK = 3;
-
-    /**
-     * Mask for the {@code radiometricCalibrationDataAvailable} {@link Boolean} value.
-     * Needs 2 bits since the values can be {@code true}, {@code false} or {@code null}.
-     *
-     * @see #booleans
-     */
-    private static final short RADIOMETRIC_MASK = TRIANGULATION_MASK << 2;
-
-    /**
-     * Mask for the {@code cameraCalibrationInformationAvailable} {@link Boolean} value.
-     * Needs 2 bits since the values can be {@code true}, {@code false} or {@code null}.
-     *
-     * @see #booleans
-     */
-    private static final short CAMERA_MASK = RADIOMETRIC_MASK << 2;
-
-    /**
-     * Mask for the {@code filmDistortionInformationAvailable} {@link Boolean} value.
-     * Needs 2 bits since the values can be {@code true}, {@code false} or {@code null}.
-     *
-     * @see #booleans
-     */
-    private static final short FILM_MASK = CAMERA_MASK << 2;
-
-    /**
-     * Mask for the {@code lensDistortionInformationAvailable} {@link Boolean} value.
-     * Needs 2 bits since the values can be {@code true}, {@code false} or {@code null}.
-     *
-     * @see #booleans
-     */
-    private static final short LENS_MASK = FILM_MASK << 2;
+    private static final long serialVersionUID = 1756867502303578675L;
 
     /**
      * Illumination elevation measured in degrees clockwise from the target plane
@@ -141,15 +98,34 @@ public class DefaultImageDescription ext
     private Integer compressionGenerationQuantity;
 
     /**
-     * The set of {@link Boolean} values. Bits are read and written using the {@code *_MASK} constants.
+     * Indication of whether or not triangulation has been performed upon the image.
      *
-     * @see #TRIANGULATION_MASK
-     * @see #RADIOMETRIC_MASK
-     * @see #CAMERA_MASK
-     * @see #FILM_MASK
-     * @see #LENS_MASK
+     * <p>Implementation note: we need to store the reference to the {@code Boolean} instance instead
+     * than using bitmask because {@link org.apache.sis.internal.jaxb.PrimitiveTypeProperties} may
+     * associate some properties to that particular instance.</p>
      */
-    private short booleans;
+    private Boolean triangulationIndicator;
+
+    /**
+     * Indication of whether or not the radiometric calibration information for
+     * generating the radiometrically calibrated standard data product is available.
+     */
+    private Boolean radiometricCalibrationDataAvailable;
+
+    /**
+     * Indication of whether or not constants are available which allow for camera calibration corrections.
+     */
+    private Boolean cameraCalibrationInformationAvailable;
+
+    /**
+     * Indication of whether or not Calibration Reseau information is available.
+     */
+    private Boolean filmDistortionInformationAvailable;
+
+    /**
+     * Indication of whether or not lens aberration correction information is available.
+     */
+    private Boolean lensDistortionInformationAvailable;
 
     /**
      * Constructs an initially empty image description.
@@ -176,14 +152,11 @@ public class DefaultImageDescription ext
             cloudCoverPercentage                  = object.getCloudCoverPercentage();
             processingLevelCode                   = object.getProcessingLevelCode();
             compressionGenerationQuantity         = object.getCompressionGenerationQuantity();
-
-            int flags;
-            flags = setBoolean(0,     TRIANGULATION_MASK, object.getTriangulationIndicator());
-            flags = setBoolean(flags, RADIOMETRIC_MASK,   object.isRadiometricCalibrationDataAvailable());
-            flags = setBoolean(flags, CAMERA_MASK,        object.isCameraCalibrationInformationAvailable());
-            flags = setBoolean(flags, FILM_MASK,          object.isFilmDistortionInformationAvailable());
-            flags = setBoolean(flags, LENS_MASK,          object.isLensDistortionInformationAvailable());
-            booleans = (short) flags;
+            triangulationIndicator                = object.getTriangulationIndicator();
+            radiometricCalibrationDataAvailable   = object.isRadiometricCalibrationDataAvailable();
+            cameraCalibrationInformationAvailable = object.isCameraCalibrationInformationAvailable();
+            filmDistortionInformationAvailable    = object.isFilmDistortionInformationAvailable();
+            lensDistortionInformationAvailable    = object.isLensDistortionInformationAvailable();
         }
     }
 
@@ -384,7 +357,7 @@ public class DefaultImageDescription ext
     @Override
     @XmlElement(name = "triangulationIndicator")
     public Boolean getTriangulationIndicator() {
-        return getBoolean(booleans, TRIANGULATION_MASK);
+        return triangulationIndicator;
     }
 
     /**
@@ -394,7 +367,7 @@ public class DefaultImageDescription ext
      */
     public void setTriangulationIndicator(final Boolean newValue) {
         checkWritePermission();
-        booleans = (short) setBoolean(booleans, TRIANGULATION_MASK, newValue);
+        triangulationIndicator = newValue;
     }
 
     /**
@@ -407,7 +380,7 @@ public class DefaultImageDescription ext
     @Override
     @XmlElement(name = "radiometricCalibrationDataAvailability")
     public Boolean isRadiometricCalibrationDataAvailable() {
-        return getBoolean(booleans, RADIOMETRIC_MASK);
+        return radiometricCalibrationDataAvailable;
     }
 
     /**
@@ -418,7 +391,7 @@ public class DefaultImageDescription ext
      */
     public void setRadiometricCalibrationDataAvailable(final Boolean newValue) {
         checkWritePermission();
-        booleans = (short) setBoolean(booleans, RADIOMETRIC_MASK, newValue);
+        radiometricCalibrationDataAvailable = newValue;
     }
 
     /**
@@ -431,7 +404,7 @@ public class DefaultImageDescription ext
     @Override
     @XmlElement(name = "cameraCalibrationInformationAvailability")
     public Boolean isCameraCalibrationInformationAvailable() {
-        return getBoolean(booleans, CAMERA_MASK);
+        return cameraCalibrationInformationAvailable;
     }
 
     /**
@@ -442,7 +415,7 @@ public class DefaultImageDescription ext
      */
     public void setCameraCalibrationInformationAvailable(final Boolean newValue) {
         checkWritePermission();
-        booleans = (short) setBoolean(booleans, CAMERA_MASK, newValue);
+        cameraCalibrationInformationAvailable = newValue;
     }
 
     /**
@@ -454,7 +427,7 @@ public class DefaultImageDescription ext
     @Override
     @XmlElement(name = "filmDistortionInformationAvailability")
     public Boolean isFilmDistortionInformationAvailable() {
-        return getBoolean(booleans, FILM_MASK);
+        return filmDistortionInformationAvailable;
     }
 
     /**
@@ -464,7 +437,7 @@ public class DefaultImageDescription ext
      */
     public void setFilmDistortionInformationAvailable(final Boolean newValue) {
         checkWritePermission();
-        booleans = (short) setBoolean(booleans, FILM_MASK, newValue);
+        filmDistortionInformationAvailable = newValue;
     }
 
     /**
@@ -476,7 +449,7 @@ public class DefaultImageDescription ext
     @Override
     @XmlElement(name = "lensDistortionInformationAvailability")
     public Boolean isLensDistortionInformationAvailable() {
-        return getBoolean(booleans, LENS_MASK);
+        return lensDistortionInformationAvailable;
     }
 
     /**
@@ -486,6 +459,6 @@ public class DefaultImageDescription ext
      */
     public void setLensDistortionInformationAvailable(final Boolean newValue) {
         checkWritePermission();
-        booleans = (short) setBoolean(booleans, LENS_MASK, newValue);
+        lensDistortionInformationAvailable = newValue;
     }
 }

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -26,9 +26,6 @@ import org.opengis.metadata.extent.Geogr
 import org.opengis.metadata.extent.BoundingPolygon;
 import org.apache.sis.metadata.iso.ISOMetadata;
 
-import static org.apache.sis.internal.metadata.MetadataUtilities.getBoolean;
-import static org.apache.sis.internal.metadata.MetadataUtilities.setBoolean;
-
 
 /**
  * Base class for geographic area of the dataset.
@@ -37,7 +34,7 @@ import static org.apache.sis.internal.me
  * @author  Touraïvane (IRD)
  * @author  Cédric Briançon (Geomatys)
  * @since   0.3 (derived from geotk-2.1)
- * @version 0.3
+ * @version 0.4
  * @module
  */
 @XmlType(name = "AbstractEX_GeographicExtent_Type")
@@ -51,22 +48,17 @@ public class AbstractGeographicExtent ex
     /**
      * Serial number for inter-operability with different versions.
      */
-    private static final long serialVersionUID = 4819196764221609263L;
+    private static final long serialVersionUID = 4819196764221609265L;
 
     /**
-     * Mask for the {@code inclusion} {@link Boolean} value.
-     * Needs 2 bits since the values can be {@code true}, {@code false} or {@code null}.
-     *
-     * @see #booleans
-     */
-    private static final byte INCLUSION_MASK = 3;
-
-    /**
-     * The set of {@link Boolean} values. Bits are read and written using the {@code *_MASK} constants.
+     * Indication of whether the bounding polygon encompasses an area covered by the data
+     * (<cite>inclusion</cite>) or an area where data is not present (<cite>exclusion</cite>).
      *
-     * @see #INCLUSION_MASK
+     * <p>Implementation note: we need to store the reference to the {@code Boolean} instance instead
+     * than using bitmask because {@link org.apache.sis.internal.jaxb.PrimitiveTypeProperties} may
+     * associate some properties to that particular instance.</p>
      */
-    private byte booleans;
+    private Boolean inclusion;
 
     /**
      * Constructs an initially empty geographic extent.
@@ -80,7 +72,7 @@ public class AbstractGeographicExtent ex
      * @param inclusion Whether the bounding polygon encompasses an area covered by the data.
      */
     public AbstractGeographicExtent(final boolean inclusion) {
-        booleans = inclusion ? INCLUSION_MASK : 0;
+        this.inclusion = inclusion;
     }
 
     /**
@@ -95,7 +87,7 @@ public class AbstractGeographicExtent ex
     public AbstractGeographicExtent(final GeographicExtent object) {
         super(object);
         if (object != null) {
-            booleans = (byte) setBoolean(0, INCLUSION_MASK, object.getInclusion());
+            inclusion = object.getInclusion();
         }
     }
 
@@ -148,7 +140,7 @@ public class AbstractGeographicExtent ex
     @Override
     @XmlElement(name = "extentTypeCode")
     public Boolean getInclusion() {
-        return getBoolean(booleans, INCLUSION_MASK);
+        return inclusion;
     }
 
     /**
@@ -159,6 +151,6 @@ public class AbstractGeographicExtent ex
      */
     public void setInclusion(final Boolean newValue) {
         checkWritePermission();
-        booleans = (byte) setBoolean(booleans, INCLUSION_MASK, newValue);
+        inclusion = newValue;
     }
 }

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -322,9 +322,9 @@ public class DefaultGeographicBoundingBo
      *         Note that {@linkplain Double#NaN NaN} values are allowed.
      */
     public void setBounds(final double westBoundLongitude,
-                                       final double eastBoundLongitude,
-                                       final double southBoundLatitude,
-                                       final double northBoundLatitude)
+                          final double eastBoundLongitude,
+                          final double southBoundLatitude,
+                          final double northBoundLatitude)
             throws IllegalArgumentException
     {
         checkWritePermission();

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java?rev=1510395&r1=1510394&r2=1510395&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/internal/metadata/MetadataUtilitiesTest.java [UTF-8] Mon Aug  5 08:56:14 2013
@@ -21,8 +21,6 @@ import org.junit.Test;
 import org.apache.sis.test.TestCase;
 
 import static org.junit.Assert.*;
-import static java.lang.Boolean.TRUE;
-import static java.lang.Boolean.FALSE;
 
 
 /**
@@ -30,7 +28,7 @@ import static java.lang.Boolean.FALSE;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
- * @version 0.3
+ * @version 0.4
  * @module
  */
 public final strictfp class MetadataUtilitiesTest extends TestCase {
@@ -51,22 +49,4 @@ public final strictfp class MetadataUtil
         assertEquals(new Date(1000), MetadataUtilities.toDate(1000));
         assertNull(MetadataUtilities.toDate(Long.MIN_VALUE));
     }
-
-    /**
-     * Tests {@link MetadataUtilities#setBoolean(int, byte, Boolean)}.
-     * This will indirectly test the getter method through Java assertion.
-     */
-    @Test
-    public void testSetBoolean() {
-        final int mask0 =  3; // 0b000011;
-        final int mask1 = 12; // 0b001100;
-        final int mask2 = 48; // 0b110000;
-        int flags = 0;
-        flags = MetadataUtilities.setBoolean(flags, mask1, null ); assertEquals( 0 /*0b000000*/, flags);
-        flags = MetadataUtilities.setBoolean(flags, mask1, TRUE ); assertEquals(12 /*0b001100*/, flags);
-        flags = MetadataUtilities.setBoolean(flags, mask2, FALSE); assertEquals(44 /*0b101100*/, flags);
-        flags = MetadataUtilities.setBoolean(flags, mask1, null ); assertEquals(32 /*0b100000*/, flags);
-        flags = MetadataUtilities.setBoolean(flags, mask0, TRUE ); assertEquals(35 /*0b100011*/, flags);
-        flags = MetadataUtilities.setBoolean(flags, mask0, FALSE); assertEquals(34 /*0b100010*/, flags);
-    }
 }



Mime
View raw message