sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1511613 - in /sis/branches/0.3: ./ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/ core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/ core/sis-utility/src/main/java/org/apache/sis/util/iso/
Date Thu, 08 Aug 2013 08:22:15 GMT
Author: desruisseaux
Date: Thu Aug  8 08:22:14 2013
New Revision: 1511613

URL: http://svn.apache.org/r1511613
Log:
Merge the removal of unecessary class initializations.

Modified:
    sis/branches/0.3/   (props changed)
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
    sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
    sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
    sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java

Propchange: sis/branches/0.3/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1509785

Modified: sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_DateTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_OnLineFunctionCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_PresentationFormCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/CI_RoleCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DQ_EvaluationMethodTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_AssociationTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/DS_InitiativeTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CellGeometryCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CharacterSetCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ClassificationCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_CoverageContentTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DatatypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_DimensionNameTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_GeometricObjectTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ImagingConditionCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_KeywordTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MaintenanceFrequencyCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumFormatCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_MediumNameCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_PixelOrientationCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ProgressCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_RestrictionCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_ScopeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_SpatialRepresentationTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopicCategoryCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MD_TopologyLevelCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_BandDefinition.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ContextCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_GeometryTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_ObjectiveTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_OperationTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PolarizationOrientationCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_PriorityCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_SequenceCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TransferFunctionTypeCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/MI_TriggerCode.java [UTF-8] Thu Aug  8 08:22: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/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gmd/CodeListAdapter.java [UTF-8] Thu Aug  8 08:22:14 2013
@@ -74,23 +74,6 @@ public abstract class CodeListAdapter<Va
     }
 
     /**
-     * Forces the initialization of the given code list class, since some
-     * calls to {@link CodeList#valueOf(Class, String)} are done whereas
-     * the constructor has not already been called.
-     *
-     * @param <T>  The code list type.
-     * @param type The code list class to initialize.
-     */
-    protected static <T extends CodeList<T>> void ensureClassLoaded(final Class<T> type) {
-        final String name = type.getName();
-        try {
-            Class.forName(name, true, type.getClassLoader());
-        } catch (ClassNotFoundException e) {
-            throw new TypeNotPresentException(name, e); // Should never happen.
-        }
-    }
-
-    /**
      * Wraps the proxy value into an adapter.
      *
      * @param proxy The proxy version of {@link CodeList}, to be marshalled.

Modified: sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL: http://svn.apache.org/viewvc/sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1511613&r1=1511612&r2=1511613&view=diff
==============================================================================
--- sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] (original)
+++ sis/branches/0.3/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] Thu Aug  8 08:22:14 2013
@@ -519,6 +519,7 @@ public final class Types extends Static 
         if (name == null || name.isEmpty()) {
             return null;
         }
+        // -------- Begin workaround for GeoAPI 3.0 (TODO: remove after upgrade to GeoAPI 3.1) ------------
         final String typeName = codeType.getName();
         try {
             // Forces initialization of the given class in order
@@ -527,6 +528,7 @@ public final class Types extends Static 
         } catch (ClassNotFoundException e) {
             throw new TypeNotPresentException(typeName, e); // Should never happen.
         }
+        // -------- End workaround ------------------------------------------------------------------------
         return CodeList.valueOf(codeType, new CodeListFilter(name, canCreate));
     }
 



Mime
View raw message