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 2014/08/01 16:19:19 UTC
svn commit: r1615109 [2/4] - in /sis/branches/JDK6: ./
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/code/
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/
core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/met...
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.opengis.metadata.content.Feat
/**
* Information identifying the feature catalogue.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.apache.sis.util.ArgumentCheck
/**
* Information about the occurring feature type.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Rémi Maréchal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.5
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.apache.sis.measure.ValueRange
/**
* Information about an image's suitability for use.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeDimension.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -32,6 +32,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Information on the range of each dimension of a cell measurement value.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
@@ -176,7 +185,7 @@ public class DefaultRangeDimension exten
*
* @return Description of the range of a cell measurement value, or {@code null}.
*
- * @deprecated Renamed {@link #getDescription()} as of ISO 19115:2014.
+ * @deprecated As of ISO 19115:2014, renamed {@link #getDescription()}.
*/
@Override
@Deprecated
@@ -191,7 +200,7 @@ public class DefaultRangeDimension exten
*
* @param newValue The new descriptor.
*
- * @deprecated Renamed {@link #setDescription(InternationalString)}.
+ * @deprecated As of ISO 19115:2014, renamed {@link #setDescription(InternationalString)}.
*/
@Deprecated
public final void setDescriptor(final InternationalString newValue) {
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultRangeElementDescription.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -30,6 +30,15 @@ import org.apache.sis.xml.Namespaces;
/**
* Description of specific range elements.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.03)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultSampleDimension.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -31,6 +31,15 @@ import org.apache.sis.measure.ValueRange
/**
* The characteristic of each dimension (layer) included in the resource.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Remi Marechal (geomatys)
* @author Martin Desruisseaux (Geomatys)
* @version 0.5
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -30,6 +30,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Description of a transfer data file.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.03)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDigitalTransferOptions.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -31,6 +31,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Technical means and media by which a resource is obtained from the distributor.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistribution.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -30,6 +30,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Information about the distributor of and options for obtaining the resource.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDistributor.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -31,6 +31,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Information about the distributor.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -31,6 +31,15 @@ import org.apache.sis.util.iso.Types;
* Description of the computer language construct that specifies the representation
* of data objects in a record, file, message, storage device or transmission channel.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultMedium.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -32,6 +32,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Information about the media on which the resource can be distributed.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultStandardOrderProcess.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -32,6 +32,15 @@ import static org.apache.sis.internal.me
* Common ways in which the resource may be obtained or received, and related instructions
* and fee information.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/AbstractGeographicExtent.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -30,6 +30,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Base class for geographic area of the dataset.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultBoundingPolygon.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.opengis.metadata.extent.Bound
* (<var>x</var>,<var>y</var>) coordinates of the polygon.
* The last point replicates first point.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultExtent.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -48,6 +48,15 @@ import org.apache.sis.internal.metadata.
* <li>{@link Extents#getGeographicBoundingBox(Extent)} for extracting a global geographic bounding box.</li>
* </ul>
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicBoundingBox.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -86,6 +86,15 @@ import org.apache.sis.internal.jdk7.Obje
* If more precision is desired, an {@code Envelope} should be considered instead.
* </div>
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultGeographicDescription.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -28,6 +28,15 @@ import org.apache.sis.metadata.iso.Defau
/**
* Description of the geographic area using identifiers.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultSpatialTemporalExtent.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -33,6 +33,15 @@ import org.apache.sis.internal.metadata.
/**
* Extent with respect to date/time and spatial boundaries.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Rémi Maréchal (Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -44,6 +44,15 @@ import org.apache.sis.internal.metadata.
* <li>{@link #setBounds(Envelope)} for setting the extent from the given envelope.</li>
* </ul>
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultVerticalExtent.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -37,6 +37,15 @@ import org.apache.sis.internal.metadata.
* <li>{@link #setBounds(Envelope)} for setting the extent from the given envelope.</li>
* </ul>
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/AbstractIdentification.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -51,6 +51,15 @@ import org.apache.sis.util.iso.Types;
/**
* Basic information required to uniquely identify a resource or resources.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
@@ -723,7 +732,7 @@ public class AbstractIdentification exte
*
* @return Aggregate dataset information.
*
- * @deprecated Replaced by {@link #getAssociatedResources()} as of ISO 19115:2014.
+ * @deprecated As of ISO 19115:2014, replaced by {@link #getAssociatedResources()}.
*/
@Override
@Deprecated
@@ -749,7 +758,7 @@ public class AbstractIdentification exte
*
* @param newValues The new aggregation info.
*
- * @deprecated Replaced by {@link #setAssociatedResources(Collection)} as of ISO 19115:2014.
+ * @deprecated As of ISO 19115:2014, replaced by {@link #setAssociatedResources(Collection)}.
*/
@Deprecated
public void setAggregationInfo(final Collection<? extends AggregateInformation> newValues) {
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAggregateInformation.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -34,9 +34,17 @@ import org.apache.sis.metadata.iso.citat
* Aggregate dataset information.
*
* {@section Relationship between properties}
- * According ISO 19115, at least one of {@linkplain #getAggregateDataSetName() aggregate dataset
- * name} and {@linkplain #getAggregateDataSetIdentifier() aggregate dataset identifier} shall be
- * provided.
+ * According ISO 19115, at least one of {@linkplain #getAggregateDataSetName() aggregate dataset name}
+ * and {@linkplain #getAggregateDataSetIdentifier() aggregate dataset identifier} shall be provided.
+ *
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
*
* @author Guilhem Legal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
@@ -44,7 +52,7 @@ import org.apache.sis.metadata.iso.citat
* @version 0.5
* @module
*
- * @deprecated Replaced by {@link DefaultAssociatedResource} as of ISO 19115:2014.
+ * @deprecated As of ISO 19115:2014, replaced by {@link DefaultAssociatedResource}.
*/
@Deprecated
@XmlType(name = "MD_AggregateInformation_Type", propOrder = {
@@ -109,7 +117,7 @@ public class DefaultAggregateInformation
*
* @return Citation information about the aggregate dataset, or {@code null}.
*
- * @deprecated Replaced by {@link #getName()}.
+ * @deprecated As of ISO 19115:2014, replaced by {@link #getName()}.
*/
@Override
@Deprecated
@@ -123,7 +131,7 @@ public class DefaultAggregateInformation
*
* @param newValue The new citation.
*
- * @deprecated Replaced by {@link #setName(Citation)}.
+ * @deprecated As of ISO 19115:2014, replaced by {@link #setName(Citation)}.
*/
@Deprecated
public void setAggregateDataSetName(final Citation newValue) {
@@ -135,7 +143,7 @@ public class DefaultAggregateInformation
*
* @return Identification information about aggregate dataset, or {@code null}.
*
- * @deprecated Replaced by the first identifier of {@link #getAggregateDataSetName()}.
+ * @deprecated As of ISO 19115:2014, replaced by the first identifier of {@link #getAggregateDataSetName()}.
*/
@Override
@Deprecated
@@ -162,7 +170,7 @@ public class DefaultAggregateInformation
*
* @param newValue The new identifier.
*
- * @deprecated Replaced by an identifier of {@link #getAggregateDataSetName()}.
+ * @deprecated As of ISO 19115:2014, replaced by an identifier of {@link #getAggregateDataSetName()}.
*/
public void setAggregateDataSetIdentifier(final Identifier newValue) {
checkWritePermission();
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultAssociatedResource.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -33,6 +33,15 @@ import org.apache.sis.metadata.iso.ISOMe
* According ISO 19115, at least one of {@linkplain #getName() name} and
* {@linkplain #getMetadataReference() metadata reference} shall be provided.
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Rémi Maréchal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.5
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultBrowseGraphic.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -33,6 +33,15 @@ import org.apache.sis.internal.jaxb.gmx.
/**
* Graphic that provides an illustration of the dataset (should include a legend for the graphic).
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultDataIdentification.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -18,12 +18,12 @@ package org.apache.sis.metadata.iso.iden
import java.util.Collection;
import java.util.Locale;
+import java.nio.charset.Charset;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import org.opengis.metadata.extent.Extent;
import org.opengis.metadata.citation.Citation;
-import org.opengis.metadata.identification.CharacterSet;
import org.opengis.metadata.identification.TopicCategory;
import org.opengis.metadata.identification.DataIdentification;
import org.opengis.util.InternationalString;
@@ -34,6 +34,15 @@ import static org.apache.sis.internal.ja
/**
* Information required to identify a dataset.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
@@ -44,9 +53,9 @@ import static org.apache.sis.internal.ja
@XmlType(name = "MD_DataIdentification_Type", propOrder = {
"languages",
"characterSets",
- "legacy1", // topicCategories
+ "topicCategory",
"environmentDescription",
- "legacy2", // extents
+ "extent",
"supplementalInformation"
})
@XmlRootElement(name = "MD_DataIdentification")
@@ -54,7 +63,7 @@ public class DefaultDataIdentification e
/**
* Serial number for compatibility with different versions.
*/
- private static final long serialVersionUID = 6104637930243499850L;
+ private static final long serialVersionUID = 6104637930243499851L;
/**
* Language(s) used within the dataset.
@@ -64,7 +73,7 @@ public class DefaultDataIdentification e
/**
* Full name of the character coding standard used for the dataset.
*/
- private Collection<CharacterSet> characterSets;
+ private Collection<Charset> characterSets;
/**
* Description of the dataset in the producers processing environment, including items
@@ -114,7 +123,7 @@ public class DefaultDataIdentification e
super(object);
if (object != null) {
languages = copyCollection(object.getLanguages(), Locale.class);
- characterSets = copyCollection(object.getCharacterSets(), CharacterSet.class);
+ characterSets = copyCollection(object.getCharacterSets(), Charset.class);
environmentDescription = object.getEnvironmentDescription();
supplementalInformation = object.getSupplementalInformation();
}
@@ -146,9 +155,16 @@ public class DefaultDataIdentification e
}
/**
- * Returns the language(s) used within the dataset.
+ * Returns the language(s) used within the resource.
+ * The first element in iteration order shall be the default language.
+ * All other elements, if any, are alternate language(s) used within the resource.
+ *
+ * <p>The language string representations should use ISO 639-2 language code as
+ * returned by {@link Locale#getISO3Language()}.</p>
*
* @return Language(s) used.
+ *
+ * @see Locale#getISO3Language()
*/
@Override
@XmlElement(name = "language", required = true)
@@ -166,30 +182,30 @@ public class DefaultDataIdentification e
}
/**
- * Returns the full name of the character coding standard used for the dataset.
+ * Returns the character coding standard used for the dataset.
*
- * @return Name(s) of the character coding standard(s) used.
+ * @return Character coding standard(s) used.
*/
@Override
@XmlElement(name = "characterSet")
- public Collection<CharacterSet> getCharacterSets() {
- return characterSets = nonNullCollection(characterSets, CharacterSet.class);
+ public Collection<Charset> getCharacterSets() {
+ return characterSets = nonNullCollection(characterSets, Charset.class);
}
/**
- * Sets the full name of the character coding standard used for the dataset.
+ * Sets the character coding standard used for the dataset.
*
* @param newValues The new character sets.
*/
- public void setCharacterSets(final Collection<? extends CharacterSet> newValues) {
- characterSets = writeCollection(newValues, characterSets, CharacterSet.class);
+ public void setCharacterSets(final Collection<? extends Charset> newValues) {
+ characterSets = writeCollection(newValues, characterSets, Charset.class);
}
/**
- * Returns a description of the dataset in the producer's processing environment. This includes
+ * Returns a description of the resource in the producer's processing environment. This includes
* items such as the software, the computer operating system, file name, and the dataset size.
*
- * @return Description of the dataset in the producer's processing environment, or {@code null}.
+ * @return Description of the resource in the producer's processing environment, or {@code null}.
*/
@Override
@XmlElement(name = "environmentDescription")
@@ -198,7 +214,7 @@ public class DefaultDataIdentification e
}
/**
- * Sets the description of the dataset in the producers processing environment.
+ * Sets the description of the resource in the producers processing environment.
*
* @param newValue The new environment description.
*/
@@ -208,7 +224,7 @@ public class DefaultDataIdentification e
}
/**
- * Any other descriptive information about the dataset.
+ * Any other descriptive information about the resource.
*
* @return Other descriptive information, or {@code null}.
*/
@@ -219,7 +235,7 @@ public class DefaultDataIdentification e
}
/**
- * Sets any other descriptive information about the dataset.
+ * Sets any other descriptive information about the resource.
*
* @param newValue The new supplemental information.
*/
@@ -236,14 +252,14 @@ public class DefaultDataIdentification e
* For JAXB marhalling of ISO 19115:2003 document only.
*/
@XmlElement(name = "topicCategory")
- private Collection<TopicCategory> getLegacy1() {
+ private Collection<TopicCategory> getTopicCategory() {
return LEGACY_XML ? getTopicCategories() : null;
}
/**
* For JAXB unmarhalling of ISO 19115:2003 document only.
*/
- private void setLegacy1(final Collection<? extends TopicCategory> newValues) {
+ private void setTopicCategory(final Collection<? extends TopicCategory> newValues) {
setTopicCategories(newValues);
}
@@ -251,14 +267,14 @@ public class DefaultDataIdentification e
* For JAXB marhalling of ISO 19115:2003 document only.
*/
@XmlElement(name = "extent")
- private Collection<Extent> getLegacy2() {
+ private Collection<Extent> getExtent() {
return LEGACY_XML ? getExtents() : null;
}
/**
* For JAXB unmarhalling of ISO 19115:2003 document only.
*/
- private void setLegacy2(final Collection<? extends Extent> newValues) {
+ private void setExtent(final Collection<? extends Extent> newValues) {
setExtents(newValues);
}
}
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultKeywords.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -32,6 +32,15 @@ import org.apache.sis.util.iso.Types;
/**
* Keywords, their type and reference source.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultRepresentativeFraction.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -48,6 +48,15 @@ import static org.apache.sis.util.collec
* <li>{@link #setScale(double)} for computing the denominator from a scale value.</li>
* </ul>
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-2.4)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -40,6 +40,15 @@ import org.apache.sis.util.Workaround;
* See the {@linkplain #DefaultResolution(Resolution) constructor javadoc}
* for information about which property has precedence on copy operations.
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultUsage.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -35,6 +35,15 @@ import static org.apache.sis.internal.me
/**
* Brief description of ways in which the resource(s) is/are currently or has been used.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/package-info.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -32,7 +32,7 @@
* {@linkplain org.apache.sis.metadata.iso.ISOMetadata ISO-19115 metadata}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
* {@code │ ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification Data identification}<br>
- * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultServiceIdentification Service identification}<br>
+ * {@code │ └─} {@linkplain org.apache.sis.metadata.iso.service.DefaultServiceIdentification Service identification}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution Resolution}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultBrowseGraphic Browse graphic}<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultKeywords Keywords}<br>
@@ -43,23 +43,20 @@
* {@code ├─} {@linkplain org.opengis.metadata.identification.KeywordType Keyword type}<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.AssociationType Association type}<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.InitiativeType Initiative type}<br>
- * {@code ├─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category}<br>
- * {@code └─} {@linkplain org.opengis.metadata.identification.CharacterSet Character set}<br>
+ * {@code └─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category}<br>
* </td><td class="sep" style="width: 50%; white-space: nowrap">
* {@linkplain org.apache.sis.metadata.iso.identification.AbstractIdentification Identification} «abstract»<br>
+ * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution Resolution}<br>
+ * {@code ├─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category} «code list»<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>
* {@code │ └─} {@linkplain org.opengis.metadata.identification.KeywordType Keyword type} «code list»<br>
* {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultUsage Usage}<br>
- * {@code └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultAggregateInformation Aggregate information}<br>
+ * {@code └─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultAssociatedResource Associated resource}<br>
* {@code ├─} {@linkplain org.opengis.metadata.identification.AssociationType Association type} «code list»<br>
* {@code └─} {@linkplain org.opengis.metadata.identification.InitiativeType Initiative type} «code list»<br>
* {@linkplain org.apache.sis.metadata.iso.identification.DefaultDataIdentification Data identification}<br>
- * {@code ├─} {@linkplain org.apache.sis.metadata.iso.identification.DefaultResolution Resolution}<br>
- * {@code └─} {@linkplain org.opengis.metadata.identification.TopicCategory Topic category} «code list»<br>
- * {@linkplain org.apache.sis.metadata.iso.identification.DefaultServiceIdentification Service identification}<br>
- * {@linkplain org.opengis.metadata.identification.CharacterSet Character set} «code list»<br>
* </td></tr></table>
*
* <p>In addition to the standard properties, SIS provides the following methods:</p>
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultAlgorithm.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.apache.sis.xml.Namespaces;
/**
* Details of the methodology by which geographic information was derived from the instrument readings.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Cédric Briançon (Geomatys)
* @author Guilhem Legal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultLineage.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -35,8 +35,18 @@ import org.apache.sis.metadata.iso.quali
* Information about the events or source data used in constructing the data specified by
* the scope or lack of knowledge about lineage.
*
- * Only one of {@linkplain #getStatement statement}, {@linkplain #getProcessSteps process steps}
- * and {@link #getSources sources} should be provided.
+ * {@section Relationship between properties}
+ * Only one of {@linkplain #getStatement statement}, {@linkplain #getProcessSteps() process steps}
+ * and {@link #getSources() sources} should be provided.
+ *
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultNominalResolution.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -28,6 +28,15 @@ import org.apache.sis.xml.Namespaces;
/**
* Distance between consistent parts of (centre, left side, right side) adjacent pixels.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Cédric Briançon (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.3 (derived from geotk-3.03)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStep.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -42,6 +42,15 @@ import static org.apache.sis.internal.me
* Information about an event or transformation in the life of a resource.
* Includes the process used to maintain the resource.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepReport.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -28,6 +28,15 @@ import org.apache.sis.xml.Namespaces;
/**
* Report of what occurred during the process step.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Cédric Briançon (Geomatys)
* @author Guilhem Legal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultProcessing.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -31,8 +31,16 @@ import org.apache.sis.internal.jaxb.NonM
/**
- * Comprehensive information about the procedure(s), process(es) and algorithm(s) applied
- * in the process step.
+ * Comprehensive information about the procedure(s), process(es) and algorithm(s) applied in the process step.
+ *
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
*
* @author Cédric Briançon (Geomatys)
* @author Guilhem Legal (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/lineage/DefaultSource.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -46,6 +46,15 @@ import org.apache.sis.xml.Namespaces;
* According ISO 19115, at least one of {@linkplain #getDescription() description} and
* {@linkplain #getSourceExtents() source extents} shall be provided.
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
@@ -233,7 +242,7 @@ public class DefaultSource extends ISOMe
*
* @return Representative fraction on a source map, or {@code null}.
*
- * @deprecated Moved to {@link DefaultResolution#getEquivalentScale()}.
+ * @deprecated As of ISO 19115:2014, moved to {@link DefaultResolution#getEquivalentScale()}.
*/
@Override
@Deprecated
@@ -250,7 +259,7 @@ public class DefaultSource extends ISOMe
*
* @param newValue The new scale denominator.
*
- * @deprecated Moved to {@link DefaultResolution#setEquivalentScale(RepresentativeFraction)}.
+ * @deprecated As of ISO 19115:2014, moved to {@link DefaultResolution#setEquivalentScale(RepresentativeFraction)}.
*/
@Deprecated
public final void setScaleDenominator(final RepresentativeFraction newValue) {
@@ -364,7 +373,7 @@ public class DefaultSource extends ISOMe
*
* @return Information about the extent of the source data.
*
- * @deprecated Moved to {@link DefaultScope#getExtent()}.
+ * @deprecated As of ISO 19115:2014, moved to {@link DefaultScope#getExtent()}.
*/
@Override
@Deprecated
@@ -384,7 +393,7 @@ public class DefaultSource extends ISOMe
*
* @param newValues The new source extents.
*
- * @deprecated Moved to {@link DefaultScope#setExtent(Extent)}.
+ * @deprecated As of ISO 19115:2014, moved to {@link DefaultScope#setExtent(Extent)}.
*/
@Deprecated
public final void setSourceExtents(final Collection<? extends Extent> newValues) {
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMaintenanceInformation.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -40,6 +40,15 @@ import org.apache.sis.internal.metadata.
/**
* Information about the scope and frequency of updating.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
@@ -339,7 +348,7 @@ public class DefaultMaintenanceInformati
*
* @param newValues The new update scopes.
*
- * @deprecated Replaced by {@link #setMaintenanceScopes(Collection)}.
+ * @deprecated As of ISO 19115:2014, replaced by {@link #setMaintenanceScopes(Collection)}.
*/
@Deprecated
public final void setUpdateScopes(final Collection<? extends ScopeCode> newValues) {
@@ -392,7 +401,7 @@ public class DefaultMaintenanceInformati
*
* @param newValues The new update scope descriptions.
*
- * @deprecated Replaced by {@link #setMaintenanceScopes(Collection)}.
+ * @deprecated As of ISO 19115:2014, replaced by {@link #setMaintenanceScopes(Collection)}.
*/
@Deprecated
public final void setUpdateScopeDescriptions(final Collection<? extends ScopeDescription> newValues) {
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMetadataScope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMetadataScope.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMetadataScope.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultMetadataScope.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -28,6 +28,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Information about the scope of the resource.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Rémi Maréchal (Geomatys)
* @author Martin Desruisseaux (Geomatys)
* @since 0.5
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/DefaultScopeDescription.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -40,6 +40,15 @@ import static org.apache.sis.util.collec
* only one of the properties in this class can be set to a non-empty value.
* Setting any property to a non-empty value discard all the other ones.
*
+ * {@section Limitations}
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Cédric Briançon (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractCompleteness.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -27,6 +27,15 @@ import org.opengis.metadata.quality.Comp
/**
* Presence and absence of features, their attributes and their relationships.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @since 0.3 (derived from geotk-2.1)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractElement.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -48,6 +48,15 @@ import static org.apache.sis.internal.ja
/**
* Type of test applied to the data specified by a data quality scope.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @author Guilhem Legal (Geomatys)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractLogicalConsistency.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -27,8 +27,17 @@ import org.opengis.metadata.quality.Conc
/**
- * Degree of adherence to logical rules of data structure, attribution and relationships (data
- * structure can be conceptual, logical or physical).
+ * Degree of adherence to logical rules of data structure, attribution and relationships.
+ * Data structure can be conceptual, logical or physical.
+ *
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracy.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.opengis.metadata.quality.Rela
/**
* Accuracy of the position of features.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @since 0.3 (derived from geotk-2.1)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractResult.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.apache.sis.metadata.iso.ISOMe
/**
* Type of test applied to the data specified by a data quality scope.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @since 0.3 (derived from geotk-2.1)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractTemporalAccuracy.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -28,6 +28,15 @@ import org.opengis.metadata.quality.Accu
/**
* Accuracy of the temporal attributes and temporal relationships of features.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @since 0.3 (derived from geotk-2.1)
Modified: sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java?rev=1615109&r1=1615108&r2=1615109&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/quality/AbstractThematicAccuracy.java [UTF-8] Fri Aug 1 14:19:16 2014
@@ -29,6 +29,15 @@ import org.opengis.metadata.quality.Quan
* Accuracy of quantitative attributes and the correctness of non-quantitative attributes
* and of the classifications of features and their relationships.
*
+ * <p><b>Limitations:</b></p>
+ * <ul>
+ * <li>Instances of this class are not synchronized for multi-threading.
+ * Synchronization, if needed, is caller's responsibility.</li>
+ * <li>Serialized objects of this class are not guaranteed to be compatible with future Apache SIS releases.
+ * Serialization support is appropriate for short term storage or RMI between applications running the
+ * same version of Apache SIS. For long term storage, use {@link org.apache.sis.xml.XML} instead.</li>
+ * </ul>
+ *
* @author Martin Desruisseaux (IRD, Geomatys)
* @author Touraïvane (IRD)
* @since 0.3 (derived from geotk-2.1)