sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1701242 [3/3] - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/metadata/iso/ sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/ sis-referencing/src/main/java/org/apache/sis/parameter/ sis-referenc...
Date Fri, 04 Sep 2015 13:07:28 GMT
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultPrimeMeridian.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -114,15 +114,6 @@ public class DefaultPrimeMeridian extend
     private Unit<Angle> angularUnit;
 
     /**
-     * Constructs a new object in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    private DefaultPrimeMeridian() {
-        super(org.apache.sis.internal.referencing.NilReferencingObject.INSTANCE);
-    }
-
-    /**
      * Creates a prime meridian from the given properties. The properties map is given unchanged
to the
      * {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map) super-class constructor}.
      * The following table is a reminder of main (not all) properties:
@@ -255,38 +246,6 @@ public class DefaultPrimeMeridian extend
     }
 
     /**
-     * Invoked by JAXB for obtaining the Greenwich longitude to marshall together with its
{@code "uom"} attribute.
-     */
-    @XmlElement(name = "greenwichLongitude", required = true)
-    private Measure getGreenwichMeasure() {
-        return new Measure(greenwichLongitude, angularUnit);
-    }
-
-    /**
-     * Invoked by JAXB for setting the Greenwich longitude and its unit of measurement.
-     */
-    private void setGreenwichMeasure(final Measure measure) {
-        if (greenwichLongitude == 0 && angularUnit == null) {
-            greenwichLongitude = measure.value;
-            angularUnit = measure.getUnit(Angle.class);
-            if (angularUnit == null) {
-                /*
-                 * Missing unit: if the Greenwich longitude is zero, any angular unit gives
the same result
-                 * (assuming that the missing unit was not applying an offset), so we can
select a default.
-                 * If the Greenwich longitude is not zero, we can not guess. Our object will
be invalid.
-                 */
-                if (greenwichLongitude == 0) {
-                    angularUnit = NonSI.DEGREE_ANGLE;
-                } else {
-                    Measure.missingUOM(DefaultPrimeMeridian.class, "setGreenwichMeasure");
-                }
-            }
-        } else {
-            ReferencingUtilities.propertyAlreadySet(DefaultPrimeMeridian.class, "setGreenwichMeasure",
"greenwichLongitude");
-        }
-    }
-
-    /**
      * Compares this prime meridian with the specified object for equality.
      *
      * @param  object The object to compare to {@code this}.
@@ -425,4 +384,59 @@ public class DefaultPrimeMeridian extend
         }
         return WKTKeywords.PrimeMeridian;
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Constructs a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    private DefaultPrimeMeridian() {
+        super(org.apache.sis.internal.referencing.NilReferencingObject.INSTANCE);
+    }
+
+    /**
+     * Invoked by JAXB for obtaining the Greenwich longitude to marshall together with its
{@code "uom"} attribute.
+     */
+    @XmlElement(name = "greenwichLongitude", required = true)
+    private Measure getGreenwichMeasure() {
+        return new Measure(greenwichLongitude, angularUnit);
+    }
+
+    /**
+     * Invoked by JAXB for setting the Greenwich longitude and its unit of measurement.
+     */
+    private void setGreenwichMeasure(final Measure measure) {
+        if (greenwichLongitude == 0 && angularUnit == null) {
+            greenwichLongitude = measure.value;
+            angularUnit = measure.getUnit(Angle.class);
+            if (angularUnit == null) {
+                /*
+                 * Missing unit: if the Greenwich longitude is zero, any angular unit gives
the same result
+                 * (assuming that the missing unit was not applying an offset), so we can
select a default.
+                 * If the Greenwich longitude is not zero, we can not guess. Our object will
be invalid.
+                 */
+                if (greenwichLongitude == 0) {
+                    angularUnit = NonSI.DEGREE_ANGLE;
+                } else {
+                    Measure.missingUOM(DefaultPrimeMeridian.class, "setGreenwichMeasure");
+                }
+            }
+        } else {
+            ReferencingUtilities.propertyAlreadySet(DefaultPrimeMeridian.class, "setGreenwichMeasure",
"greenwichLongitude");
+        }
+    }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -99,15 +99,6 @@ public class DefaultTemporalDatum extend
     private long origin;
 
     /**
-     * Constructs a new datum in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    private DefaultTemporalDatum() {
-        origin = Long.MIN_VALUE;
-    }
-
-    /**
      * Creates a temporal datum from the given properties. The properties map is given
      * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}.
      * The following table is a reminder of main (not all) properties:
@@ -230,17 +221,6 @@ public class DefaultTemporalDatum extend
     }
 
     /**
-     * Invoked by JAXB only at unmarshalling time.
-     */
-    private void setOrigin(final Date value) {
-        if (origin == Long.MIN_VALUE) {
-            origin = value.getTime();
-        } else {
-            ReferencingUtilities.propertyAlreadySet(DefaultTemporalDatum.class, "setOrigin",
"origin");
-        }
-    }
-
-    /**
      * Compares this temporal datum with the specified object for equality.
      *
      * @param  object The object to compare to {@code this}.
@@ -318,4 +298,40 @@ public class DefaultTemporalDatum extend
             return WKTKeywords.TimeOrigin;
         }
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Constructs a new datum in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    private DefaultTemporalDatum() {
+        origin = Long.MIN_VALUE;
+    }
+
+    /**
+     * Invoked by JAXB only at unmarshalling time.
+     *
+     * @see #getOrigin()
+     */
+    private void setOrigin(final Date value) {
+        if (origin == Long.MIN_VALUE) {
+            origin = value.getTime();
+        } else {
+            ReferencingUtilities.propertyAlreadySet(DefaultTemporalDatum.class, "setOrigin",
"origin");
+        }
+    }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -100,14 +100,6 @@ public class DefaultVerticalDatum extend
     private VerticalDatumType type;
 
     /**
-     * Constructs a new datum in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    private DefaultVerticalDatum() {
-    }
-
-    /**
      * Creates a vertical datum from the given properties. The properties map is given
      * unchanged to the {@linkplain AbstractDatum#AbstractDatum(Map) super-class constructor}.
      * The following table is a reminder of main (not all) properties:
@@ -251,28 +243,6 @@ public class DefaultVerticalDatum extend
     }
 
     /**
-     * Returns the type to be marshalled to XML.
-     * This element was present in GML 3.0 and 3.1, but has been removed from GML 3.2.
-     *
-     * @see <a href="http://issues.apache.org/jira/browse/SIS-160">SIS-160: Need XSLT
between GML 3.1 and 3.2</a>
-     */
-    @XmlElement(name = "verticalDatumType")
-    private VerticalDatumType getTypeElement() {
-        return Context.isGMLVersion(Context.current(), LegacyNamespaces.VERSION_3_2) ? null
: getVerticalDatumType();
-    }
-
-    /**
-     * Invoked by JAXB only. The vertical datum type is set only if it has not already been
specified.
-     */
-    private void setTypeElement(final VerticalDatumType t) {
-        if (type == null) {
-            type = t;
-        } else {
-            ReferencingUtilities.propertyAlreadySet(DefaultVerticalDatum.class, "setTypeElement",
"verticalDatumType");
-        }
-    }
-
-    /**
      * Compare this vertical datum with the specified object for equality.
      *
      * @param  object The object to compare to {@code this}.
@@ -333,4 +303,48 @@ public class DefaultVerticalDatum extend
         }
         return WKTKeywords.VerticalDatum;
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Constructs a new datum in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    private DefaultVerticalDatum() {
+    }
+
+    /**
+     * Returns the type to be marshalled to XML.
+     * This element was present in GML 3.0 and 3.1, but has been removed from GML 3.2.
+     *
+     * @see <a href="http://issues.apache.org/jira/browse/SIS-160">SIS-160: Need XSLT
between GML 3.1 and 3.2</a>
+     */
+    @XmlElement(name = "verticalDatumType")
+    private VerticalDatumType getTypeElement() {
+        return Context.isGMLVersion(Context.current(), LegacyNamespaces.VERSION_3_2) ? null
: getVerticalDatumType();
+    }
+
+    /**
+     * Invoked by JAXB only. The vertical datum type is set only if it has not already been
specified.
+     */
+    private void setTypeElement(final VerticalDatumType t) {
+        if (type == null) {
+            type = t;
+        } else {
+            ReferencingUtilities.propertyAlreadySet(DefaultVerticalDatum.class, "setTypeElement",
"verticalDatumType");
+        }
+    }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractCoordinateOperation.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -172,20 +172,6 @@ public class AbstractCoordinateOperation
     private MathTransform transform;
 
     /**
-     * Creates a new object in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    AbstractCoordinateOperation() {
-        super(org.apache.sis.internal.referencing.NilReferencingObject.INSTANCE);
-        interpolationCRS            = null;
-        operationVersion            = null;
-        coordinateOperationAccuracy = null;
-        domainOfValidity            = null;
-        scope                       = null;
-    }
-
-    /**
      * Creates a new coordinate operation with the same values than the specified defining
conversion,
      * except for the source CRS, target CRS and the math transform which are set the given
values.
      *
@@ -843,6 +829,20 @@ check:      for (int isTarget=0; ; isTar
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
+     * Creates a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    AbstractCoordinateOperation() {
+        super(org.apache.sis.internal.referencing.NilReferencingObject.INSTANCE);
+        interpolationCRS            = null;
+        operationVersion            = null;
+        coordinateOperationAccuracy = null;
+        domainOfValidity            = null;
+        scope                       = null;
+    }
+
+    /**
      * Invoked by JAXB for getting the source CRS to marshal.
      */
     @XmlElement(name = "sourceCRS")

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -97,15 +97,6 @@ class AbstractSingleOperation extends Ab
     private ParameterValueGroup parameters;
 
     /**
-     * Constructs a new object in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    AbstractSingleOperation() {
-        method = null;
-    }
-
-    /**
      * Creates a coordinate operation from the given properties.
      */
     public AbstractSingleOperation(final Map<String,?>             properties,
@@ -437,6 +428,15 @@ class AbstractSingleOperation extends Ab
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
+     * Constructs a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    AbstractSingleOperation() {
+        method = null;
+    }
+
+    /**
      * Invoked by JAXB for getting the parameters to marshal. This method usually marshals
the sequence
      * of parameters without their {@link ParameterValueGroup} wrapper, because GML is defined
that way.
      * The {@code ParameterValueGroup} wrapper is a GeoAPI addition done for allowing usage
of its

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -95,14 +95,6 @@ public class DefaultConversion extends A
     private static final long serialVersionUID = -2148164324805562793L;
 
     /**
-     * Constructs a new object in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    private DefaultConversion() {
-    }
-
-    /**
      * Creates a coordinate conversion from the given properties.
      * The properties given in argument follow the same rules than for the
      * {@linkplain AbstractCoordinateOperation#AbstractCoordinateOperation(Map, CoordinateReferenceSystem,
@@ -494,4 +486,26 @@ public class DefaultConversion extends A
         }
         return transform;
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Constructs a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    private DefaultConversion() {
+    }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -178,17 +178,6 @@ public class DefaultOperationMethod exte
     private ParameterDescriptorGroup parameters;
 
     /**
-     * Creates a new object in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    private DefaultOperationMethod() {
-        super(org.apache.sis.internal.referencing.NilReferencingObject.INSTANCE);
-        sourceDimensions = null;
-        targetDimensions = null;
-    }
-
-    /**
      * Constructs an operation method from a set of properties and a descriptor group. The
properties map is given
      * unchanged to the {@linkplain AbstractIdentifiedObject#AbstractIdentifiedObject(Map)
super-class constructor}.
      * In addition to the properties documented in the parent constructor,
@@ -732,6 +721,17 @@ public class DefaultOperationMethod exte
     //////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**
+     * Creates a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    private DefaultOperationMethod() {
+        super(org.apache.sis.internal.referencing.NilReferencingObject.INSTANCE);
+        sourceDimensions = null;
+        targetDimensions = null;
+    }
+
+    /**
      * Invoked by JAXB for marshalling a citation to the formula. In principle at most one
of
      * {@code getFormulaCitation()} and {@link #getFormulaDescription()} methods can return
a
      * non-null value. However SIS accepts both coexist (but this is invalid GML).

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultTransformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultTransformation.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultTransformation.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultTransformation.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -62,14 +62,6 @@ public class DefaultTransformation exten
     private static final long serialVersionUID = -7486704846151648971L;
 
     /**
-     * Constructs a new object in which every attributes are set to a null value.
-     * <strong>This is not a valid object.</strong> This constructor is strictly
-     * reserved to JAXB, which will assign values to the fields using reflexion.
-     */
-    private DefaultTransformation() {
-    }
-
-    /**
      * Creates a coordinate transformation from the given properties.
      * The properties given in argument follow the same rules than for the
      * {@linkplain AbstractCoordinateOperation#AbstractCoordinateOperation(Map, CoordinateReferenceSystem,
@@ -171,4 +163,26 @@ public class DefaultTransformation exten
     public Class<? extends Transformation> getInterface() {
         return Transformation.class;
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Constructs a new object in which every attributes are set to a null value.
+     * <strong>This is not a valid object.</strong> This constructor is strictly
+     * reserved to JAXB, which will assign values to the fields using reflexion.
+     */
+    private DefaultTransformation() {
+    }
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -101,16 +101,6 @@ public class DefaultLocalName extends Ab
     final CharSequence name;
 
     /**
-     * Empty constructor to be used by JAXB only, or by sub-classes empty constructors
-     * themselves used only by JAXB. Despite its "final" declaration, the {@link #name}
-     * field will be set by JAXB during unmarshalling.
-     */
-    DefaultLocalName() {
-        scope = null;
-        name  = null;
-    }
-
-    /**
      * Constructs a local name from the given character sequence.
      * If the character sequence is an instance of {@link InternationalString},
      * then its {@link InternationalString#toString(java.util.Locale) toString(Locale.ROOT)}
@@ -341,4 +331,28 @@ public class DefaultLocalName extends Ab
         }
         return ns.local(name, this);
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Empty constructor to be used by JAXB only, or by sub-classes empty constructors
+     * themselves used only by JAXB. Despite its "final" declaration, the {@link #name}
+     * field will be set by JAXB during unmarshalling.
+     */
+    DefaultLocalName() {
+        scope = null;
+        name  = null;
+    }
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -68,14 +68,6 @@ public class DefaultMemberName extends D
     private final TypeName attributeType;
 
     /**
-     * Empty constructor to be used by JAXB only. Despite its "final" declaration,
-     * the {@link #attributeType} field will be set by JAXB during unmarshalling.
-     */
-    private DefaultMemberName() {
-        attributeType = null;
-    }
-
-    /**
      * Constructs a member name from the given character sequence and attribute type.
      *
      * @param scope The scope of this name, or {@code null} for a global scope.
@@ -141,4 +133,26 @@ public class DefaultMemberName extends D
     final int computeHashCode() {
         return super.computeHashCode() + Objects.hashCode(attributeType);
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Empty constructor to be used by JAXB only. Despite its "final" declaration,
+     * the {@link #attributeType} field will be set by JAXB during unmarshalling.
+     */
+    private DefaultMemberName() {
+        attributeType = null;
+    }
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -125,14 +125,6 @@ public class DefaultRecordType extends R
     private transient Type[] memberTypes;
 
     /**
-     * Empty constructor only used by JAXB.
-     */
-    private DefaultRecordType() {
-        typeName  = null;
-        container = null;
-    }
-
-    /**
      * Creates a new record with the same names and members than the given one.
      *
      * @param other The {@code RecordType} to copy.
@@ -437,4 +429,26 @@ public class DefaultRecordType extends R
     public int hashCode() {
         return Objects.hashCode(typeName) + 31*(memberIndices().hashCode() + 31*Arrays.hashCode(memberTypes));
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Empty constructor only used by JAXB.
+     */
+    private DefaultRecordType() {
+        typeName  = null;
+        container = null;
+    }
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java?rev=1701242&r1=1701241&r2=1701242&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultTypeName.java
[UTF-8] Fri Sep  4 13:07:27 2015
@@ -99,13 +99,6 @@ public class DefaultTypeName extends Def
     private transient Class<?> valueClass;
 
     /**
-     * Empty constructor to be used by JAXB only. Despite its "final" declaration,
-     * the {@link #name} field will be set by JAXB during unmarshalling.
-     */
-    private DefaultTypeName() {
-    }
-
-    /**
      * Constructs a type name from the given character sequence. The argument are given unchanged
to the
      * {@linkplain DefaultLocalName#DefaultLocalName(NameSpace,CharSequence) super-class
constructor}.
      *
@@ -223,4 +216,25 @@ public class DefaultTypeName extends Def
         }
         return (c != Void.TYPE) ? c : null;
     }
+
+
+
+
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+    ////////                                                                            
     ////////
+    ////////                               XML support with JAXB                        
     ////////
+    ////////                                                                            
     ////////
+    ////////        The following methods are invoked by JAXB using reflection (even if 
     ////////
+    ////////        they are private) or are helpers for other methods invoked by JAXB. 
     ////////
+    ////////        Those methods can be safely removed if Geographic Markup Language   
     ////////
+    ////////        (GML) support is not needed.                                        
     ////////
+    ////////                                                                            
     ////////
+    //////////////////////////////////////////////////////////////////////////////////////////////////
+
+    /**
+     * Empty constructor to be used by JAXB only. Despite its "final" declaration,
+     * the {@link #name} field will be set by JAXB during unmarshalling.
+     */
+    private DefaultTypeName() {
+    }
 }



Mime
View raw message