sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779777 - in /sis/trunk: ./ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feature/src/main/java/org/apache/sis/feature/builder/ core/sis-feature/src/main/java/org/apache/sis/internal/feature/ core/sis-feature/src/test/jav...
Date Sun, 22 Jan 2017 06:03:00 GMT
Author: desruisseaux
Date: Sun Jan 22 06:02:59 2017
New Revision: 1779777

URL: http://svn.apache.org/viewvc?rev=1779777&view=rev
Log:
Merge from the JDK7 branch. Contains a bug fix about StandardMetadata.isMetadata(Class) when the given class is a primitive type.

Modified:
    sis/trunk/   (props changed)
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
    sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureMemoryBenchmark.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
    sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
    sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
    sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
    sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
    sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
    sis/trunk/pom.xml

Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 22 06:02:59 2017
@@ -1,5 +1,5 @@
 /sis/branches/Android:1430670-1480699
 /sis/branches/JDK6:1394364-1758914
-/sis/branches/JDK7:1394913-1779722
-/sis/branches/JDK8:1584960-1779720
+/sis/branches/JDK7:1394913-1779776
+/sis/branches/JDK8:1584960-1779775
 /sis/branches/JDK9:1773327-1773512

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractAttribute.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -134,7 +134,7 @@ public abstract class AbstractAttribute<
      * @param  <V>    the type of attribute values.
      * @param  type   information about the attribute (base Java class, domain of values, <i>etc.</i>).
      * @param  value  the initial value (may be {@code null}).
-     * @return The new attribute.
+     * @return the new attribute.
      */
     static <V> AbstractAttribute<V> create(final DefaultAttributeType<V> type, final Object value) {
         ArgumentChecks.ensureNonNull("type", type);

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractFeature.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.feature;
 
+import java.util.Objects;
 import java.util.Iterator;
 import java.util.Collection;
 import java.util.Collections;
@@ -31,7 +32,6 @@ import org.apache.sis.internal.util.Chec
 import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
-import java.util.Objects;
 
 
 /**
@@ -206,7 +206,7 @@ public abstract class AbstractFeature im
      *
      * @param  name   the name of the property to create.
      * @param  value  the value to wrap.
-     * @return A {@code Property} wrapping the given value.
+     * @return a {@code Property} wrapping the given value.
      */
     final Property createProperty(final String name, final Object value) {
         final AbstractIdentifiedType pt = type.getProperty(name);
@@ -486,8 +486,8 @@ public abstract class AbstractFeature im
     /**
      * Verifies if the given property can be assigned to this feature.
      *
-     * @param name      shall be {@code property.getName().toString()}.
-     * @param property  the property to verify.
+     * @param  name      shall be {@code property.getName().toString()}.
+     * @param  property  the property to verify.
      */
     final void verifyPropertyType(final String name, final Property property) {
         final AbstractIdentifiedType pt, base = type.getProperty(name);
@@ -535,7 +535,7 @@ public abstract class AbstractFeature im
      *   <li>May be a collection, in which case the class each elements in the collection is verified.</li>
      * </ul>
      *
-     * @param value  the value, which shall be non-null.
+     * @param  value  the value, which shall be non-null.
      */
     private static <T> Object verifyAttributeValue(final DefaultAttributeType<T> type, final Object value) {
         final Class<T> valueClass = type.getValueClass();
@@ -557,7 +557,7 @@ public abstract class AbstractFeature im
      *   <li>May be a collection, in which case the class each elements in the collection is verified.</li>
      * </ul>
      *
-     * @param value  the value, which shall be non-null.
+     * @param  value  the value, which shall be non-null.
      */
     private static Object verifyAssociationValue(final DefaultAssociationRole role, final Object value) {
         final boolean isSingleton = Field.isSingleton(role.getMaximumOccurs());

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractOperation.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -18,6 +18,7 @@ package org.apache.sis.feature;
 
 import java.util.Map;
 import java.util.Set;
+import java.util.Objects;
 import java.util.Collections;
 import java.util.HashMap;
 import java.io.IOException;
@@ -30,7 +31,6 @@ import org.apache.sis.util.Classes;
 import org.apache.sis.util.Debug;
 
 // Branch-dependent imports
-import java.util.Objects;
 import org.apache.sis.internal.jdk8.UncheckedIOException;
 
 

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicMap.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -53,7 +53,7 @@ final class CharacteristicMap extends Ab
     /**
      * Creates an initially empty map of attribute characteristics.
      *
-     * @param  source  the attribute which is characterized by {@code characterizedBy}.
+     * @param  source           the attribute which is characterized by {@code characterizedBy}.
      * @param  characterizedBy  description of the characteristics of {@code source}.
      */
     CharacteristicMap(final AbstractAttribute<?> source, final CharacteristicTypeMap types) {

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/CharacteristicTypeMap.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -81,7 +81,7 @@ final class CharacteristicTypeMap extend
      * <p>This method does not clone the {@code characterizedBy} array. If that array
      * is a user-provided argument, then cloning that array is caller responsibility.</p>
      *
-     * @param  source  the attribute which is characterized by {@code characterizedBy}.
+     * @param  source           the attribute which is characterized by {@code characterizedBy}.
      * @param  characterizedBy  characteristics of {@code source}. Should not be empty.
      * @return a map for this given characteristics.
      * @throws IllegalArgumentException if two characteristics have the same name.
@@ -104,7 +104,7 @@ final class CharacteristicTypeMap extend
      * <p>This constructor does not clone the {@code characterizedBy} array. If that array
      * is a user-provided argument, then cloning that array is caller responsibility.</p>
      *
-     * @param  source  the attribute which is characterized by {@code characterizedBy}.
+     * @param  source           the attribute which is characterized by {@code characterizedBy}.
      * @param  characterizedBy  characteristics of {@code source}. Should not be empty.
      * @throws IllegalArgumentException if two characteristics have the same name.
      */

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultAttributeType.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -17,6 +17,7 @@
 package org.apache.sis.feature;
 
 import java.util.Map;
+import java.util.Objects;
 import java.util.Collections;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -31,7 +32,6 @@ import org.apache.sis.internal.util.Nume
 import static org.apache.sis.util.ArgumentChecks.*;
 
 // Branch-dependent imports
-import java.util.Objects;
 
 
 /**
@@ -206,7 +206,7 @@ public class DefaultAttributeType<V> ext
      * Invoked on serialization for saving the {@link #characteristics} field.
      *
      * @param  out The output stream where to serialize this attribute type.
-     * @throws IOException If an I/O error occurred while writing.
+     * @throws IOException if an I/O error occurred while writing.
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/DefaultFeatureType.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -797,7 +797,7 @@ public class DefaultFeatureType extends
      * The type of list elements will be changed to {@code PropertyType} if and when such interface
      * will be defined in GeoAPI.</div>
      *
-     * @param  includeSuperTypes {@code true} for including the properties inherited from the super-types,
+     * @param  includeSuperTypes  {@code true} for including the properties inherited from the super-types,
      *         or {@code false} for returning only the properties defined explicitely in this type.
      * @return feature operation, attribute type and association role that carries characteristics of this
      *         feature type (not including parent types).

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureFormat.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -475,7 +475,7 @@ header: for (int i=0; ; i++) {
     /**
      * Not yet supported.
      *
-     * @return Currently never return.
+     * @return currently never return.
      * @throws ParseException currently always thrown.
      */
     @Override
@@ -483,4 +483,14 @@ header: for (int i=0; ; i++) {
         throw new ParseException(Errors.getResources(displayLocale)
                 .getString(Errors.Keys.UnsupportedOperation_1, "parse"), 0);
     }
+
+    /**
+     * Returns a clone of this format.
+     *
+     * @return a clone of this format.
+     */
+    @Override
+    public FeatureFormat clone() {
+        return (FeatureFormat) super.clone();
+    }
 }

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/FeatureOperations.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -260,10 +260,10 @@ public final class FeatureOperations ext
      * The type of {@code geometryAttributes} elements will be changed to {@code PropertyType}
      * if and when such interface will be defined in GeoAPI.</div>
      *
-     * @param  identification     the name and other information to be given to the operation.
-     * @param  crs                the Coordinate Reference System in which to express the envelope, or {@code null}.
-     * @param  geometryAttributes the operation or attribute type from which to get geometry values.
-     *                            Any element which is {@code null} or has a non-geometric value class will be ignored.
+     * @param  identification      the name and other information to be given to the operation.
+     * @param  crs                 the Coordinate Reference System in which to express the envelope, or {@code null}.
+     * @param  geometryAttributes  the operation or attribute type from which to get geometry values.
+     *                             Any element which is {@code null} or has a non-geometric value class will be ignored.
      * @return an operation which will compute the envelope encompassing all geometries in the given attributes.
      * @throws FactoryException if a coordinate operation to the target CRS can not be created.
      */

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Features.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -64,8 +64,10 @@ public final class Features extends Stat
     {
         if (type != null) {
             final Class<?> actual = type.getValueClass();
-            // We require a strict equality - not type.isAssignableFrom(actual) - because in
-            // the later case we could have (to be strict) to return a <? extends V> type.
+            /*
+             * We require a strict equality - not type.isAssignableFrom(actual) - because in
+             * the later case we could have (to be strict) to return a <? extends V> type.
+             */
             if (!valueClass.equals(actual)) {
                 throw new ClassCastException(Resources.format(Resources.Keys.MismatchedValueClass_3,
                         type.getName(), valueClass, actual));
@@ -93,8 +95,10 @@ public final class Features extends Stat
     {
         if (attribute != null) {
             final Class<?> actual = attribute.getType().getValueClass();
-            // We require a strict equality - not type.isAssignableFrom(actual) - because in
-            // the later case we could have (to be strict) to return a <? extends V> type.
+            /*
+             * We require a strict equality - not type.isAssignableFrom(actual) - because in
+             * the later case we could have (to be strict) to return a <? extends V> type.
+             */
             if (!valueClass.equals(actual)) {
                 throw new ClassCastException(Resources.format(Resources.Keys.MismatchedValueClass_3,
                         attribute.getName(), valueClass, actual));

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/LinkOperation.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -129,7 +129,7 @@ final class LinkOperation extends Abstra
     /**
      * Appends a string representation of the "formula" used for computing the result.
      *
-     * @param  buffer where to format the "formula".
+     * @param  buffer  where to format the "formula".
      */
     @Override
     void formatResultFormula(final Appendable buffer) throws IOException {

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAssociation.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -83,7 +83,7 @@ final class MultiValuedAssociation exten
     /**
      * Returns the feature, or {@code null} if none.
      *
-     * @return The feature (may be {@code null}).
+     * @return the feature (may be {@code null}).
      * @throws IllegalStateException if this association contains more than one value.
      */
     @Override
@@ -100,7 +100,7 @@ final class MultiValuedAssociation exten
      * The returned collection is <cite>live</cite>: changes in the returned collection
      * will be reflected immediately in this {@code Association} instance, and conversely.
      *
-     * @return The features in a <cite>live</cite> collection.
+     * @return the features in a <cite>live</cite> collection.
      */
     @Override
     @SuppressWarnings("ReturnOfCollectionOrArrayField")
@@ -111,7 +111,7 @@ final class MultiValuedAssociation exten
     /**
      * Sets the feature.
      *
-     * @param value The new value, or {@code null} for removing all values from this association.
+     * @param  value  the new value, or {@code null} for removing all values from this association.
      */
     @Override
     public void setValue(final AbstractFeature value) {
@@ -125,7 +125,7 @@ final class MultiValuedAssociation exten
     /**
      * Sets the feature values. All previous values are replaced by the given collection.
      *
-     * @param newValues The new values.
+     * @param  newValues  the new values.
      */
     @Override
     public void setValues(final Collection<? extends AbstractFeature> newValues) {
@@ -145,7 +145,7 @@ final class MultiValuedAssociation exten
      * This implementation returns a <em>shallow</em> copy:
      * the association {@linkplain #getValues() values} are <strong>not</strong> cloned.
      *
-     * @return A clone of this association.
+     * @return a clone of this association.
      * @throws CloneNotSupportedException if this association can not be cloned.
      */
     @Override
@@ -159,7 +159,7 @@ final class MultiValuedAssociation exten
     /**
      * Returns a hash code value for this association.
      *
-     * @return A hash code value.
+     * @return a hash code value.
      */
     @Override
     public int hashCode() {

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/MultiValuedAttribute.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -149,7 +149,7 @@ final class MultiValuedAttribute<V> exte
     @Override
     public void setValues(final Collection<? extends V> newValues) {
         if (newValues != values) {
-            ArgumentChecks.ensureNonNull("values", newValues);  // The parameter name in public API is "values".
+            ArgumentChecks.ensureNonNull("values", newValues);      // The parameter name in public API is "values".
             values.clear();
             values.addAll(newValues);
         }

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/PropertyView.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -17,6 +17,7 @@
 package org.apache.sis.feature;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Iterator;
 import java.util.Collection;
 import java.util.Collections;
@@ -28,7 +29,6 @@ import org.apache.sis.util.Debug;
 import org.apache.sis.internal.feature.Resources;
 
 // Branch-dependent imports
-import java.util.Objects;
 
 
 /**

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAssociation.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.feature;
 
-// Branch-dependent imports
 import java.util.Objects;
 
 
@@ -39,6 +38,7 @@ import java.util.Objects;
  *
  * @see DefaultAssociationRole
  */
+@SuppressWarnings("CloneableClassWithoutClone")     // AbstractAssociation.clone() contract is to return a shallow copy.
 final class SingletonAssociation extends AbstractAssociation {
     /**
      * For cross-version compatibility.
@@ -53,7 +53,7 @@ final class SingletonAssociation extends
     /**
      * Creates a new association of the given role.
      *
-     * @param role Information about the association.
+     * @param role  information about the association.
      */
     public SingletonAssociation(final DefaultAssociationRole role) {
         super(role);
@@ -63,8 +63,8 @@ final class SingletonAssociation extends
     /**
      * Creates a new association of the given role initialized to the given value.
      *
-     * @param role  Information about the association.
-     * @param value The initial value (may be {@code null}).
+     * @param role   information about the association.
+     * @param value  the initial value (may be {@code null}).
      */
     SingletonAssociation(final DefaultAssociationRole role, final AbstractFeature value) {
         super(role);
@@ -78,7 +78,7 @@ final class SingletonAssociation extends
     /**
      * Returns the associated feature.
      *
-     * @return The associated feature (may be {@code null}).
+     * @return the associated feature (may be {@code null}).
      */
     @Override
     public AbstractFeature getValue() {
@@ -88,8 +88,8 @@ final class SingletonAssociation extends
     /**
      * Sets the associated feature.
      *
-     * @param  value The new value, or {@code null}.
-     * @throws IllegalArgumentException If the given feature is not valid for this association.
+     * @param  value  the new value, or {@code null}.
+     * @throws InvalidPropertyValueException if the given feature is not valid for this association.
      */
     @Override
     public void setValue(final AbstractFeature value) throws IllegalArgumentException {
@@ -102,7 +102,7 @@ final class SingletonAssociation extends
     /**
      * Returns a hash code value for this association.
      *
-     * @return A hash code value.
+     * @return a hash code value.
      */
     @Override
     public int hashCode() {

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SingletonAttribute.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -16,9 +16,10 @@
  */
 package org.apache.sis.feature;
 
-// Branch-dependent imports
 import java.util.Objects;
 
+// Branch-dependent imports
+
 
 /**
  * An instance of an {@linkplain DefaultAttributeType attribute type} containing at most one value.

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/SparseFeature.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -18,6 +18,7 @@ package org.apache.sis.feature;
 
 import java.util.Map;
 import java.util.HashMap;
+import java.util.Objects;
 import java.util.ConcurrentModificationException;
 import org.opengis.metadata.maintenance.ScopeCode;
 import org.opengis.metadata.quality.DataQuality;
@@ -27,7 +28,6 @@ import org.apache.sis.util.ArgumentCheck
 import org.apache.sis.util.CorruptedObjectException;
 
 // Branch-dependent imports
-import java.util.Objects;
 
 
 /**

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/StringJoinOperation.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -421,7 +421,7 @@ final class StringJoinOperation extends
     /**
      * Appends a string representation of the "formula" used for computing the result.
      *
-     * @param  buffer where to format the "formula".
+     * @param  buffer  where to format the "formula".
      */
     @Override
     void formatResultFormula(final Appendable buffer) throws IOException {

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/Validator.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -50,8 +50,8 @@ final class Validator {
     /**
      * Creates a new validator.
      *
-     * @param feature {@code FEATURE} if the object to validate is a feature,
-     *        or {@code ATTRIBUTE} for an attribute, or {@code null} otherwise.
+     * @param feature  {@code FEATURE} if the object to validate is a feature, or
+     *                 {@code ATTRIBUTE} for an attribute, or {@code null} otherwise.
      */
     Validator(final ScopeCode scope) {
         quality = new DefaultDataQuality();

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AssociationRoleBuilder.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -162,7 +162,7 @@ public final class AssociationRoleBuilde
      * {@linkplain #getMaximumOccurs() maximal number} of associations, than the maximum
      * is also set to that value.
      *
-     * @param  occurs the new minimum number of associations.
+     * @param  occurs  the new minimum number of associations.
      * @return {@code this} for allowing method calls chaining.
      */
     @Override
@@ -176,7 +176,7 @@ public final class AssociationRoleBuilde
      * {@linkplain #getMinimumOccurs() minimal number} of associations, than the minimum
      * is also set to that value.
      *
-     * @param  occurs the new maximum number of associations.
+     * @param  occurs  the new maximum number of associations.
      * @return {@code this} for allowing method calls chaining.
      */
     @Override

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/AttributeTypeBuilder.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -123,8 +123,8 @@ public final class AttributeTypeBuilder<
     /**
      * Creates a new {@code AttributeType} builder for values of the given class.
      *
-     * @param owner      the builder of the {@code FeatureType} for which to add the attribute.
-     * @param valueClass the class of attribute values.
+     * @param owner       the builder of the {@code FeatureType} for which to add the attribute.
+     * @param valueClass  the class of attribute values.
      */
     AttributeTypeBuilder(final FeatureTypeBuilder owner, final Class<V> valueClass) {
         super(owner, null);
@@ -217,7 +217,7 @@ public final class AttributeTypeBuilder<
      * {@linkplain #getMaximumOccurs() maximal number} of attribute values, than the maximum
      * is also set to that value.
      *
-     * @param  occurs the new minimum number of attribute values.
+     * @param  occurs  the new minimum number of attribute values.
      * @return {@code this} for allowing method calls chaining.
      */
     @Override
@@ -231,7 +231,7 @@ public final class AttributeTypeBuilder<
      * {@linkplain #getMinimumOccurs() minimal number} of attribute values, than the minimum
      * is also set to that value.
      *
-     * @param  occurs the new maximum number of attribute values.
+     * @param  occurs  the new maximum number of attribute values.
      * @return {@code this} for allowing method calls chaining.
      */
     @Override
@@ -330,7 +330,7 @@ public final class AttributeTypeBuilder<
      * <p>This is a convenience method for {@link #addCharacteristic(Class)} with a value
      * of type {@link Set} and a conventional name.</p>
      *
-     * @param  values valid values.
+     * @param  values  valid values.
      * @return {@code this} for allowing method calls chaining.
      *
      * @see #characteristics()

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/CharacteristicTypeBuilder.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.feature.builder;
 
+import java.util.Objects;
 import org.opengis.util.GenericName;
 import org.apache.sis.feature.DefaultAttributeType;
 import org.apache.sis.util.Classes;
@@ -23,7 +24,6 @@ import org.apache.sis.util.ObjectConvert
 import org.apache.sis.util.UnconvertibleObjectException;
 
 // Branch-dependent imports
-import java.util.Objects;
 
 
 /**
@@ -89,8 +89,8 @@ public final class CharacteristicTypeBui
     /**
      * Creates a new characteristic builder for values of the given class.
      *
-     * @param owner      the builder of the {@code AttributeType} for which to add this property.
-     * @param valueClass the class of characteristic values.
+     * @param owner       the builder of the {@code AttributeType} for which to add this property.
+     * @param valueClass  the class of characteristic values.
      */
     CharacteristicTypeBuilder(final AttributeTypeBuilder<?> owner, final Class<V> valueClass) {
         super(null, owner.getLocale());

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/FeatureTypeBuilder.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -283,7 +283,7 @@ public class FeatureTypeBuilder extends
      * Sets whether the feature type to create will be abstract.
      * If this method is not invoked, then the default value is {@code false}.
      *
-     * @param  isAbstract whether the feature type will be abstract.
+     * @param  isAbstract  whether the feature type will be abstract.
      * @return {@code this} for allowing method calls chaining.
      */
     public FeatureTypeBuilder setAbstract(final boolean isAbstract) {
@@ -448,8 +448,10 @@ public class FeatureTypeBuilder extends
         }
         defaultMinimumOccurs = minimumOccurs;
         defaultMaximumOccurs = maximumOccurs;
-        // No need to clear the cache because this change affects only
-        // the next properties to be created, not the existing ones.
+        /*
+         * No need to clear the cache because this change affects only
+         * the next properties to be created, not the existing ones.
+         */
         return this;
     }
 
@@ -527,7 +529,7 @@ public class FeatureTypeBuilder extends
      * The value class can not be {@code Feature.class} since features shall be handled
      * as {@linkplain #addAssociation(FeatureType) associations} instead than attributes.
      *
-     * @param  <V>  the compile-time value of {@code valueClass} argument.
+     * @param  <V>         the compile-time value of {@code valueClass} argument.
      * @param  valueClass  the class of attribute values (can not be {@code Feature.class}).
      * @return a builder for an {@code AttributeType}.
      *
@@ -759,8 +761,10 @@ public class FeatureTypeBuilder extends
                  */
                 if (builder == defaultGeometry && geometryIndex >= 0) {
                     if (propertyTypes[geometryIndex] != null) {
-                        // Assuming that there is no bug in our implementation, this error could happen if the user
-                        // has modified this FeatureTypeBuilder in another thread during this build() execution.
+                        /*
+                         * Assuming that there is no bug in our implementation, this error could happen if the user
+                         * has modified this FeatureTypeBuilder in another thread during this build() execution.
+                         */
                         throw new CorruptedObjectException();
                     }
                     propertyTypes[geometryIndex] = FeatureOperations.link(name(AttributeConvention.GEOMETRY_PROPERTY), instance);
@@ -784,8 +788,10 @@ public class FeatureTypeBuilder extends
              */
             if (identifierTypes != null) {
                 if (identifierCursor != identifierTypes.length) {
-                    // Assuming that there is no bug in our implementation, this error could happen if the user
-                    // has modified this FeatureTypeBuilder in another thread during this build() execution.
+                    /*
+                     * Assuming that there is no bug in our implementation, this error could happen if the user
+                     * has modified this FeatureTypeBuilder in another thread during this build() execution.
+                     */
                     throw new CorruptedObjectException();
                 }
                 if (AttributeConvention.IDENTIFIER_PROPERTY.equals(identifierTypes[0].getName())) {
@@ -817,14 +823,16 @@ public class FeatureTypeBuilder extends
      * Replaces the given builder instance by a new instance, or delete the old instance.
      * This builder should contain exactly one instance of the given {@code old} builder.
      *
-     * @param old  the instance to replace.
+     * @param old          the instance to replace.
      * @param replacement  the replacement, or {@code null} for deleting the old instance.
      */
     final void replace(final PropertyTypeBuilder old, final PropertyTypeBuilder replacement) {
         final int index = properties.lastIndexOf(old);
         if (index < 0 || (replacement != null ? properties.set(index, replacement) : properties.remove(index)) != old) {
-            // Assuming that there is no bug in our algorithm, this exception should never happen
-            // unless builder state has been changed in another thread before this method completed.
+            /*
+             * Assuming that there is no bug in our algorithm, this exception should never happen
+             * unless builder state has been changed in another thread before this method completed.
+             */
             throw new CorruptedObjectException();
         }
         if (old == defaultGeometry) {

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/PropertyTypeBuilder.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -119,7 +119,7 @@ public abstract class PropertyTypeBuilde
      * {@linkplain #getMaximumOccurs() maximal number} of property values, than the maximum
      * is also set to that value.
      *
-     * @param  occurs the new minimum number of property values.
+     * @param  occurs  the new minimum number of property values.
      * @return {@code this} for allowing method calls chaining.
      *
      * @see #getMinimumOccurs()
@@ -156,7 +156,7 @@ public abstract class PropertyTypeBuilde
      * {@linkplain #getMinimumOccurs() minimal number} of property values, than the minimum
      * is also set to that value.
      *
-     * @param  occurs the new maximum number of property values.
+     * @param  occurs  the new maximum number of property values.
      * @return {@code this} for allowing method calls chaining.
      *
      * @see #getMaximumOccurs()

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/feature/builder/TypeBuilder.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -258,7 +258,7 @@ public abstract class TypeBuilder implem
     /**
      * Sets a concise definition of the element.
      *
-     * @param  definition a concise definition of the element, or {@code null} if none.
+     * @param  definition  a concise definition of the element, or {@code null} if none.
      * @return {@code this} for allowing method calls chaining.
      *
      * @see #getDefinition()
@@ -287,7 +287,7 @@ public abstract class TypeBuilder implem
      * Sets a natural language designator for the element.
      * This can be used as an alternative to the {@linkplain #getName() name} in user interfaces.
      *
-     * @param  designation a natural language designator for the element, or {@code null} if none.
+     * @param  designation  a natural language designator for the element, or {@code null} if none.
      * @return {@code this} for allowing method calls chaining.
      *
      * @see #getDesignation()
@@ -437,8 +437,8 @@ public abstract class TypeBuilder implem
      * Same as {@link org.apache.sis.util.ArgumentChecks#ensureNonNull(String, Object)},
      * but uses the current locale in case of error.
      *
-     * @param  name the name of the argument to be checked. Used only if an exception is thrown.
-     * @param  object the user argument to check against null value.
+     * @param  name    the name of the argument to be checked. Used only if an exception is thrown.
+     * @param  object  the user argument to check against null value.
      * @throws NullArgumentException if {@code object} is null.
      */
     final void ensureNonNull(final String name, final Object value) {
@@ -462,8 +462,8 @@ public abstract class TypeBuilder implem
      * Same as {@link org.apache.sis.util.ArgumentChecks#ensureNonEmpty(String, CharSequence)},
      * but uses the current locale in case of error.
      *
-     * @param  name the name of the argument to be checked. Used only if an exception is thrown.
-     * @param  text the user argument to check against null value and empty sequences.
+     * @param  name  the name of the argument to be checked. Used only if an exception is thrown.
+     * @param  text  the user argument to check against null value and empty sequences.
      * @throws NullArgumentException if {@code text} is null.
      * @throws IllegalArgumentException if {@code text} is empty.
      */

Modified: sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/main/java/org/apache/sis/internal/feature/AttributeConvention.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -248,7 +248,7 @@ public final class AttributeConvention e
      * This method gets the value or default value from the characteristic named {@link #CRS_CHARACTERISTIC}.
      *
      * @param  attribute  the attribute for which to get the CRS, or {@code null}.
-     * @return The Coordinate Reference System characteristic of the given attribute, or {@code null} if none.
+     * @return the Coordinate Reference System characteristic of the given attribute, or {@code null} if none.
      * @throws ClassCastException if {@link #CRS_CHARACTERISTIC} has been found but is associated
      *         to an object which is not a {@link CoordinateReferenceSystem} instance.
      *
@@ -275,7 +275,7 @@ public final class AttributeConvention e
      * This method gets the value or default value from the characteristic named {@link #MAXIMAL_LENGTH_CHARACTERISTIC}.
      *
      * @param  attribute  the attribute for which to get the CRS, or {@code null}.
-     * @return The Coordinate Reference System characteristic of the given attribute, or {@code null} if none.
+     * @return the Coordinate Reference System characteristic of the given attribute, or {@code null} if none.
      * @throws ClassCastException if {@link #MAXIMAL_LENGTH_CHARACTERISTIC} has been found but is associated
      *         to an object which is not an {@link Integer} instance.
      *

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicMapTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -40,7 +40,7 @@ public final strictfp class Characterist
     /**
      * Creates an attribute for a temperature measurement of 20°C with a ±0.1°C accuracy.
      *
-     * @return A {@code "temperature"} attribute with two characteristics: {@code "accuracy"} and {@code "units"}.
+     * @return a {@code "temperature"} attribute with two characteristics: {@code "accuracy"} and {@code "units"}.
      */
     public static AbstractAttribute<Float> temperature() {
         return new SingletonAttribute<>(CharacteristicTypeMapTest.temperature(), 20f);
@@ -49,9 +49,9 @@ public final strictfp class Characterist
     /**
      * Creates an attribute for the given characteristic.
      *
-     * @param  temperature The attribute created by {@link #temperature()}.
-     * @param  name Either {@code "accuracy"} or {@code "units"}.
-     * @return An attribute for the given name.
+     * @param  temperature  the attribute created by {@link #temperature()}.
+     * @param  name         either {@code "accuracy"} or {@code "units"}.
+     * @return an attribute for the given name.
      */
     private static AbstractAttribute<?> create(final AbstractAttribute<?> temperature, final String name) {
         return new SingletonAttribute<>(((DefaultAttributeType<?>) temperature.getType()).characteristics().get(name));
@@ -265,9 +265,9 @@ public final strictfp class Characterist
     /**
      * Verifies that the given characteristics map contains entries for the given attributes.
      *
-     * @param units           The first expected value in iteration order.
-     * @param accuracy        The second expected value in iteration order.
-     * @param characteristics The map to verify.
+     * @param  units            the first expected value in iteration order.
+     * @param  accuracy         the second expected value in iteration order.
+     * @param  characteristics  the map to verify.
      */
     private static void assertEntriesEqual(final AbstractAttribute<?> units, final AbstractAttribute<?> accuracy,
             final Map<String,AbstractAttribute<?>> characteristics)
@@ -283,9 +283,9 @@ public final strictfp class Characterist
     /**
      * Sets the accuracy characteristic in the given attribute.
      *
-     * @param temperature The attribute where to set the accuracy.
-     * @param isFirstTime {@code true} if the accuracy value is set for the first time.
-     * @param value       The new accuracy value.
+     * @param  temperature  the attribute where to set the accuracy.
+     * @param  isFirstTime  {@code true} if the accuracy value is set for the first time.
+     * @param  value        the new accuracy value.
      */
     private static void setAccuracy(final AbstractAttribute<Float> temperature, final boolean isFirstTime, final float value) {
         assertEquals("keySet.add", isFirstTime, temperature.characteristics().keySet().add("accuracy"));
@@ -320,7 +320,7 @@ public final strictfp class Characterist
      * Tests the reconstruction of {@link CharacteristicTypeMap} after serialization.
      */
     @Test
-    @DependsOnMethod({"testEquals", "testAddValue"}) // Implementation of readObject use values().addAll(...).
+    @DependsOnMethod({"testEquals", "testAddValue"})            // Implementation of readObject use values().addAll(…).
     public void testSerialization() {
         final AbstractAttribute<Float> temperature = temperature();
         setAccuracy(temperature, true, 0.2f);

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/CharacteristicTypeMapTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -41,7 +41,7 @@ public final strictfp class Characterist
     /**
      * Creates an attribute type for a temperature measurement in °C with a ±0.1°C accuracy.
      *
-     * @return A {@code "temperature"} type attribute with two characteristics: {@code "accuracy"} and {@code "units"}.
+     * @return a {@code "temperature"} type attribute with two characteristics: {@code "accuracy"} and {@code "units"}.
      */
     public static DefaultAttributeType<Float> temperature() {
         final DefaultAttributeType<?> units, accuracy;

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -45,9 +45,9 @@ public final strictfp class DefaultAssoc
      * Creates an association to a twin town. We arbitrarily fix the maximum number
      * of occurrences to 1, even if in reality some cities have many twin towns.
      *
-     * @param cyclic {@code true} if in addition to the association from <var>A</var> to <var>B</var>,
-     *        we also want an association from <var>B</var> to <var>A</var>, thus creating a cycle.
-     * @return The association to use for testing purpose.
+     * @param  cyclic  {@code true} if in addition to the association from <var>A</var> to <var>B</var>,
+     *                 we also want an association from <var>B</var> to <var>A</var>, thus creating a cycle.
+     * @return the association to use for testing purpose.
      */
     static DefaultAssociationRole twinTown(final boolean cyclic) {
         final Map<String,?> properties = singletonMap(NAME_KEY, "twin town");
@@ -64,9 +64,9 @@ public final strictfp class DefaultAssoc
     /**
      * Returns a City feature type which may have a twin town.
      *
-     * @param cyclic {@code true} if in addition to the association from <var>A</var> to <var>B</var>,
-     *        we also want an association from <var>B</var> to <var>A</var>, thus creating a cycle.
-     * @return The association to use for testing purpose.
+     * @param  cyclic  {@code true} if in addition to the association from <var>A</var> to <var>B</var>,
+     *                 we also want an association from <var>B</var> to <var>A</var>, thus creating a cycle.
+     * @return the association to use for testing purpose.
      */
     static DefaultFeatureType twinTownCity(final boolean cyclic) {
         final DefaultAssociationRole twinTown = twinTown(cyclic);
@@ -77,10 +77,10 @@ public final strictfp class DefaultAssoc
     /**
      * Convenience method creating a feature type of the given name, parent and property.
      *
-     * @param name     The name as either a {@link String} or a {@link GenericName}.
-     * @param parent   A feature type created by {@link DefaultFeatureTypeTest#city()}, or {@code null}.
-     * @param property The association to an other feature.
-     * @return The feature type to use for testing purpose.
+     * @param  name      the name as either a {@link String} or a {@link GenericName}.
+     * @param  parent    a feature type created by {@link DefaultFeatureTypeTest#city()}, or {@code null}.
+     * @param  property  the association to an other feature.
+     * @return the feature type to use for testing purpose.
      */
     private static DefaultFeatureType createType(final Object name,
             final DefaultFeatureType parent, final DefaultAssociationRole... property)

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAttributeTypeTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -44,7 +44,7 @@ public final strictfp class DefaultAttri
     /**
      * Creates an attribute type for city name.
      *
-     * @return An attribute type for a city name.
+     * @return an attribute type for a city name.
      */
     public static DefaultAttributeType<String> city() {
         return city(new HashMap<String,Object>());
@@ -53,7 +53,7 @@ public final strictfp class DefaultAttri
     /**
      * Implementation of {@link #city()} using the given map (for reusing existing objects).
      *
-     * @param identification An empty temporary map (provided only for recycling existing instances).
+     * @param  identification  an empty temporary map (provided only for recycling existing instances).
      */
     static DefaultAttributeType<String> city(final Map<String,Object> identification) {
         assertNull(identification.put(DefaultAttributeType.NAME_KEY, "city"));
@@ -73,7 +73,7 @@ public final strictfp class DefaultAttri
     /**
      * Creates an attribute type for city population.
      *
-     * @param identification An empty temporary map (provided only for recycling existing instances).
+     * @param  identification  an empty temporary map (provided only for recycling existing instances).
      */
     static DefaultAttributeType<Integer> population(final Map<String,Object> identification) {
         assertNull(identification.put(DefaultAttributeType.NAME_KEY, "population"));
@@ -90,7 +90,7 @@ public final strictfp class DefaultAttri
      * This applies only to features of type "Capital".
      * This is used for testing feature type inheritance.
      *
-     * @return An attribute type for the name of the parliament in a capital.
+     * @return an attribute type for the name of the parliament in a capital.
      */
     public static DefaultAttributeType<String> parliament() {
         return attribute("parliament");
@@ -100,7 +100,7 @@ public final strictfp class DefaultAttri
      * Creates an attribute type for a list of universities.
      * The cardinality is [0 … ∞].
      *
-     * @return An attribute type for university names.
+     * @return an attribute type for university names.
      */
     public static DefaultAttributeType<String> universities() {
         return new DefaultAttributeType<>(

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultFeatureTypeTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -52,7 +52,7 @@ public final strictfp class DefaultFeatu
      *   <li>{@code population} as an {@link Integer} (mandatory)</li>
      * </ul>
      *
-     * @return The feature for a city.
+     * @return the feature for a city.
      */
     public static DefaultFeatureType city() {
         final Map<String,Object> identification = new HashMap<>();
@@ -74,7 +74,7 @@ public final strictfp class DefaultFeatu
      *   <li>{@code universities} as an arbitrary amount of {@link String}</li>
      * </ul>
      *
-     * @return The feature for an university city.
+     * @return the feature for an university city.
      */
     public static DefaultFeatureType universityCity() {
         return new DefaultFeatureType(singletonMap(DefaultFeatureType.NAME_KEY, "University city"), false,
@@ -91,7 +91,7 @@ public final strictfp class DefaultFeatu
      *   <li>{@code parliament} as a  {@link String}  (mandatory)</li>
      * </ul>
      *
-     * @return The feature for a capital.
+     * @return the feature for a capital.
      */
     public static DefaultFeatureType capital() {
         return new DefaultFeatureType(singletonMap(DefaultFeatureType.NAME_KEY, "Capital"), false,
@@ -109,7 +109,7 @@ public final strictfp class DefaultFeatu
      *   <li>{@code isGlobal}   as a  {@link Boolean}      (mandatory) — whether the city has an effect on global affairs.</li>
      * </ul>
      *
-     * @return The feature for a metropolis.
+     * @return the feature for a metropolis.
      */
     public static DefaultFeatureType metropolis() {
         final Map<String,Object> identification = new HashMap<>(4);
@@ -189,10 +189,10 @@ public final strictfp class DefaultFeatu
      *   <li>{@link DefaultFeatureType#getProperty(String)}</li>
      * </ul>
      *
-     * @param feature The feature to verify.
-     * @param includeSuperTypes {@code true} for including the properties inherited from the super-types,
-     *        or {@code false} for returning only the properties defined explicitely in the feature type.
-     * @param expected Names of the expected properties.
+     * @param  feature            the feature to verify.
+     * @param  includeSuperTypes  {@code true} for including the properties inherited from the super-types, or
+     *                            {@code false} for returning only the properties defined explicitely in the feature type.
+     * @param  expected           names of the expected properties.
      */
     private static void assertPropertiesEquals(final DefaultFeatureType feature, final boolean includeSuperTypes,
             final String... expected)
@@ -478,7 +478,7 @@ public final strictfp class DefaultFeatu
         assertArrayEquals("superTypes", new Object[] {metropolis, universityCity}, worldMetropolis.getSuperTypes().toArray());
         assertFalse      ("isAbstract",      worldMetropolis.isAbstract());
         assertFalse      ("isSparse",        worldMetropolis.isSparse());
-        assertFalse      ("isSimple",        worldMetropolis.isSimple()); // Because of the arbitrary amount of universities.
+        assertFalse      ("isSimple",        worldMetropolis.isSimple());           // Because of the arbitrary amount of universities.
         assertEquals     ("instanceSize", 6, worldMetropolis.indices().size());
 
         assertPropertiesEquals(worldMetropolis, false, "region", "temperature");

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/EnvelopeOperationTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -60,7 +60,7 @@ public final strictfp class EnvelopeOper
      *   <li>{@code bounds} as the feature envelope attribute.</li>
      * </ul>
      *
-     * @param  defaultGeometry 1 for using "classes" as the default geometry, or 3 for "gymnasium".
+     * @param  defaultGeometry  1 for using "classes" as the default geometry, or 3 for "gymnasium".
      * @return the feature for a school.
      */
     private static DefaultFeatureType school(final int defaultGeometry) throws FactoryException {

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureMemoryBenchmark.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureMemoryBenchmark.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureMemoryBenchmark.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureMemoryBenchmark.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -64,8 +64,8 @@ public final class FeatureMemoryBenchmar
     /**
      * Creates a new benchmark.
      *
-     * @param useSIS {@code true} for using SIS implementation, or {@code false} for {@link HashMap}.
-     * @param isSimple In the case of non-SIS implementation, whether we use simple features or complex features.
+     * @param useSIS    {@code true} for using SIS implementation, or {@code false} for {@link HashMap}.
+     * @param isSimple  in the case of non-SIS implementation, whether we use simple features or complex features.
      */
     private FeatureMemoryBenchmark(final boolean useSIS, final boolean isSimple) {
         features = new ArrayList<>(100000);
@@ -166,7 +166,7 @@ public final class FeatureMemoryBenchmar
     /**
      * Runs from the command line. This method expect one argument, which is "sis", "simple" or "complex".
      *
-     * @param arguments Command line arguments.
+     * @param  arguments  command line arguments.
      */
     public static void main(final String[] arguments) {
         if (arguments.length == 1) {

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/FeatureTestCase.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -78,10 +78,10 @@ public abstract strictfp class FeatureTe
      * without overriding {@code setProperty(Property)}.
      * Consequently, this assertion needs to be relaxed by {@link AbstractFeatureTest}.
      *
-     * @param name      the property name to check.
-     * @param expected  the expected property instance.
-     * @param modified  {@code true} if {@code expected} has been modified <strong>after</strong> it has been set
-     *                  to the {@link #feature} instance. Not all feature implementations can see such changes.
+     * @param  name      the property name to check.
+     * @param  expected  the expected property instance.
+     * @param  modified  {@code true} if {@code expected} has been modified <strong>after</strong> it has been set
+     *                   to the {@link #feature} instance. Not all feature implementations can see such changes.
      * @return {@code true} if the property is the expected instance, or {@code false} if it is another instance.
      */
     boolean assertSameProperty(final String name, final Property expected, final boolean modified) {
@@ -124,9 +124,9 @@ public abstract strictfp class FeatureTe
      * First, this method verifies that the previous value is equals to the given one.
      * Then, this method set the attribute to the given value and check if the result.
      *
-     * @param name      the name of the attribute to set.
-     * @param oldValue  the expected old value (may be {@code null}).
-     * @param newValue  the new value to set.
+     * @param  name      the name of the attribute to set.
+     * @param  oldValue  the expected old value (may be {@code null}).
+     * @param  newValue  the new value to set.
      */
     private void setAttributeValue(final String name, final Object oldValue, final Object newValue) {
         assertEquals(name, oldValue, getAttributeValue(name));

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/LinkOperationTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -47,7 +47,7 @@ public final strictfp class LinkOperatio
      *   <li>{@code name} as a link to the {@code city} attribute.</li>
      * </ul>
      *
-     * @return The feature for a city.
+     * @return the feature for a city.
      */
     private static DefaultFeatureType city() {
         final DefaultFeatureType city = DefaultFeatureTypeTest.city();

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/MultiValuedAttributeTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -135,7 +135,7 @@ public final strictfp class MultiValuedA
     /**
      * Tests {@link MultiValuedAttribute#clone()}.
      *
-     * @throws CloneNotSupportedException Should never happen.
+     * @throws CloneNotSupportedException should never happen.
      */
     @Test
     @DependsOnMethod("testEquals")

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/NoOperation.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -46,9 +46,9 @@ final strictfp class NoOperation extends
      * Constructs an operation from the given properties. The identification map is given unchanged to
      * the {@linkplain AbstractIdentifiedType#AbstractIdentifiedType(Map) super-class constructor}.
      *
-     * @param identification The name and other information to be given to this operation.
-     * @param parameters     A description of the input parameters.
-     * @param result         The type of the result, or {@code null} if none.
+     * @param  identification  the name and other information to be given to this operation.
+     * @param  parameters      a description of the input parameters.
+     * @param  result          the type of the result, or {@code null} if none.
      */
     NoOperation(final Map<String,?> identification,
             final ParameterDescriptorGroup parameters, final AbstractIdentifiedType result)
@@ -61,7 +61,7 @@ final strictfp class NoOperation extends
     /**
      * Returns a description of the input parameters.
      *
-     * @return Description of the input parameters.
+     * @return description of the input parameters.
      */
     @Override
     public ParameterDescriptorGroup getParameters() {
@@ -71,7 +71,7 @@ final strictfp class NoOperation extends
     /**
      * Returns the expected result type, or {@code null} if none.
      *
-     * @return The type of the result, or {@code null} if none.
+     * @return the type of the result, or {@code null} if none.
      */
     @Override
     public AbstractIdentifiedType getResult() {

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/SingletonAttributeTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -112,9 +112,9 @@ public final strictfp class SingletonAtt
     /**
      * Verifies that the given element reports a validation failure with the given explanation.
      *
-     * @param propertyName The name of the property that failed validation.
-     * @param explanation  The expected explanation.
-     * @param consistency  The report element to test.
+     * @param  propertyName  the name of the property that failed validation.
+     * @param  explanation   the expected explanation.
+     * @param  consistency   the report element to test.
      */
     private static void assertDomainConsistencyEquals(final String propertyName, final String explanation,
             final DomainConsistency consistency)
@@ -152,7 +152,7 @@ public final strictfp class SingletonAtt
     /**
      * Tests {@link SingletonAttribute#clone()}.
      *
-     * @throws CloneNotSupportedException Should never happen.
+     * @throws CloneNotSupportedException should never happen.
      */
     @Test
     @DependsOnMethod("testEquals")

Modified: sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-feature/src/test/java/org/apache/sis/feature/StringJoinOperationTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -51,7 +51,7 @@ public final strictfp class StringJoinOp
      * avoid avoiding confusion if a code spelled the variable name (e.g. {@code prefix})
      * instead of using it.
      *
-     * @return The feature for a person.
+     * @return the feature for a person.
      */
     private static DefaultFeatureType person() {
         final AbstractIdentifiedType nameType = new DefaultAttributeType<>(name("name"), String.class, 1, 1, null);

Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/MetadataStandard.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -330,7 +330,7 @@ public class MetadataStandard implements
          */
         final Class<?> type;
         if (value instanceof Class<?>) {
-            type = (Class<?>) value;                            // Stored result of previous call to findInterface(…).
+            type = (Class<?>) value;                        // Stored result of previous call to findInterface(…).
             assert type == findInterface(key) : key;
         } else if (key.isValid()) {
             /*
@@ -388,7 +388,7 @@ public class MetadataStandard implements
      *         or implements an interface of this standard.
      */
     public boolean isMetadata(final Class<?> type) {
-        return (type != null) && isMetadata(new CacheKey(type));
+        return (type != null) && !type.isPrimitive() && isMetadata(new CacheKey(type));
     }
 
     /**

Modified: sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/test/java/org/apache/sis/metadata/MetadataStandardTest.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -92,6 +92,8 @@ public final strictfp class MetadataStan
         assertFalse("isMetadata(SimpleIdentifiedObject)", isMetadata(SimpleIdentifiedObject.class));
         assertFalse("isMetadata(GeographicCRS)",          isMetadata(GeographicCRS.class));
 //      assertFalse("isMetadata(RectifiedGrid)",          isMetadata(RectifiedGrid.class));
+        assertFalse("isMetadata(Double)",                 isMetadata(Double.class));
+        assertFalse("isMetadata(double)",                 isMetadata(Double.TYPE));
 
         standard = MetadataStandard.ISO_19111;
         assertFalse("isMetadata(String)",                 isMetadata(String.class));

Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/CRS.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -322,7 +322,7 @@ public final class CRS extends Static {
                  * The 'worldwide' flag is a little optimization for remembering that we do not need to compute
                  * the union anymore, but we still need to continue the loop for fetching all bounding boxes.
                  */
-                bestCRS = crs;
+                bestCRS = crs;                      // Fallback to be used if we don't find anything better.
                 worldwide = true;
             } else {
                 domains[i] = bbox;
@@ -408,7 +408,7 @@ public final class CRS extends Static {
                         final CoordinateReferenceSystem baseCRS = ((GeneralDerivedCRS) crs).getBaseCRS();
                         bbox = getGeographicBoundingBox(baseCRS);
                         if (bbox == null && bestCRS == null && baseCRS instanceof GeodeticCRS) {
-                            bestCRS = baseCRS;
+                            bestCRS = baseCRS;      // Fallback to be used if we don't find anything better.
                         }
                         tryDerivedCRS = true;
                         derivedCRS[i] = baseCRS;

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/TabularFormat.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -69,7 +69,6 @@ import org.apache.sis.util.resources.Err
  *
  * @see TableAppender
  */
-@SuppressWarnings("CloneableClassWithoutClone")   // Because this class does not contain field that need to be cloned.
 public abstract class TabularFormat<T> extends CompoundFormat<T> {
     /**
      * For cross-version compatibility.
@@ -331,4 +330,14 @@ scan:   for (int i=0; i<length; i++) {
         }
         return parsePattern.matcher(text);
     }
+
+    /**
+     * Returns a clone of this format.
+     *
+     * @return a clone of this format.
+     */
+    @Override
+    public TabularFormat<T> clone() {
+        return (TabularFormat<T>) super.clone();
+    }
 }

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/StatisticsFormat.java [UTF-8] Sun Jan 22 06:02:59 2017
@@ -51,7 +51,6 @@ import static java.lang.Math.*;
  * @version 0.3
  * @module
  */
-@SuppressWarnings("CloneableClassWithoutClone")   // Because this class does not contain field that need to be cloned.
 public class StatisticsFormat extends TabularFormat<Statistics> {
     /**
      * For cross-version compatibility.
@@ -442,4 +441,14 @@ public class StatisticsFormat extends Ta
         format.setMinimumFractionDigits(digits);
         format.setMaximumFractionDigits(digits);
     }
+
+    /**
+     * Returns a clone of this format.
+     *
+     * @return a clone of this format.
+     */
+    @Override
+    public StatisticsFormat clone() {
+        return (StatisticsFormat) super.clone();
+    }
 }

Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1779777&r1=1779776&r2=1779777&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Sun Jan 22 06:02:59 2017
@@ -734,7 +734,7 @@ Apache SIS is a free software, Java lang
           <breakiterator>true</breakiterator>                   <!-- Better boundary detection when determining the end of the first sentence. -->
           <validateLinks>true</validateLinks>                   <!-- Validates content of package-list resources. -->
           <links>
-            <link>http://static.javadoc.io/javax.measure/unit-api/1.0</link>
+            <link>http://unitsofmeasurement.github.io/unit-api/site/apidocs</link>
             <link>http://www.geoapi.org/3.0/javadoc</link>
           </links>
 



Mime
View raw message