You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/04/10 15:11:05 UTC
svn commit: r1466471 [2/4] - in /sis/branches/JDK6: ./ sis-build-helper/
sis-metadata/ sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gmi/
sis-metadata/src/main/java/org/apache/sis/internal/jaxb/metadata/
sis-metadata/src/main/java/org/apache/...
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -55,7 +55,7 @@ public class DefaultCoverageDescription
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 5943716957630930520L;
+ private static final long serialVersionUID = -3314118785767660332L;
/**
* Description of the attribute described by the measurement value.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -53,7 +53,7 @@ public class DefaultFeatureCatalogueDesc
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 1984922846251567908L;
+ private static final long serialVersionUID = -3626075463499626813L;
/**
* Mask for the {@code compliant} {@link Boolean} value.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -59,7 +59,7 @@ public class DefaultImageDescription ext
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -6168624828802439062L;
+ private static final long serialVersionUID = 1756867502303578674L;
/**
* Mask for the {@code triangulationIndicator} {@link Boolean} value.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -47,7 +47,7 @@ public class DefaultRangeDimension exten
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 4365956866782010460L;
+ private static final long serialVersionUID = -8624244894762434804L;
/**
* Number that uniquely identifies instances of bands of wavelengths on which a sensor operates.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -46,7 +46,7 @@ public class DefaultRangeElementDescript
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2869953851390143207L;
+ private static final long serialVersionUID = -8891149098619355114L;
/**
* Designation associated with a set of range elements.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/package-info.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -66,23 +66,19 @@
* Both {@code Band} and {@code SampleDimension} interfaces extend the same parent,
* {@link org.opengis.metadata.content.RangeDimension}.
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -45,7 +45,7 @@ public class DefaultDataFile extends ISO
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 5737775725403867273L;
+ private static final long serialVersionUID = -4556006719009557349L;
/**
* Provides the list of feature types concerned by the transfer data file. Depending on
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -51,7 +51,7 @@ public class DefaultDigitalTransferOptio
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -1533064478468754337L;
+ private static final long serialVersionUID = 3797035083686261676L;
/**
* Tiles, layers, geographic areas, etc., in which data is available.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -47,7 +47,7 @@ public class DefaultDistribution extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -5899590027802365131L;
+ private static final long serialVersionUID = 1331353255189686369L;
/**
* Provides a description of the format of the data to be distributed.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -49,7 +49,7 @@ public class DefaultDistributor extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7142984376823483766L;
+ private static final long serialVersionUID = 5706757156163948001L;
/**
* Party from whom the resource may be obtained. This list need not be exhaustive.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -51,7 +51,7 @@ public class DefaultFormat extends ISOMe
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 6498897239493553607L;
+ private static final long serialVersionUID = -6713019619784302519L;
/**
* Name of the data transfer format(s).
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -52,7 +52,7 @@ public class DefaultMedium extends ISOMe
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2838122926367921673L;
+ private static final long serialVersionUID = 7751002701087451894L;
/**
* Name of the medium on which the resource can be received.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -50,7 +50,7 @@ public class DefaultStandardOrderProcess
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -6503378937452728631L;
+ private static final long serialVersionUID = 6107884863471045743L;
/**
* Fees and terms for retrieving the resource.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/package-info.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -37,8 +37,8 @@
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDigitalTransferOptions Digital transfer options}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDataFile Data file}<br>
* {@linkplain org.opengis.util.CodeList Code list}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name}</br>
- * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format}</br>
+ * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name}<br>
+ * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format}<br>
* </td><td class="sep" width="50%" nowrap>
* {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDistribution Distribution}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultFormat Format}<br>
@@ -46,28 +46,24 @@
* {@code │ └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultStandardOrderProcess Standard order process}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDigitalTransferOptions Digital transfer options}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.distribution.DefaultMedium Medium}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name} «code list»</br>
- * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format} «code list»</br>
+ * {@code ├─} {@linkplain org.opengis.metadata.distribution.MediumName Medium name} «code list»<br>
+ * {@code └─} {@linkplain org.opengis.metadata.distribution.MediumFormat Medium format} «code list»<br>
* {@linkplain org.apache.sis.metadata.iso.distribution.DefaultDataFile Data file}<br>
* </td></tr></table>
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -51,7 +51,7 @@ public class AbstractGeographicExtent ex
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -8844015895495563161L;
+ private static final long serialVersionUID = 4819196764221609263L;
/**
* Mask for the {@code inclusion} {@link Boolean} value.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -43,7 +43,7 @@ public class DefaultBoundingPolygon exte
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 8174011874910887918L;
+ private static final long serialVersionUID = 3404580901560754370L;
/**
* The sets of points defining the bounding polygon.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -68,7 +68,7 @@ public class DefaultExtent extends ISOMe
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7812213837337326257L;
+ private static final long serialVersionUID = 2979058128422252800L;
/**
* A geographic extent ranging from 180°W to 180°E and 90°S to 90°N.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -72,7 +72,7 @@ public class DefaultGeographicBoundingBo
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -3278089380004172514L;
+ private static final long serialVersionUID = -9200149606040429957L;
/**
* A bounding box ranging from 180°W to 180°E and 90°S to 90°N.
@@ -471,7 +471,7 @@ public class DefaultGeographicBoundingBo
*
* @return {@code true} if this metadata does not define any bound value.
*
- * @see org.apache.sis.geometry.AbstractEnvelope#isNull()
+ * @see org.apache.sis.geometry.AbstractEnvelope#isAllNaN()
*/
@Override
public synchronized boolean isEmpty() {
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -43,7 +43,7 @@ public class DefaultGeographicDescriptio
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7250161161099782176L;
+ private static final long serialVersionUID = 7876194854687370299L;
/**
* The identifier used to represent a geographic area.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -40,7 +40,7 @@ public class DefaultSpatialTemporalExten
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 821702768255546660L;
+ private static final long serialVersionUID = -2461142677245013474L;
/**
* The spatial extent component of composite
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -56,7 +56,7 @@ public class DefaultTemporalExtent exten
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 3668140516657118045L;
+ private static final long serialVersionUID = -6149873501105795242L;
/**
* The date and time for the content of the dataset.
@@ -120,6 +120,8 @@ public class DefaultTemporalExtent exten
* If no extent has been {@linkplain #setExtent(TemporalPrimitive) explicitely set},
* then this method will build an extent from the {@linkplain #getStartTime() start
* time} and {@linkplain #getEndTime() end time} if any.
+ *
+ * @return The content date.
*/
@Override
@XmlElement(name = "extent", required = true)
@@ -130,7 +132,7 @@ public class DefaultTemporalExtent exten
/**
* Sets the date and time for the content of the dataset.
*
- * @param newValue The new extent.
+ * @param newValue The new content date.
*/
public synchronized void setExtent(final TemporalPrimitive newValue) {
checkWritePermission();
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -52,7 +52,7 @@ public class DefaultVerticalExtent exten
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -3214554246909844079L;
+ private static final long serialVersionUID = -1963873471175296153L;
/**
* The lowest vertical extent contained in the dataset.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/package-info.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -88,23 +88,19 @@
* for adding extent elements inferred from the given envelope.</li>
* </ul>
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -63,7 +63,7 @@ public class AbstractIdentification exte
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 5794381277658853611L;
+ private static final long serialVersionUID = -6512101909569333306L;
/**
* Citation data for the resource(s).
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -52,7 +52,7 @@ public class DefaultAggregateInformation
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 5520234916010871192L;
+ private static final long serialVersionUID = 4183321601376092254L;
/**
* Citation information about the aggregate dataset.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -45,7 +45,7 @@ public class DefaultBrowseGraphic extend
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 1715873406472953616L;
+ private static final long serialVersionUID = 1769063690091153678L;
/**
* Name of the file that contains a graphic that provides an illustration of the dataset.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -56,7 +56,7 @@ public class DefaultDataIdentification e
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 2099051218533426785L;
+ private static final long serialVersionUID = 8586544979707643009L;
/**
* Method used to spatially represent geographic information.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -48,7 +48,7 @@ public class DefaultKeywords extends ISO
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 48691634443678266L;
+ private static final long serialVersionUID = -2765705888428016211L;
/**
* Commonly used word(s) or formalised word(s) or phrase(s) used to describe the subject.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -45,7 +45,7 @@ public class DefaultRepresentativeFracti
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = -715235893904309869L;
+ private static final long serialVersionUID = -6043871487256529207L;
/**
* The number below the line in a vulgar fraction, or 0 if undefined.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -53,7 +53,7 @@ public class DefaultResolution extends I
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = -4644465057871958482L;
+ private static final long serialVersionUID = 3856547985745400172L;
/**
* Either the scale as a {@link RepresentativeFraction} instance or the distance
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentification.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -38,7 +38,7 @@ public class DefaultServiceIdentificatio
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = -8337161132057617851L;
+ private static final long serialVersionUID = 4988429302218128178L;
/**
* Constructs an initially empty service identification.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -52,7 +52,7 @@ public class DefaultUsage extends ISOMet
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 4059324536168287490L;
+ private static final long serialVersionUID = 7464000583573398579L;
/**
* Brief description of the resource and/or resource series usage.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -45,7 +45,7 @@
* {@code ├─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category}<br>
* {@code └─} {@linkplain org.opengis.metadata.identification.CharacterSet Character set}<br>
* </td><td class="sep" width="50%" nowrap>
- * {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
+ * {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.Progress Progress} «code list»<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic Browse graphic}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords Keywords}<br>
@@ -67,23 +67,19 @@
* for computing the denominator from a scale value.</li>
* </ul>
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -45,7 +45,7 @@ public class DefaultAlgorithm extends IS
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 6343760610092069341L;
+ private static final long serialVersionUID = 5718445163047946957L;
/**
* Information identifying the algorithm and version or date.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -53,7 +53,7 @@ public class DefaultLineage extends ISOM
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 3351230301999744987L;
+ private static final long serialVersionUID = 6214461492323186254L;
/**
* General explanation of the data producer's knowledge about the lineage of a dataset.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -43,7 +43,7 @@ public class DefaultNominalResolution ex
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -3337606314192690008L;
+ private static final long serialVersionUID = -4000422414866855607L;
/**
* Distance between consistent parts of (centre, left side, right side) adjacent pixels
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -62,7 +62,7 @@ public class DefaultProcessStep extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 8151975419390308233L;
+ private static final long serialVersionUID = -3511714360929580873L;
/**
* Description of the event, including related parameters or tolerances.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -45,7 +45,7 @@ public class DefaultProcessStepReport ex
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -7054783651586763896L;
+ private static final long serialVersionUID = -6413716753156038081L;
/**
* Name of the processing report.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -54,7 +54,7 @@ public class DefaultProcessing extends I
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -8032712379901591272L;
+ private static final long serialVersionUID = 5698533358975632857L;
/**
* Reference to document describing processing software.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -64,7 +64,7 @@ public class DefaultSource extends ISOMe
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 6277132009549470021L;
+ private static final long serialVersionUID = -398526682785377249L;
/**
* Detailed description of the level of the source data.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/package-info.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -38,31 +38,28 @@
* {@code └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessStepReport Process step report}<br>
* </td><td class="sep" width="50%" nowrap>
* {@linkplain org.apache.sis.metadata.iso.lineage.DefaultLineage Lineage}<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultSource Source}<br>
+ * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultNominalResolution Nominal resolution}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessStep Process step}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultSource Source}<br>
- * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultNominalResolution Nominal resolution}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessing Processing}<br>
* {@code │ └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultAlgorithm Algorithm}<br>
* {@code └─} {@linkplain org.apache.sis.metadata.iso.lineage.DefaultProcessStepReport Process step report}<br>
* </td></tr></table>
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -59,7 +59,7 @@ public class DefaultMaintenanceInformati
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 8523463344581266776L;
+ private static final long serialVersionUID = -5134544727860361898L;
/**
* Frequency with which changes and additions are made to the resource after the
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -57,7 +57,7 @@ public class DefaultScopeDescription ext
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -5671299759930976286L;
+ private static final long serialVersionUID = -2029119689389845656L;
/**
* Enumeration of possible values for {@link #property}.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/package-info.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -41,23 +41,20 @@
* {@code └─} {@linkplain org.apache.sis.metadata.iso.maintenance.DefaultScopeDescription Scope description}<br>
* </td></tr></table>
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object. Noticeable exceptions to this rule are <cite>union</cite>
+ * structures, for which only one property can be non-empty in the same object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/package-info.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -60,23 +60,19 @@
* {@link org.apache.sis.metadata.iso.DefaultMetadata#setLanguage setLanguage(Locale)} method
* will have precedence. The later behavior is compliant with INSPIRE rules.
*
- * {@section Collections and null values}
- * Unless otherwise noted in the Javadoc, all constructors and setter methods accept {@code null} argument.
+ * {@section Null values, nil objects and collections}
+ * All constructors (except the <cite>copy constructors</cite>) and setter methods accept {@code null} arguments.
* A null argument value means that the metadata element can not be provided, and the reason for that is unspecified.
* Alternatively, users can specify why a metadata element is missing by providing a value created by
* {@link org.apache.sis.xml.NilReason#createNilObject NilReason.createNilObject(Class)}.
*
* <p>Unless otherwise noted in the Javadoc, all getter methods may return an empty collection,
- * an empty array or {@code null} if there is no value. More specifically:</p>
- * <ul>
- * <li>If the return type is a collection, the method may return an empty collection (never {@code null}).</li>
- * <li>If the return type is an array, the method may return an empty array (never {@code null}).</li>
- * <li>Otherwise the method may return {@code null}.</li>
- * </ul>
+ * an empty array or {@code null} if the type is neither a collection or an array.
+ * Note that non-null values may be {@link org.apache.sis.xml.NilObject}s.</p>
*
- * Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
+ * <p>Unless the metadata object has been marked as unmodifiable and unless otherwise noted in the Javadoc,
* all collections returned by getter methods are <cite>live</cite>: adding new elements in the collection
- * modify directly the underlying metadata object.
+ * modify directly the underlying metadata object.</p>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -43,7 +43,7 @@ public class AbstractCompleteness extend
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -7893993264874215741L;
+ private static final long serialVersionUID = 8839542601508369777L;
/**
* Constructs an initially empty completeness.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -74,7 +74,7 @@ public class AbstractElement extends ISO
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -3542504624077298894L;
+ private static final long serialVersionUID = 3963454452767190970L;
/**
* Name of the test applied to the data.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -48,7 +48,7 @@ public class AbstractLogicalConsistency
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2470752876057569947L;
+ private static final long serialVersionUID = -1795493465311213248L;
/**
* Constructs an initially empty logical consistency.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -46,7 +46,7 @@ public class AbstractPositionalAccuracy
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 6043381860937480828L;
+ private static final long serialVersionUID = 1127147951521512624L;
/**
* Constructs an initially empty positional accuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -46,7 +46,7 @@ public class AbstractResult extends ISOM
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 2961355780515174732L;
+ private static final long serialVersionUID = 3510023908820052467L;
/**
* Constructs an initially empty result.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -45,7 +45,7 @@ public class AbstractTemporalAccuracy ex
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 4525353962603986621L;
+ private static final long serialVersionUID = -6273519060177989201L;
/**
* Constructs an initially empty temporal accuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -46,7 +46,7 @@ public class AbstractThematicAccuracy ex
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -781072634778767137L;
+ private static final long serialVersionUID = 7256282057348615018L;
/**
* Constructs an initially empty thematic accuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAbsoluteExternalPositionalAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -39,7 +39,7 @@ public class DefaultAbsoluteExternalPosi
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 4116627805950579738L;
+ private static final long serialVersionUID = -5520313307277547148L;
/**
* Constructs an initially empty absolute external positional accuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultAccuracyOfATimeMeasurement.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -38,7 +38,7 @@ public class DefaultAccuracyOfATimeMeasu
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -7934234071852119486L;
+ private static final long serialVersionUID = 2248263966450664491L;
/**
* Constructs an initially empty accuracy of a time measurement.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessCommission.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessCommission.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessCommission.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessCommission.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -36,7 +36,7 @@ public class DefaultCompletenessCommissi
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 1565144822249562765L;
+ private static final long serialVersionUID = 1941293019209523920L;
/**
* Constructs an initially empty completeness commission.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCompletenessOmission.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -36,7 +36,7 @@ public class DefaultCompletenessOmission
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 6614084398532053054L;
+ private static final long serialVersionUID = 6782225824097039360L;
/**
* Constructs an initially empty completeness omission.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConceptualConsistency.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -38,7 +38,7 @@ public class DefaultConceptualConsistenc
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7143342570712197486L;
+ private static final long serialVersionUID = -8842701325499002671L;
/**
* Constructs an initially empty conceptual consistency.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultConformanceResult.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -46,7 +46,7 @@ public class DefaultConformanceResult ex
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = -8746956498487963352L;
+ private static final long serialVersionUID = -2958690684356371311L;
/**
* Citation of product specification or user requirement against which data is being evaluated.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultCoverageResult.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -49,7 +49,7 @@ public class DefaultCoverageResult exten
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -5014701989643853577L;
+ private static final long serialVersionUID = 5860811052940576277L;
/**
* Method used to spatially represent the coverage result.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDataQuality.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -50,7 +50,7 @@ public class DefaultDataQuality extends
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7964896551368382214L;
+ private static final long serialVersionUID = 5036527927404894540L;
/**
* The specific data to which the data quality information applies.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultDomainConsistency.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -36,7 +36,7 @@ public class DefaultDomainConsistency ex
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -358082990944183859L;
+ private static final long serialVersionUID = -2397510938251794672L;
/**
* Constructs an initially empty domain consistency.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultFormatConsistency.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -37,7 +37,7 @@ public class DefaultFormatConsistency ex
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -1204766930140154729L;
+ private static final long serialVersionUID = -1891952351079148415L;
/**
* Constructs an initially empty formal consistency.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultGriddedDataPositionalAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -38,7 +38,7 @@ public class DefaultGriddedDataPositiona
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -3852184823135498458L;
+ private static final long serialVersionUID = 1006810371734607137L;
/**
* Constructs an initially empty gridded data positional acccuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultNonQuantitativeAttributeAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -37,7 +37,7 @@ public class DefaultNonQuantitativeAttri
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 2659617465862554345L;
+ private static final long serialVersionUID = -8777909940058192886L;
/**
* Constructs an initially empty non quantitative attribute accuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeAttributeAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -38,7 +38,7 @@ public class DefaultQuantitativeAttribut
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 7030401943270178746L;
+ private static final long serialVersionUID = 4190822658851541881L;
/**
* Constructs an initially empty quantitative attribute accuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultQuantitativeResult.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -46,7 +46,7 @@ public class DefaultQuantitativeResult e
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 1230713599561236060L;
+ private static final long serialVersionUID = -403671810118461829L;
/**
* Quantitative value or values, content determined by the evaluation procedure used.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultRelativeInternalPositionalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultRelativeInternalPositionalAccuracy.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultRelativeInternalPositionalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultRelativeInternalPositionalAccuracy.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -39,7 +39,7 @@ public class DefaultRelativeInternalPosi
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -8216355887797408106L;
+ private static final long serialVersionUID = 8385667875833802576L;
/**
* Constructs an initially empty relative internal positional accuracy.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultScope.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -46,7 +46,7 @@ public class DefaultScope extends ISOMet
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -8021256328527422972L;
+ private static final long serialVersionUID = -1152756005841712646L;
/**
* Hierarchical level of the data specified by the scope.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalConsistency.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -36,7 +36,7 @@ public class DefaultTemporalConsistency
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = -2549290466982699190L;
+ private static final long serialVersionUID = 5468604313098465903L;
/**
* Constructs an initially empty temporal consistency.
Modified: sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java?rev=1466471&r1=1466470&r2=1466471&view=diff
==============================================================================
--- sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java [UTF-8] (original)
+++ sis/branches/JDK6/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/DefaultTemporalValidity.java [UTF-8] Wed Apr 10 13:11:02 2013
@@ -36,7 +36,7 @@ public class DefaultTemporalValidity ext
/**
* Serial number for inter-operability with different versions.
*/
- private static final long serialVersionUID = 2866684429712027839L;
+ private static final long serialVersionUID = 7271555924670981058L;
/**
* Constructs an initially empty temporal validity.