sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1760780 [1/11] - in /sis/branches/JDK7: ./ application/sis-webapp/src/test/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/metadata/ core/sis-metadata/src/main/java/org/apache/sis/meta...
Date Wed, 14 Sep 2016 21:29:51 GMT
Author: desruisseaux
Date: Wed Sep 14 21:29:50 2016
New Revision: 1760780

URL: http://svn.apache.org/viewvc?rev=1760780&view=rev
Log:
Merge from the JDK8 branch. Those commits include the removal of o.a.s.storage.internal.impl.Attribute.dateToISO(String) method,
which is replaced by the use of java.time.format package on the JDK8 branch. Since that package is not available on JDK7, this
merge rather retrofit the 'dateToISO' method into the o.a.s.internal.util.StandardDateFormat class.

Added:
    sis/branches/JDK7/application/sis-webapp/src/test/
      - copied from r1760700, sis/branches/JDK8/application/sis-webapp/src/test/
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/Consumer.java   (with props)
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/Spliterator.java   (with props)
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/Stream.java   (with props)
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/StreamSupport.java   (with props)
    sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml~
      - copied, changed from r1760700, sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FixedSizeList.java
      - copied unchanged from r1760700, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/FixedSizeList.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/GeometryParser.java
      - copied unchanged from r1760700, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/GeometryParser.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/StoreProvider.java
      - copied unchanged from r1760700, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/StoreProvider.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreReferencingException.java
      - copied unchanged from r1760700, sis/branches/JDK8/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreReferencingException.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
      - copied unchanged from r1760700, sis/branches/JDK8/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreProviderTest.java
Removed:
    sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatKeys.java
Modified:
    sis/branches/JDK7/   (props changed)
    sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/extent/DefaultTemporalExtent.java
    sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/identification/DefaultResolution.java
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/metadata/PropertyAccessorTest.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/GeodeticObjectBuilder.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ReferencingUtilities.java
    sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/parameter/IntegerList.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ArrayConverter.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/Instant.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/OffsetDateTime.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/OffsetTime.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/Temporal.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Utilities.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/CompoundFormat.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ArraysExt.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
    sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/UtilitiesTest.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
    sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
    sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
    sis/branches/JDK7/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/doc-files/LandsatMetadata.html
    sis/branches/JDK7/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
    sis/branches/JDK7/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/GeoTiffStore.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Axis.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/GridGeometry.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Variable.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Attribute.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/Dimension.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/VariableInfo.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/package-info.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/package-info.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/VariableWrapper.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/package-info.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/NetcdfStore.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/package-info.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/impl/AttributeTest.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/MetadataBuilder.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/StoreTypeDetector.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/Store.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/TimeEncoding.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/csv/package-info.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/wkt/Store.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/xml/Store.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStore.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreClosedException.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreContentException.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreRegistry.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStores.java
    sis/branches/JDK7/storage/sis-storage/src/main/resources/META-INF/services/org.apache.sis.storage.DataStoreProvider
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/MetadataBuilderTest.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/csv/StoreTest.java
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java

Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 21:29:50 2016
@@ -1,4 +1,4 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394913-1508480
-/sis/branches/JDK8:1584960-1758905
+/sis/branches/JDK8:1584960-1760700
 /sis/trunk:1394364-1508466,1519089-1519674

Modified: sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -16,8 +16,6 @@
  */
 package org.apache.sis.feature;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -36,6 +34,7 @@ import org.apache.sis.util.CharSequences
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Vocabulary;
+import org.apache.sis.internal.util.CollectionsExt;
 import org.apache.sis.referencing.IdentifiedObjects;
 
 // Branch-dependent imports
@@ -96,6 +95,16 @@ public class FeatureFormat extends Tabul
     private final Locale displayLocale;
 
     /**
+     * Maximal length of attribute values, in number of characters.
+     * If a value is longer than this length, it will be truncated.
+     *
+     * <p>This is defined as a static final variable for now because its value is approximative:
+     * it is a number of characters instead than a number of code points, and that length may be
+     * exceeded by a few characters if the overflow happen while appending the list separator.</p>
+     */
+    private static final int MAXIMAL_VALUE_LENGTH = 40;
+
+    /**
      * Creates a new formatter for the default locale and timezone.
      */
     public FeatureFormat() {
@@ -328,15 +337,14 @@ header: for (int i=0; ; i++) {
              * Column 3 - Value or default value.
              */
             if (value != null) {
-                final boolean isInstance = valueClass != null && valueClass.isInstance(value);
-                final Format format = isInstance ? getFormat(valueClass) : null;
-                final Iterator<?> it = (!isInstance && (value instanceof Collection<?>)
-                        ? (Iterable<?>) value : Collections.singleton(value)).iterator();
+                final Format format = getFormat(valueClass);                            // Null if valueClass is null.
+                final Iterator<?> it = CollectionsExt.toCollection(value).iterator();
                 String separator = "";
+                int length = 0;
                 while (it.hasNext()) {
                     value = it.next();
                     if (value != null) {
-                        if (format != null) {
+                        if (format != null && valueClass.isInstance(value)) {
                             value = format.format(value, buffer, dummyFP);
                         } else if (value instanceof Feature && propertyType instanceof FeatureAssociationRole) {
                             final String p = DefaultAssociationRole.getTitleProperty((FeatureAssociationRole) propertyType);
@@ -345,9 +353,10 @@ header: for (int i=0; ; i++) {
                                 if (value == null) continue;
                             }
                         }
-                        table.append(separator).append(formatValue(value));
+                        length = formatValue(value, table.append(separator), length);
                         buffer.setLength(0);
                         separator = ", ";
+                        if (length < 0) break;      // Value is too long, abandon remaining iterations.
                     }
                 }
             }
@@ -368,7 +377,7 @@ header: for (int i=0; ; i++) {
                             }
                         }
                         if (c != null) {
-                            table.append(" = ").append(formatValue(c));
+                            formatValue(c, table.append(" = "), 0);
                         }
                         separator = ", ";
                     }
@@ -398,19 +407,35 @@ header: for (int i=0; ; i++) {
     }
 
     /**
-     * Formats the given attribute value.
+     * Appends the given attribute value, in a truncated form if it exceed the maximal value length.
+     *
+     * @param  value   the value to append.
+     * @param  table   where to append the value.
+     * @param  length  number of characters appended before this method call in the current table cell.
+     * @return number of characters appended after this method call in the current table cell, or -1 if
+     *         the length exceed the maximal length (in which case the caller should break iteration).
      */
-    private String formatValue(final Object value) {
+    private int formatValue(final Object value, final TableAppender table, final int length) {
+        final String text;
         if (value instanceof InternationalString) {
-            return ((InternationalString) value).toString(displayLocale);
+            text = ((InternationalString) value).toString(displayLocale);
         } else if (value instanceof GenericName) {
-            return toString((GenericName) value);
+            text = toString((GenericName) value);
         } else if (value instanceof IdentifiedType) {
-            return toString(((IdentifiedType) value).getName());
+            text = toString(((IdentifiedType) value).getName());
         } else if (value instanceof IdentifiedObject) {
-            return IdentifiedObjects.getIdentifierOrName((IdentifiedObject) value);
+            text = IdentifiedObjects.getIdentifierOrName((IdentifiedObject) value);
+        } else {
+            text = value.toString();
+        }
+        final int remaining = MAXIMAL_VALUE_LENGTH - length;
+        if (remaining >= text.length()) {
+            table.append(text);
+            return length + text.length();
+        } else {
+            table.append(text, 0, Math.max(0, remaining - 1)).append('…');
+            return -1;
         }
-        return value.toString();
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/ModifiableMetadata.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -163,7 +163,7 @@ public abstract class ModifiableMetadata
      *       {@linkplain #freeze() freeze} the clone before to return it.</li>
      * </ul>
      *
-     * @return An unmodifiable copy of this metadata.
+     * @return an unmodifiable copy of this metadata.
      */
     public AbstractMetadata unmodifiable() {
         // Reminder: 'unmodifiable' is reset to null by checkWritePermission().
@@ -260,11 +260,11 @@ public abstract class ModifiableMetadata
      *   <li>Copies the content of the given {@code source} into the target.</li>
      * </ul>
      *
-     * @param  <E>         The type represented by the {@code Class} argument.
-     * @param  source      The source list, or {@code null}.
-     * @param  target      The target list, or {@code null} if not yet created.
-     * @param  elementType The base type of elements to put in the list.
-     * @return A list (possibly the {@code target} instance) containing the {@code source}
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  source       the source list, or {@code null}.
+     * @param  target       the target list, or {@code null} if not yet created.
+     * @param  elementType  the base type of elements to put in the list.
+     * @return a list (possibly the {@code target} instance) containing the {@code source}
      *         elements, or {@code null} if the source was null.
      * @throws UnmodifiableMetadataException if this metadata is unmodifiable.
      *
@@ -307,11 +307,11 @@ public abstract class ModifiableMetadata
      *   <li>Copies the content of the given {@code source} into the target.</li>
      * </ul>
      *
-     * @param  <E>         The type represented by the {@code Class} argument.
-     * @param  source      The source set, or {@code null}.
-     * @param  target      The target set, or {@code null} if not yet created.
-     * @param  elementType The base type of elements to put in the set.
-     * @return A set (possibly the {@code target} instance) containing the {@code source} elements,
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  source       the source set, or {@code null}.
+     * @param  target       the target set, or {@code null} if not yet created.
+     * @param  elementType  the base type of elements to put in the set.
+     * @return a set (possibly the {@code target} instance) containing the {@code source} elements,
      *         or {@code null} if the source was null.
      * @throws UnmodifiableMetadataException if this metadata is unmodifiable.
      *
@@ -362,11 +362,11 @@ public abstract class ModifiableMetadata
      * implementor choice. The default implementation invokes {@link #collectionType(Class)}
      * in order to get a hint about whether a {@link List} or a {@link Set} should be used.
      *
-     * @param  <E>         The type represented by the {@code Class} argument.
-     * @param  source      The source collection, or {@code null}.
-     * @param  target      The target collection, or {@code null} if not yet created.
-     * @param  elementType The base type of elements to put in the collection.
-     * @return A collection (possibly the {@code target} instance) containing the {@code source} elements,
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  source       the source collection, or {@code null}.
+     * @param  target       the target collection, or {@code null} if not yet created.
+     * @param  elementType  the base type of elements to put in the collection.
+     * @return a collection (possibly the {@code target} instance) containing the {@code source} elements,
      *         or {@code null} if the source was null.
      * @throws UnmodifiableMetadataException if this metadata is unmodifiable.
      */
@@ -415,10 +415,10 @@ public abstract class ModifiableMetadata
      * or returns {@code null} if the source is {@code null} or empty.
      * This is a convenience method for copying fields in subclass copy constructors.
      *
-     * @param  <E>         The type represented by the {@code Class} argument.
-     * @param  source      The source collection, or {@code null}.
-     * @param  elementType The base type of elements to put in the list.
-     * @return A list containing the {@code source} elements,
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  source       the source collection, or {@code null}.
+     * @param  elementType  the base type of elements to put in the list.
+     * @return a list containing the {@code source} elements,
      *         or {@code null} if the source was null or empty.
      */
     protected final <E> List<E> copyList(final Collection<? extends E> source, final Class<E> elementType) {
@@ -435,10 +435,10 @@ public abstract class ModifiableMetadata
      * or returns {@code null} if the source is {@code null} or empty.
      * This is a convenience method for copying fields in subclass copy constructors.
      *
-     * @param  <E>         The type represented by the {@code Class} argument.
-     * @param  source      The source collection, or {@code null}.
-     * @param  elementType The base type of elements to put in the set.
-     * @return A set containing the {@code source} elements,
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  source       the source collection, or {@code null}.
+     * @param  elementType  the base type of elements to put in the set.
+     * @return a set containing the {@code source} elements,
      *         or {@code null} if the source was null or empty.
      */
     protected final <E> Set<E> copySet(final Collection<? extends E> source, final Class<E> elementType) {
@@ -458,10 +458,10 @@ public abstract class ModifiableMetadata
      * <p>The collection type is selected as described in the
      * {@link #nonNullCollection(Collection, Class)}.</p>
      *
-     * @param  <E>         The type represented by the {@code Class} argument.
-     * @param  source      The source collection, or {@code null}.
-     * @param  elementType The base type of elements to put in the collection.
-     * @return A collection containing the {@code source} elements,
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  source       the source collection, or {@code null}.
+     * @param  elementType  the base type of elements to put in the collection.
+     * @return a collection containing the {@code source} elements,
      *         or {@code null} if the source was null or empty.
      */
     protected final <E> Collection<E> copyCollection(final Collection<? extends E> source, final Class<E> elementType) {
@@ -486,10 +486,10 @@ public abstract class ModifiableMetadata
      * <p>The collection type is selected as described in the
      * {@link #nonNullCollection(Collection, Class)}.</p>
      *
-     * @param  <E>         The type represented by the {@code Class} argument.
-     * @param  value       The singleton value to put in the returned collection, or {@code null}.
-     * @param  elementType The element type (used only if {@code value} is non-null).
-     * @return A new modifiable collection containing the given value,
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  value        the singleton value to put in the returned collection, or {@code null}.
+     * @param  elementType  the element type (used only if {@code value} is non-null).
+     * @return a new modifiable collection containing the given value,
      *         or {@code null} if the given value was null.
      */
     protected final <E> Collection<E> singleton(final E value, final Class<E> elementType) {
@@ -521,9 +521,9 @@ public abstract class ModifiableMetadata
      * Returns the specified list, or a new one if {@code c} is null.
      * This is a convenience method for implementation of {@code getFoo()} methods.
      *
-     * @param  <E> The type represented by the {@code Class} argument.
-     * @param  c The existing list, or {@code null} if the list has not yet been created.
-     * @param  elementType The element type (used only if {@code c} is null).
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  c            the existing list, or {@code null} if the list has not yet been created.
+     * @param  elementType  the element type (used only if {@code c} is null).
      * @return {@code c}, or a new list if {@code c} is null.
      */
     protected final <E> List<E> nonNullList(final List<E> c, final Class<E> elementType) {
@@ -550,9 +550,9 @@ public abstract class ModifiableMetadata
      * Returns the specified set, or a new one if {@code c} is null.
      * This is a convenience method for implementation of {@code getFoo()} methods.
      *
-     * @param  <E> The type represented by the {@code Class} argument.
-     * @param  c The existing set, or {@code null} if the set has not yet been created.
-     * @param  elementType The element type (used only if {@code c} is null).
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  c            the existing set, or {@code null} if the set has not yet been created.
+     * @param  elementType  the element type (used only if {@code c} is null).
      * @return {@code c}, or a new set if {@code c} is null.
      */
     protected final <E> Set<E> nonNullSet(final Set<E> c, final Class<E> elementType) {
@@ -573,16 +573,15 @@ public abstract class ModifiableMetadata
      * This is a convenience method for implementation of {@code getFoo()} methods.
      *
      * <div class="section">Choosing a collection type</div>
-     * Implementations shall invoke {@link #nonNullList nonNullList(…)} or {@link #nonNullSet
-     * nonNullSet(…)} instead than this method when the collection type is enforced by ISO
-     * specification. When the type is not enforced by the specification, some freedom are
-     * allowed at implementor choice. The default implementation invokes
-     * {@link #collectionType(Class)} in order to get a hint about whether a {@link List}
-     * or a {@link Set} should be used.
-     *
-     * @param  <E> The type represented by the {@code Class} argument.
-     * @param  c The existing collection, or {@code null} if the collection has not yet been created.
-     * @param  elementType The element type (used only if {@code c} is null).
+     * Implementations shall invoke {@link #nonNullList nonNullList(…)} or {@link #nonNullSet nonNullSet(…)}
+     * instead than this method when the collection type is enforced by ISO specification.
+     * When the type is not enforced by the specification, some freedom are allowed at implementor choice.
+     * The default implementation invokes {@link #collectionType(Class)} in order to get a hint about whether
+     * a {@link List} or a {@link Set} should be used.
+     *
+     * @param  <E>          the type represented by the {@code Class} argument.
+     * @param  c            the existing collection, or {@code null} if the collection has not yet been created.
+     * @param  elementType  the element type (used only if {@code c} is null).
      * @return {@code c}, or a new collection if {@code c} is null.
      */
     protected final <E> Collection<E> nonNullCollection(final Collection<E> c, final Class<E> elementType) {
@@ -643,14 +642,14 @@ public abstract class ModifiableMetadata
      * versions may accept other types.
      *
      * <p>The default implementation returns <code>{@linkplain Set}.class</code> if the element type
-     * is assignable to {@link CodeList}, {@link Enum}, {@link String}, {@link Charset}, {@link Locale}
-     * or {@link Currency}, and <code>{@linkplain List}.class</code> otherwise.
+     * is assignable to {@link CodeList}, {@link Enum}, {@link String}, {@link Charset},
+     * {@link Locale} or {@link Currency}, and <code>{@linkplain List}.class</code> otherwise.
      * Subclasses can override this method for choosing different kind of collections.
      * <em>Note however that {@link Set} should be used only with immutable element types</em>,
      * for {@linkplain Object#hashCode() hash code} stability.</p>
      *
-     * @param  <E> The type of elements in the collection to be created.
-     * @param  elementType The type of elements in the collection to be created.
+     * @param  <E>          the type of elements in the collection to be created.
+     * @param  elementType  the type of elements in the collection to be created.
      * @return {@code List.class} or {@code Set.class} depending on whether the
      *         property shall accept duplicated values or not.
      */
@@ -666,14 +665,21 @@ public abstract class ModifiableMetadata
     }
 
     /**
-     * Returns a shallow copy of this metadata.
-     * While {@linkplain Cloneable cloneable}, this class does not provides the {@code clone()}
-     * operation as part of the public API. The clone operation is required for the internal
-     * working of the {@link #unmodifiable()} method, which needs <em>shallow</em>
-     * copies of metadata entities. The default {@link Object#clone()} implementation is
-     * sufficient in most cases.
+     * Creates a <strong>shallow</strong> copy of this metadata.
+     * The clone operation is required for the internal working of the {@link #unmodifiable()} method,
+     * which needs <em>shallow</em> copies of metadata entities.
+     *
+     * <div class="section">API note</div>
+     * While {@link Cloneable}, the {@code ModifiableMetadata} subclasses should not provide
+     * the {@code clone()} operation as part of their public API, because the cloned object
+     * share reference to the same collections than the original object.
+     *
+     * <div class="section">Note for subclass implementors</div>
+     * The default {@link Object#clone()} implementation is sufficient in most cases.
+     * The need to override this method should be rare, but may happen if the object
+     * contains for example connection to a database.
      *
-     * @return A <em>shallow</em> copy of this metadata.
+     * @return a <em>shallow</em> copy of this metadata.
      * @throws CloneNotSupportedException if the clone is not supported.
      */
     @Override

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/DefaultFeatureTypeList.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -71,8 +71,8 @@ public class DefaultFeatureTypeList exte
     /**
      * Creates a feature type list initialized to the given values.
      *
-     * @param spatialObject The instance of a type defined in the spatial schema, or {@code null} if none.
-     * @param spatialSchemaName The name of the spatial schema used, or {@code null} if none.
+     * @param spatialObject  the instance of a type defined in the spatial schema, or {@code null} if none.
+     * @param spatialSchemaName  the name of the spatial schema used, or {@code null} if none.
      */
     public DefaultFeatureTypeList(final String spatialObject, final String spatialSchemaName) {
         this.spatialObject     = spatialObject;
@@ -84,7 +84,7 @@ public class DefaultFeatureTypeList exte
      * This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
      * given object are not recursively copied.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param object the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(FeatureTypeList)
      */
@@ -110,8 +110,8 @@ public class DefaultFeatureTypeList exte
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultFeatureTypeList castOrCopy(final FeatureTypeList object) {
@@ -124,7 +124,7 @@ public class DefaultFeatureTypeList exte
     /**
      * Instance of a type defined in the spatial schema.
      *
-     * @return Instance of a type defined in the spatial schema, or {@code null}.
+     * @return instance of a type defined in the spatial schema, or {@code null}.
      */
     @Override
     @XmlElement(name = "spatialObject", required = true)
@@ -135,7 +135,7 @@ public class DefaultFeatureTypeList exte
     /**
      * Sets the instance of a type defined in the spatial schema.
      *
-     * @param newValue The new spatial object.
+     * @param newValue  the new spatial object.
      */
     public void setSpatialObject(final String newValue) {
         checkWritePermission();
@@ -145,7 +145,7 @@ public class DefaultFeatureTypeList exte
     /**
      * Name of the spatial schema used.
      *
-     * @return Name of the spatial schema used, or {@code null}.
+     * @return name of the spatial schema used, or {@code null}.
      */
     @Override
     @XmlElement(name = "spatialSchemaName", required = true)
@@ -156,7 +156,7 @@ public class DefaultFeatureTypeList exte
     /**
      * Sets the name of the spatial schema used.
      *
-     * @param newValue The new spatial schema.
+     * @param newValue  the new spatial schema.
      */
     public void setSpatialSchemaName(final String newValue) {
         checkWritePermission();

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/ISOMetadata.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -81,7 +81,7 @@ public class ISOMetadata extends Modifia
      * If the given object is an instance of {@link IdentifiedObject}, then this constructor
      * copies the {@linkplain #identifiers collection of identifiers}.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      */
     protected ISOMetadata(final Object object) {
         if (object instanceof IdentifiedObject) {
@@ -113,7 +113,7 @@ public class ISOMetadata extends Modifia
      * since this method may be indirectly invoked by copy constructors (i.e. is may be
      * invoked before this metadata object is fully constructed).
      *
-     * @return The metadata standard, which is {@linkplain MetadataStandard#ISO_19115 ISO 19115} by default.
+     * @return the metadata standard, which is {@linkplain MetadataStandard#ISO_19115 ISO 19115} by default.
      */
     @Override
     public MetadataStandard getStandard() {

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/acquisition/package-info.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -50,24 +50,24 @@
  * {@code  ├─} {@linkplain org.opengis.metadata.acquisition.GeometryType  Geometry type}<br>
  * {@code  └─} {@linkplain org.opengis.metadata.acquisition.OperationType Operation type}<br>
  * </td><td class="sep" style="width: 50%; white-space: nowrap">
- *                             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultAcquisitionInformation Acquisition information}<br>
- * {@code  ├─}                 {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultObjective              Objective}<br>
- * {@code  │   ├─}             {@linkplain org.opengis.metadata.acquisition.ObjectiveType                        Objective type} «code list»<br>
- * {@code  │   ├─}             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatformPass           Platform pass}<br>
- * {@code  │   │   └─}         {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEvent                  Event}<br>
- * {@code  │   │       ├─}     {@linkplain org.opengis.metadata.acquisition.Trigger                              Trigger} «code list»<br>
- * {@code  │   │       ├─}     {@linkplain org.opengis.metadata.acquisition.Context                              Context} «code list»<br>
- * {@code  │   │       └─}     {@linkplain org.opengis.metadata.acquisition.Sequence                             Sequence} «code list»<br>
- * {@code  │   ├─}             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequirement            Requirement}<br>
- * {@code  │   │   ├─}         {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequestedDate          Requested date}<br>
- * {@code  │   │   └─}         {@linkplain org.opengis.metadata.acquisition.Priority                             Priority} «code list»<br>
- * {@code  │   └─}             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlan                   Plan}<br>
- * {@code  │       ├─}         {@linkplain org.opengis.metadata.acquisition.GeometryType                         Geometry type} «code list»<br>
- * {@code  │       └─}         {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultOperation              Operation}<br>
- * {@code  │           ├─}     {@linkplain org.opengis.metadata.acquisition.OperationType                        Operation type} «code list»<br>
- * {@code  │           └─}     {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatform               Platform}<br>
- * {@code  │               └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultInstrument             Instrument}<br>
- * {@code  └─}                 {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord    Environmental record}<br>
+ *                         {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultAcquisitionInformation Acquisition information}<br>
+ * {@code  ├─}             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequirement            Requirement}<br>
+ * {@code  │   ├─}         {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultRequestedDate          Requested date}<br>
+ * {@code  │   └─}         {@linkplain org.opengis.metadata.acquisition.Priority                             Priority} «code list»<br>
+ * {@code  ├─}             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultObjective              Objective}<br>
+ * {@code  │   ├─}         {@linkplain org.opengis.metadata.acquisition.ObjectiveType                        Objective type} «code list»<br>
+ * {@code  │   └─}         {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatformPass           Platform pass}<br>
+ * {@code  │       └─}     {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEvent                  Event}<br>
+ * {@code  │           ├─} {@linkplain org.opengis.metadata.acquisition.Trigger                              Trigger} «code list»<br>
+ * {@code  │           ├─} {@linkplain org.opengis.metadata.acquisition.Context                              Context} «code list»<br>
+ * {@code  │           └─} {@linkplain org.opengis.metadata.acquisition.Sequence                             Sequence} «code list»<br>
+ * {@code  ├─}             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlan                   Plan}<br>
+ * {@code  │   ├─}         {@linkplain org.opengis.metadata.acquisition.GeometryType                         Geometry type} «code list»<br>
+ * {@code  │   └─}         {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultOperation              Operation}<br>
+ * {@code  │       ├─}     {@linkplain org.opengis.metadata.acquisition.OperationType                        Operation type} «code list»<br>
+ * {@code  │       └─}     {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultPlatform               Platform}<br>
+ * {@code  │           └─} {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultInstrument             Instrument}<br>
+ * {@code  └─}             {@linkplain org.apache.sis.metadata.iso.acquisition.DefaultEnvironmentalRecord    Environmental record}<br>
  * </td></tr></table>
  *
  * <div class="section">Null values, nil objects and collections</div>

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/AbstractContentInformation.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -67,7 +67,7 @@ public class AbstractContentInformation
      * This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
      * given object are not recursively copied.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param object  the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(ContentInformation)
      */
@@ -94,8 +94,8 @@ public class AbstractContentInformation
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static AbstractContentInformation castOrCopy(final ContentInformation object) {

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultCoverageDescription.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -101,7 +101,7 @@ public class DefaultCoverageDescription
      * This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
      * given object are not recursively copied.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(CoverageDescription)
      */
@@ -131,8 +131,8 @@ public class DefaultCoverageDescription
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultCoverageDescription castOrCopy(final CoverageDescription object) {
@@ -149,7 +149,7 @@ public class DefaultCoverageDescription
     /**
      * Returns the description of the attribute described by the measurement value.
      *
-     * @return Description of the attribute.
+     * @return description of the attribute.
      */
     @Override
     @XmlElement(name = "attributeDescription", required = true)
@@ -160,7 +160,7 @@ public class DefaultCoverageDescription
     /**
      * Sets the description of the attribute described by the measurement value.
      *
-     * @param newValue The new attribute description.
+     * @param  newValue  the new attribute description.
      */
     public void setAttributeDescription(final RecordType newValue) {
         checkWritePermission();
@@ -170,7 +170,7 @@ public class DefaultCoverageDescription
     /**
      * Returns an identifier for the level of processing that has been applied to the resource, or {@code null} if none.
      *
-     * @return Identifier for the level of processing that has been applied to the resource, or {@code null} if none.
+     * @return identifier for the level of processing that has been applied to the resource, or {@code null} if none.
      *
      * @since 0.5
      */
@@ -183,7 +183,7 @@ public class DefaultCoverageDescription
     /**
      * Sets the identifier for the level of processing that has been applied to the resource.
      *
-     * @param newValue The new identifier for the level of processing.
+     * @param  newValue  the new identifier for the level of processing.
      *
      * @since 0.5
      */
@@ -195,7 +195,7 @@ public class DefaultCoverageDescription
     /**
      * Returns information on attribute groups of the resource.
      *
-     * @return Information on attribute groups of the resource.
+     * @return information on attribute groups of the resource.
      *
      * @since 0.5
      */
@@ -208,7 +208,7 @@ public class DefaultCoverageDescription
     /**
      * Sets information on attribute groups of the resource.
      *
-     * @param newValues The new information on attribute groups of the resource.
+     * @param  newValues  the new information on attribute groups of the resource.
      *
      * @since 0.5
      */
@@ -220,7 +220,7 @@ public class DefaultCoverageDescription
      * Returns the type of information represented by the cell value.
      * This method fetches the value from the {@linkplain #getAttributeGroups() attribute groups}.
      *
-     * @return Type of information represented by the cell value, or {@code null}.
+     * @return type of information represented by the cell value, or {@code null}.
      *
      * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#getContentTypes()}.
      */
@@ -253,7 +253,7 @@ public class DefaultCoverageDescription
      * Sets the type of information represented by the cell value.
      * This method stores the value in the first writable {@linkplain #getAttributeGroups() attribute groups}.
      *
-     * @param newValue The new content type.
+     * @param  newValue  the new content type.
      *
      * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#setContentTypes(Collection)}.
      */
@@ -284,7 +284,7 @@ public class DefaultCoverageDescription
      * Returns the information on the dimensions of the cell measurement value.
      * This method fetches the values from the first {@linkplain #getAttributeGroups() attribute groups}.
      *
-     * @return Dimensions of the cell measurement value.
+     * @return dimensions of the cell measurement value.
      *
      * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#getAttributes()}.
      */
@@ -321,7 +321,7 @@ public class DefaultCoverageDescription
      * Sets the information on the dimensions of the cell measurement value.
      * This method stores the values in the {@linkplain #getAttributeGroups() attribute groups}.
      *
-     * @param newValues The new dimensions.
+     * @param  newValues  the new dimensions.
      *
      * @deprecated As of ISO 19115:2014, moved to {@link DefaultAttributeGroup#setAttributes(Collection)}.
      */
@@ -334,7 +334,7 @@ public class DefaultCoverageDescription
     /**
      * Provides the description of the specific range elements of a coverage.
      *
-     * @return Description of the specific range elements of a coverage.
+     * @return description of the specific range elements of a coverage.
      */
     @Override
     @XmlElement(name = "rangeElementDescription", namespace = Namespaces.GMI)
@@ -345,7 +345,7 @@ public class DefaultCoverageDescription
     /**
      * Sets the description of the specific range elements of a coverage.
      *
-     * @param newValues The new range element description.
+     * @param  newValues  the new range element description.
      */
     public void setRangeElementDescriptions(final Collection<? extends RangeElementDescription> newValues) {
         rangeElementDescriptions = writeCollection(newValues, rangeElementDescriptions, RangeElementDescription.class);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureCatalogueDescription.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -103,7 +103,7 @@ public class DefaultFeatureCatalogueDesc
      * This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
      * given object are not recursively copied.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(FeatureCatalogueDescription)
      */
@@ -132,8 +132,8 @@ public class DefaultFeatureCatalogueDesc
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultFeatureCatalogueDescription castOrCopy(final FeatureCatalogueDescription object) {
@@ -146,7 +146,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Returns whether or not the cited feature catalogue complies with ISO 19110.
      *
-     * @return Whether or not the cited feature catalogue complies with ISO 19110, or {@code null}.
+     * @return whether or not the cited feature catalogue complies with ISO 19110, or {@code null}.
      */
     @Override
     @XmlElement(name = "complianceCode")
@@ -157,7 +157,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Sets whether or not the cited feature catalogue complies with ISO 19110.
      *
-     * @param newValue The new compliance value.
+     * @param  newValue  the new compliance value.
      */
     public void setCompliant(final Boolean newValue) {
         checkWritePermission();
@@ -167,7 +167,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Returns the language(s) used within the catalogue
      *
-     * @return Language(s) used within the catalogue.
+     * @return language(s) used within the catalogue.
      */
     @Override
     @XmlElement(name = "language")
@@ -178,7 +178,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Sets the language(s) used within the catalogue
      *
-     * @param newValues The new languages.
+     * @param  newValues  the new languages.
      */
     public void setLanguages(final Collection<? extends Locale> newValues) {
         languages = writeCollection(newValues, languages, Locale.class);
@@ -187,7 +187,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Returns whether or not the feature catalogue is included with the resource.
      *
-     * @return Whether or not the feature catalogue is included with the resource.
+     * @return whether or not the feature catalogue is included with the resource.
      */
     @Override
     @XmlElement(name = "includedWithDataset", required = true)
@@ -198,7 +198,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Sets whether or not the feature catalogue is included with the resource.
      *
-     * @param newValue {@code true} if the feature catalogue is included.
+     * @param  newValue  {@code true} if the feature catalogue is included.
      */
     public void setIncludedWithDataset(final boolean newValue) {
         checkWritePermission();
@@ -208,7 +208,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Returns the subset of feature types from cited feature catalogue occurring in resource.
      *
-     * @return Subset of feature types occurring in resource.
+     * @return subset of feature types occurring in resource.
      *
      * @since 0.5
      */
@@ -220,7 +220,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Sets the subset of feature types from cited feature catalogue occurring in resource.
      *
-     * @param newValues The new feature types.
+     * @param  newValues  the new feature types.
      *
      * @since 0.5
      */
@@ -231,7 +231,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Returns the names of {@linkplain #getFeatureTypes() feature types}.
      *
-     * @return The feature type names.
+     * @return the feature type names.
      *
      * @deprecated As of ISO 19115:2014, replaced by {@link #getFeatureTypeInfo()}.
      */
@@ -264,7 +264,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Sets the names of {@linkplain #getFeatureTypes() feature types}.
      *
-     * @param newValues The new feature type names.
+     * @param  newValues  the new feature type names.
      *
      * @deprecated As of ISO 19115:2014, replaced by {@link #setFeatureTypeInfo(Collection)}.
      */
@@ -277,7 +277,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Returns the complete bibliographic reference to one or more external feature catalogues.
      *
-     * @return Bibliographic reference to one or more external feature catalogues.
+     * @return bibliographic reference to one or more external feature catalogues.
      */
     @Override
     @XmlElement(name = "featureCatalogueCitation", required = true)
@@ -288,7 +288,7 @@ public class DefaultFeatureCatalogueDesc
     /**
      * Sets the complete bibliographic reference to one or more external feature catalogues.
      *
-     * @param newValues The feature catalogue citations.
+     * @param  newValues  the feature catalogue citations.
      */
     public void setFeatureCatalogueCitations(final Collection<? extends Citation> newValues) {
         featureCatalogueCitations = writeCollection(newValues, featureCatalogueCitations, Citation.class);

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultFeatureTypeInfo.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -75,7 +75,7 @@ public class DefaultFeatureTypeInfo exte
     /**
      * Constructs a feature type info initialized to the specified name.
      *
-     * @param featureTypeName Name of the feature type.
+     * @param  featureTypeName  name of the feature type.
      */
     public DefaultFeatureTypeInfo(final GenericName featureTypeName) {
         this.featureTypeName = featureTypeName;
@@ -93,7 +93,7 @@ public class DefaultFeatureTypeInfo exte
      * metadata instances can also be obtained by unmarshalling an invalid XML document.
      * </div>
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(FeatureTypeInfo)
      */
@@ -119,8 +119,8 @@ public class DefaultFeatureTypeInfo exte
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultFeatureTypeInfo castOrCopy(final FeatureTypeInfo object) {
@@ -133,7 +133,7 @@ public class DefaultFeatureTypeInfo exte
     /**
      * Returns the name of the feature type.
      *
-     * @return Name of the feature type.
+     * @return name of the feature type.
      *
      * @see org.apache.sis.feature.DefaultFeatureType#getName()
      */
@@ -146,7 +146,7 @@ public class DefaultFeatureTypeInfo exte
     /**
      * Sets the name of the feature type.
      *
-     * @param newValue The new name.
+     * @param  newValue  the new name.
      */
     public void setFeatureTypeName(final GenericName newValue) {
         checkWritePermission();
@@ -156,7 +156,7 @@ public class DefaultFeatureTypeInfo exte
     /**
      * Returns the number of occurrence of feature instances for this feature types, or {@code null} if none.
      *
-     * @return The number of occurrence of feature instances for this feature types, or {@code null} if none.
+     * @return the number of occurrence of feature instances for this feature types, or {@code null} if none.
      */
     @Override
     @ValueRange(minimum = 1)
@@ -168,7 +168,7 @@ public class DefaultFeatureTypeInfo exte
     /**
      * Sets a new number of occurrence of feature instances for this feature types.
      *
-     * @param newValue the new number of occurrence.
+     * @param  newValue  the new number of occurrence.
      * @throws IllegalArgumentException if the given value is negative.
      */
     public void setFeatureInstanceCount(final Integer newValue) {

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/content/DefaultImageDescription.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -151,7 +151,7 @@ public class DefaultImageDescription ext
      * metadata instances can also be obtained by unmarshalling an invalid XML document.
      * </div>
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param  object  the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(ImageDescription)
      */
@@ -186,8 +186,8 @@ public class DefaultImageDescription ext
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultImageDescription castOrCopy(final ImageDescription object) {
@@ -198,13 +198,13 @@ public class DefaultImageDescription ext
     }
 
     /**
-     * Returns the illumination elevation measured in degrees clockwise from the target plane at
-     * intersection of the optical line of sight with the Earth's surface.
+     * Returns the illumination elevation measured in degrees clockwise from the target plane
+     * at intersection of the optical line of sight with the Earth's surface.
      * For images from a scanning device, refer to the centre pixel of the image.
      *
      * <p>The horizon is at 0°, straight up has an elevation of 90°.</p>
      *
-     * @return A value between -90° and +90°, or {@code null} if unspecified.
+     * @return a value between -90° and +90°, or {@code null} if unspecified.
      */
     @Override
     @ValueRange(minimum = -90, maximum = +90)
@@ -214,11 +214,11 @@ public class DefaultImageDescription ext
     }
 
     /**
-     * Sets the illumination elevation measured in degrees clockwise from the target plane at
-     * intersection of the optical line of sight with the Earth's surface. For images from a
-     * scanning device, refer to the centre pixel of the image.
+     * Sets the illumination elevation measured in degrees clockwise from the target plane
+     * at intersection of the optical line of sight with the Earth's surface.
+     * For images from a scanning device, refer to the centre pixel of the image.
      *
-     * @param newValue The new illumination elevation angle, or {@code null}.
+     * @param  newValue  the new illumination elevation angle, or {@code null}.
      * @throws IllegalArgumentException if the given value is out of range.
      */
     public void setIlluminationElevationAngle(final Double newValue) {
@@ -229,10 +229,10 @@ public class DefaultImageDescription ext
     }
 
     /**
-     * Returns the illumination azimuth measured in degrees clockwise from true north at the time
-     * the image is taken. For images from a scanning device, refer to the centre pixel of the image.
+     * Returns the illumination azimuth measured in degrees clockwise from true north at the time the image is taken.
+     * For images from a scanning device, refer to the centre pixel of the image.
      *
-     * @return A value between 0° and 360°, or {@code null} if unspecified.
+     * @return a value between 0° and 360°, or {@code null} if unspecified.
      */
     @Override
     @ValueRange(minimum = 0, maximum = 360)
@@ -242,10 +242,10 @@ public class DefaultImageDescription ext
     }
 
     /**
-     * Sets the illumination azimuth measured in degrees clockwise from true north at the time the
-     * image is taken. For images from a scanning device, refer to the centre pixel of the image.
+     * Sets the illumination azimuth measured in degrees clockwise from true north at the time the image is taken.
+     * For images from a scanning device, refer to the centre pixel of the image.
      *
-     * @param newValue The new illumination azimuth angle, or {@code null}.
+     * @param  newValue  the new illumination azimuth angle, or {@code null}.
      * @throws IllegalArgumentException if the given value is out of range.
      */
     public void setIlluminationAzimuthAngle(final Double newValue) {
@@ -258,7 +258,7 @@ public class DefaultImageDescription ext
     /**
      * Returns the conditions which affected the image.
      *
-     * @return Conditions which affected the image, or {@code null} if unspecified.
+     * @return conditions which affected the image, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "imagingCondition")
@@ -269,7 +269,7 @@ public class DefaultImageDescription ext
     /**
      * Sets the conditions that affected the image.
      *
-     * @param newValue The new imaging condition.
+     * @param  newValue  the new imaging condition.
      */
     public void setImagingCondition(final ImagingCondition newValue) {
         checkWritePermission();
@@ -279,7 +279,7 @@ public class DefaultImageDescription ext
     /**
      * Returns a code in producer’s codespace that specifies the image quality.
      *
-     * @return The image quality, or {@code null} if unspecified.
+     * @return the image quality, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "imageQualityCode")
@@ -290,7 +290,7 @@ public class DefaultImageDescription ext
     /**
      * Sets a code in producer’s codespace that specifies the image quality.
      *
-     * @param newValue The new image quality code.
+     * @param  newValue  the new image quality code.
      */
     public void setImageQualityCode(final Identifier newValue) {
         checkWritePermission();
@@ -300,7 +300,7 @@ public class DefaultImageDescription ext
     /**
      * Returns the area of the dataset obscured by clouds, expressed as a percentage of the spatial extent.
      *
-     * @return A value between 0 and 100, or {@code null} if unspecified.
+     * @return a value between 0 and 100, or {@code null} if unspecified.
      */
     @Override
     @ValueRange(minimum = 0, maximum = 100)
@@ -312,7 +312,7 @@ public class DefaultImageDescription ext
     /**
      * Sets the area of the dataset obscured by clouds, expressed as a percentage of the spatial extent.
      *
-     * @param newValue The new cloud cover percentage, or {@code null}.
+     * @param  newValue  the new cloud cover percentage, or {@code null}.
      * @throws IllegalArgumentException if the given value is out of range.
      */
     public void setCloudCoverPercentage(final Double newValue) {
@@ -326,8 +326,7 @@ public class DefaultImageDescription ext
      * Returns the image distributor's code that identifies the level of radiometric and geometric
      * processing that has been applied.
      *
-     * @return The level of radiometric and geometric processing that has been applied,
-     *         or {@code null} if unspecified.
+     * @return the level of radiometric and geometric processing that has been applied, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "processingLevelCode")
@@ -339,7 +338,7 @@ public class DefaultImageDescription ext
      * Sets the image distributor's code that identifies the level of radiometric and geometric
      * processing that has been applied.
      *
-     * @param newValue The new processing level code.
+     * @param  newValue  the new processing level code.
      */
     @Override
     public void setProcessingLevelCode(final Identifier newValue) {
@@ -349,8 +348,7 @@ public class DefaultImageDescription ext
     /**
      * Returns the count of the number of lossy compression cycles performed on the image.
      *
-     * @return The number of lossy compression cycles performed on the image,
-     *         or {@code null} if unspecified.
+     * @return the number of lossy compression cycles performed on the image, or {@code null} if unspecified.
      */
     @Override
     @ValueRange(minimum = 0)
@@ -362,7 +360,7 @@ public class DefaultImageDescription ext
     /**
      * Sets the count of the number the number of lossy compression cycles performed on the image.
      *
-     * @param newValue The new compression generation quantity.
+     * @param  newValue  the new compression generation quantity.
      * @throws IllegalArgumentException if the given value is negative.
      */
     public void setCompressionGenerationQuantity(final Integer newValue) {
@@ -375,8 +373,7 @@ public class DefaultImageDescription ext
     /**
      * Returns the indication of whether or not triangulation has been performed upon the image.
      *
-     * @return Whether or not triangulation has been performed upon the image,
-     *         or {@code null} if unspecified.
+     * @return whether or not triangulation has been performed upon the image, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "triangulationIndicator")
@@ -387,7 +384,7 @@ public class DefaultImageDescription ext
     /**
      * Sets the indication of whether or not triangulation has been performed upon the image.
      *
-     * @param newValue The new triangulation indicator.
+     * @param  newValue  the new triangulation indicator.
      */
     public void setTriangulationIndicator(final Boolean newValue) {
         checkWritePermission();
@@ -398,8 +395,7 @@ public class DefaultImageDescription ext
      * Returns the indication of whether or not the radiometric calibration information for
      * generating the radiometrically calibrated standard data product is available.
      *
-     * @return Whether or not the radiometric calibration information is available,
-     *         or {@code null} if unspecified.
+     * @return whether or not the radiometric calibration information is available, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "radiometricCalibrationDataAvailability")
@@ -411,7 +407,7 @@ public class DefaultImageDescription ext
      * Sets the indication of whether or not the radiometric calibration information for generating
      * the radiometrically calibrated standard data product is available.
      *
-     * @param newValue {@code true} if radiometric calibration data are available.
+     * @param  newValue  {@code true} if radiometric calibration data are available.
      */
     public void setRadiometricCalibrationDataAvailable(final Boolean newValue) {
         checkWritePermission();
@@ -419,11 +415,9 @@ public class DefaultImageDescription ext
     }
 
     /**
-     * Returns the indication of whether or not constants are available which allow for camera
-     * calibration corrections.
+     * Returns the indication of whether or not constants are available which allow for camera calibration corrections.
      *
-     * @return Whether or not constants are available for camera calibration corrections,
-     *         or {@code null} if unspecified.
+     * @return whether or not constants are available for camera calibration corrections, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "cameraCalibrationInformationAvailability")
@@ -432,10 +426,9 @@ public class DefaultImageDescription ext
     }
 
     /**
-     * Sets the indication of whether or not constants are available which allow for camera
-     * calibration corrections.
+     * Sets the indication of whether or not constants are available which allow for camera calibration corrections.
      *
-     * @param newValue {@code true} if camera calibration information are available.
+     * @param  newValue  {@code true} if camera calibration information are available.
      */
     public void setCameraCalibrationInformationAvailable(final Boolean newValue) {
         checkWritePermission();
@@ -445,8 +438,7 @@ public class DefaultImageDescription ext
     /**
      * Returns the indication of whether or not Calibration Reseau information is available.
      *
-     * @return Whether or not Calibration Reseau information is available,
-     *         or {@code null} if unspecified.
+     * @return whether or not Calibration Reseau information is available, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "filmDistortionInformationAvailability")
@@ -457,7 +449,7 @@ public class DefaultImageDescription ext
     /**
      * Sets the indication of whether or not Calibration Reseau information is available.
      *
-     * @param newValue {@code true} if film distortion information are available.
+     * @param  newValue  {@code true} if film distortion information are available.
      */
     public void setFilmDistortionInformationAvailable(final Boolean newValue) {
         checkWritePermission();
@@ -467,8 +459,7 @@ public class DefaultImageDescription ext
     /**
      * Returns the indication of whether or not lens aberration correction information is available.
      *
-     * @return Whether or not lens aberration correction information is available,
-     *         or {@code null} if unspecified.
+     * @return whether or not lens aberration correction information is available, or {@code null} if unspecified.
      */
     @Override
     @XmlElement(name = "lensDistortionInformationAvailability")
@@ -479,7 +470,7 @@ public class DefaultImageDescription ext
     /**
      * Sets the indication of whether or not lens aberration correction information is available.
      *
-     * @param newValue {@code true} if lens distortion information are available.
+     * @param  newValue  {@code true} if lens distortion information are available.
      */
     public void setLensDistortionInformationAvailable(final Boolean newValue) {
         checkWritePermission();

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultDataFile.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -80,7 +80,7 @@ public class DefaultDataFile extends ISO
      * This is a <cite>shallow</cite> copy constructor, since the other metadata contained in the
      * given object are not recursively copied.
      *
-     * @param object The metadata to copy values from, or {@code null} if none.
+     * @param object the metadata to copy values from, or {@code null} if none.
      *
      * @see #castOrCopy(DataFile)
      */
@@ -106,8 +106,8 @@ public class DefaultDataFile extends ISO
      *       metadata contained in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultDataFile castOrCopy(final DataFile object) {
@@ -123,7 +123,7 @@ public class DefaultDataFile extends ISO
      * This attribute may be omitted when the dataset is composed of a single file and/or the
      * data does not relate to a feature catalogue.
      *
-     * @return List of features types concerned by the transfer data file.
+     * @return list of features types concerned by the transfer data file.
      */
     @Override
     @XmlElement(name = "featureType", namespace = Namespaces.GMX)
@@ -134,7 +134,7 @@ public class DefaultDataFile extends ISO
     /**
      * Sets the list of feature types concerned by the transfer data file.
      *
-     * @param newValues The new feature type values.
+     * @param newValues the new feature type values.
      */
     public void setFeatureTypes(final Collection<? extends LocalName> newValues) {
         featureTypes = writeCollection(newValues, featureTypes, LocalName.class);
@@ -143,7 +143,7 @@ public class DefaultDataFile extends ISO
     /**
      * Returns the format of the transfer data file.
      *
-     * @return Format of the transfer data file, or {@code null}.
+     * @return format of the transfer data file, or {@code null}.
      */
     @Override
     @XmlElement(name = "fileFormat", namespace = Namespaces.GMX, required = true)
@@ -154,7 +154,7 @@ public class DefaultDataFile extends ISO
     /**
      * Sets the format of the transfer data file.
      *
-     * @param newValue The new file format value.
+     * @param newValue the new file format value.
      */
     public void setFileFormat(final Format newValue) {
         checkWritePermission();

Modified: sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/distribution/DefaultFormat.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -113,15 +113,16 @@ public class DefaultFormat extends ISOMe
      * <table class="sis">
      *   <caption>Specification titles for well-known format names</caption>
      *   <tr><th>Name</th>    <th>Specification title</th></tr>
+     *   <tr><td>CSV</td>     <td>Common Format and MIME Type for Comma-Separated Values (CSV) Files</td></tr>
      *   <tr><td>GeoTIFF</td> <td>GeoTIFF Coverage Encoding Profile</td></tr>
      *   <tr><td>NetCDF</td>  <td>NetCDF Classic and 64-bit Offset Format</td></tr>
      *   <tr><td>PNG</td>     <td>PNG (Portable Network Graphics) Specification</td></tr>
      * </table>
      *
-     * @param  name     the name of the data transfer format(s), or {@code null}.
+     * @param  name     the abbreviated name of the data transfer format, or {@code null}.
      * @param  version  the version of the format (date, number, <i>etc.</i>), or {@code null}.
      */
-    public DefaultFormat(final CharSequence name, final CharSequence version) {
+    public DefaultFormat(CharSequence name, final CharSequence version) {
         if (name != null || version != null) {
             final DefaultCitation citation = new DefaultCitation();
             if (name != null) {
@@ -137,6 +138,11 @@ public class DefaultFormat extends ISOMe
                     title = "NetCDF Classic and 64-bit Offset Format";
                 } else if (keyword.equalsIgnoreCase("PNG")) {
                     title = "PNG (Portable Network Graphics) Specification";
+                } else if (keyword.equalsIgnoreCase("CSV")) {
+                    title = "Common Format and MIME Type for Comma-Separated Values (CSV) Files";
+                } else if (keyword.equalsIgnoreCase("CSV/MF")) {    // Not yet documented format.
+                    title = "OGC Moving Features Encoding Extension: Simple Comma-Separated Values (CSV)";
+                    name  = "CSV";
                 }
                 citation.setTitle(Types.toInternationalString(title));
                 citation.setAlternateTitles(Collections.singleton(Types.toInternationalString(name)));



Mime
View raw message