sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779174 [3/4] - in /sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis: io/ math/ measure/ setup/ util/ util/collection/ util/iso/ util/logging/ util/resources/ xml/
Date Tue, 17 Jan 2017 11:50:22 GMT
Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CacheEntries.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -35,8 +35,8 @@ import java.lang.ref.Reference;
  * <div class="section">Thread safety</div>
  * This class is thread-safe if and only if the {@code Set} given to the constructor is thread-safe.
  *
- * @param <K> The type of key objects.
- * @param <V> The type of value objects.
+ * @param  <K>  the type of key objects.
+ * @param  <V>  the type of value objects.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -52,7 +52,7 @@ final class CacheEntries<K,V> extends Ab
     /**
      * Wraps the given set of entries of a {@link Cache#map}.
      *
-     * @param entries The set of entries. Implementation shall support concurrency.
+     * @param  entries  the set of entries. Implementation shall support concurrency.
      */
     CacheEntries(final Set<Map.Entry<K,Object>> entries) {
         this.entries = entries;
@@ -84,8 +84,8 @@ final class CacheEntries<K,V> extends Ab
     }
 
     /**
-     * An iterator over the entries in the {@link Cache#map}. Handlers will be skipped and the
-     * values of weak references are returned instead of the {@link Reference} object.
+     * An iterator over the entries in the {@link Cache#map}. Handlers will be skipped and
+     * the values of weak references are returned instead of the {@link Reference} object.
      */
     private static final class Iter<K,V> implements Iterator<Map.Entry<K,V>> {
         /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/CodeListSet.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -112,8 +112,8 @@ public class CodeListSet<E extends CodeL
      * Creates an initially empty set for code lists of the given type.
      * The given {@code CodeList} type shall be final.
      *
-     * @param  elementType The type of code list elements to be included in this set.
-     * @throws IllegalArgumentException If the given class is not final.
+     * @param  elementType  the type of code list elements to be included in this set.
+     * @throws IllegalArgumentException if the given class is not final.
      */
     public CodeListSet(final Class<E> elementType) throws IllegalArgumentException {
         if (!Modifier.isFinal(elementType.getModifiers())) {
@@ -129,10 +129,10 @@ public class CodeListSet<E extends CodeL
      * list elements are created after the invocation of this {@code CodeListSet} constructor, then
      * those new elements will <em>not</em> be in this set.
      *
-     * @param  elementType The type of code list elements to be included in this set.
+     * @param  elementType  the type of code list elements to be included in this set.
      * @param  fill {@code true} for filling the set with all known elements of the given type,
      *         or {@code false} for leaving the set empty.
-     * @throws IllegalArgumentException If the given class is not final.
+     * @throws IllegalArgumentException if the given class is not final.
      */
     public CodeListSet(final Class<E> elementType, final boolean fill) throws IllegalArgumentException {
         this(elementType);
@@ -154,7 +154,7 @@ public class CodeListSet<E extends CodeL
     /**
      * Returns the type of code list elements in this set.
      *
-     * @return The type of code list elements in this set.
+     * @return the type of code list elements in this set.
      */
     @Override
     public Class<E> getElementType() {
@@ -199,7 +199,7 @@ public class CodeListSet<E extends CodeL
     /**
      * Returns the number of elements in this set.
      *
-     * @return The number of elements in this set.
+     * @return the number of elements in this set.
      */
     @Override
     public int size() {
@@ -214,7 +214,7 @@ public class CodeListSet<E extends CodeL
     /**
      * Adds the specified code list element in this set.
      *
-     * @param  element The code list element to add in this set.
+     * @param  element  the code list element to add in this set.
      * @return {@code true} if this set has been modified as a consequence of this method call.
      */
     @Override
@@ -255,7 +255,7 @@ public class CodeListSet<E extends CodeL
      * This methods does nothing if the given argument is {@code null} or is
      * not an instance of the code list class specified at construction time.
      *
-     * @param  object The code list element to remove from this set.
+     * @param  object  the code list element to remove from this set.
      * @return {@code true} if this set has been modified as a consequence of this method call.
      */
     @Override
@@ -288,7 +288,7 @@ public class CodeListSet<E extends CodeL
      * This methods returns {@code false} if the given argument is {@code null} or
      * is not an instance of the code list class specified at construction time.
      *
-     * @param  object The element to test for presence in this set.
+     * @param  object  the element to test for presence in this set.
      * @return {@code true} if the given object is contained in this set.
      */
     @Override
@@ -310,7 +310,7 @@ public class CodeListSet<E extends CodeL
     /**
      * Returns {@code true} if this set contains all the elements of the given collection.
      *
-     * @param  c The collection to be checked for containment in this set.
+     * @param  c  the collection to be checked for containment in this set.
      * @return {@code true} if this set contains all elements of the given collection.
      */
     @Override
@@ -345,14 +345,16 @@ public class CodeListSet<E extends CodeL
     /**
      * Adds all elements of the given collection to this set.
      *
-     * @param  c The collection containing elements to be added to this set.
+     * @param  c  the collection containing elements to be added to this set.
      * @return {@code true} if this set changed as a result of this method call.
      */
     @Override
     public boolean addAll(final Collection<? extends E> c) throws IllegalArgumentException {
         if (c instanceof CodeListSet) {
             final CodeListSet<?> o = (CodeListSet<?>) c;
-            // Following assertion should be ensured by parameterized types.
+            /*
+             * Following assertion should be ensured by parameterized types.
+             */
             assert elementType.isAssignableFrom(o.elementType);
             boolean changed = (values != (values |= o.values));
             /*
@@ -391,7 +393,7 @@ public class CodeListSet<E extends CodeL
     /**
      * Adds all elements of the given collection from this set.
      *
-     * @param  c The collection containing elements to be removed from this set.
+     * @param  c  the collection containing elements to be removed from this set.
      * @return {@code true} if this set changed as a result of this method call.
      */
     @Override
@@ -424,7 +426,7 @@ public class CodeListSet<E extends CodeL
     /**
      * Retains only the elements of the given collection in this set.
      *
-     * @param  c The collection containing elements to retain in this set.
+     * @param  c  the collection containing elements to retain in this set.
      * @return {@code true} if this set changed as a result of this method call.
      */
     @Override
@@ -462,7 +464,7 @@ public class CodeListSet<E extends CodeL
      * this {@code CodeListSet} made after this method call will not affect the values
      * returned by the iterator.
      *
-     * @return An iterator over the elements in this set.
+     * @return an iterator over the elements in this set.
      */
     @Override
     public Iterator<E> iterator() {
@@ -542,7 +544,7 @@ public class CodeListSet<E extends CodeL
     /**
      * Returns a new set of the same class containing the same elements than this set.
      *
-     * @return A clone of this set.
+     * @return a clone of this set.
      */
     @Override
     @SuppressWarnings("unchecked")
@@ -551,7 +553,7 @@ public class CodeListSet<E extends CodeL
         try {
             clone = (CodeListSet<E>) super.clone();
         } catch (CloneNotSupportedException e) {
-            throw new AssertionError(e); // Should never happen, since we are cloneable.
+            throw new AssertionError(e);                // Should never happen, since we are cloneable.
         }
         final BitSet s = supplementary;
         if (s != null) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/Containers.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -54,7 +54,7 @@ public final class Containers extends St
      * pattern. In such cases, null collections (i.e. collections not yet instantiated) are typically
      * considered as {@linkplain Collection#isEmpty() empty}.</p>
      *
-     * @param  collection the collection to test, or {@code null}.
+     * @param  collection  the collection to test, or {@code null}.
      * @return {@code true} if the given collection is null or empty, or {@code false} otherwise.
      */
     public static boolean isNullOrEmpty(final Collection<?> collection) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -125,8 +125,10 @@ public class DefaultTreeTable implements
         if (columns.length == 0) {
             throw new IllegalArgumentException(Errors.format(Errors.Keys.EmptyArgument_1, "columns"));
         }
-        // Copy the array for safety against user changes, and also for forcing the element type
-        // to TableColumn, not a subclass, because of the UnmodifiableArrayList.wrap(E[]) contract.
+        /*
+         * Copy the array for safety against user changes, and also for forcing the element type
+         * to TableColumn, not a subclass, because of the UnmodifiableArrayList.wrap(E[]) contract.
+         */
         columns = Arrays.copyOf(columns, columns.length, TableColumn[].class);
         this.columnIndices = createColumnIndices(columns);
         this.columns = UnmodifiableArrayList.wrap(columns);
@@ -529,7 +531,7 @@ public class DefaultTreeTable implements
          * cast will need to be replaced by an "instanceof" check.
          */
         @Override
-        @SuppressWarnings("ReturnOfCollectionOrArrayField")         // Returned list modifiable on intend.
+        @SuppressWarnings("ReturnOfCollectionOrArrayField")         // Returned list is modifiable on intend.
         public final List<TreeTable.Node> getChildren() {
             if (children == null) {
                 if (isLeaf()) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedIterator.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -25,8 +25,8 @@ import org.apache.sis.util.ObjectConvert
  * If a value is converted into a null value, then this iterator skips that value.
  * Consequently this iterator can not returns null value.
  *
- * @param <S> The type of elements in the storage collection.
- * @param <E> The type of elements in this set.
+ * @param  <S>  the type of elements in the storage collection.
+ * @param  <E>  the type of elements in this set.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedMap.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -55,10 +55,10 @@ import org.apache.sis.math.FunctionPrope
  * If the storage map is known to be immutable, then sub-classes may consider to cache some values,
  * especially the result of the {@link #size()} method.
  *
- * @param <SK> The type of keys in the storage map.
- * @param <SV> The type of values in the storage map.
- * @param <K>  The type of keys in this map.
- * @param <V>  The type of values in this map.
+ * @param  <SK>  the type of keys in the storage map.
+ * @param  <SV>  the type of values in the storage map.
+ * @param  <K>   the type of keys in this map.
+ * @param  <V>   the type of values in this map.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
@@ -105,9 +105,9 @@ class DerivedMap<SK,SV,K,V> extends Abst
     /**
      * Creates a new derived map from the specified storage map.
      *
-     * @param storage        The map which actually store the entries.
-     * @param keyConverter   The converter for the keys.
-     * @param valueConverter The converter for the values.
+     * @param storage         the map which actually store the entries.
+     * @param keyConverter    the converter for the keys.
+     * @param valueConverter  the converter for the values.
      */
     static <SK,SV,K,V> Map<K,V> create(final Map<SK,SV> storage,
                                        final ObjectConverter<SK,K> keyConverter,
@@ -130,9 +130,9 @@ class DerivedMap<SK,SV,K,V> extends Abst
     /**
      * Creates a new derived map from the specified storage map.
      *
-     * @param storage        The map which actually store the entries.
-     * @param keyConverter   The converter for the keys.
-     * @param valueConverter The converter for the values.
+     * @param storage         the map which actually store the entries.
+     * @param keyConverter    the converter for the keys.
+     * @param valueConverter  the converter for the values.
      */
     private DerivedMap(final Map<SK,SV> storage,
                        final ObjectConverter<SK,K> keyConverter,
@@ -146,7 +146,7 @@ class DerivedMap<SK,SV,K,V> extends Abst
     /**
      * Returns the number of entries in this map.
      *
-     * @return The number of entries in this map.
+     * @return the number of entries in this map.
      */
     @Override
     public int size() {
@@ -166,8 +166,8 @@ class DerivedMap<SK,SV,K,V> extends Abst
     /**
      * Associates the specified value with the specified key in this map.
      *
-     * @param  key key with which the specified value is to be associated.
-     * @param  value value to be associated with the specified key.
+     * @param  key    key with which the specified value is to be associated.
+     * @param  value  value to be associated with the specified key.
      * @return previous value associated with specified key, or {@code null}
      *         if there was no mapping for key.
      * @throws UnsupportedOperationException if the converters are not invertible,
@@ -303,6 +303,7 @@ class DerivedMap<SK,SV,K,V> extends Abst
      * Returns a set view of the keys contained in this map.
      */
     @Override
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")     // Safe because immutable.
     public final Set<K> keySet() {
         if (keySet == null) {
             keySet = DerivedSet.create(storage.keySet(), keyConverter);
@@ -314,6 +315,7 @@ class DerivedMap<SK,SV,K,V> extends Abst
      * Returns a set view of the mappings contained in this map.
      */
     @Override
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")     // Safe because immutable.
     public final Set<Map.Entry<K,V>> entrySet() {
         if (entrySet == null) {
             entrySet = DerivedSet.create(storage.entrySet(), this);

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -53,8 +53,8 @@ import org.apache.sis.internal.util.SetO
  * If the storage set is known to be immutable, then sub-classes may consider to cache some values,
  * especially the result of the {@link #size()} method.
  *
- * @param <S> the type of elements in the storage set.
- * @param <E> the type of elements in this set.
+ * @param  <S>  the type of elements in the storage set.
+ * @param  <E>  the type of elements in this set.
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
@@ -80,8 +80,8 @@ class DerivedSet<S,E> extends SetOfUnkno
     /**
      * Creates a new derived set from the specified storage set.
      *
-     * @param storage   The set which actually store the elements.
-     * @param converter The converter from the type in the storage set to the type in the derived set.
+     * @param  storage    the set which actually store the elements.
+     * @param  converter  the converter from the type in the storage set to the type in the derived set.
      */
     static <S,E> Set<E> create(final Set<S> storage, final ObjectConverter<S,E> converter) {
         final Set<FunctionProperty> properties = converter.properties();
@@ -171,8 +171,8 @@ class DerivedSet<S,E> extends SetOfUnkno
      * allows us to delegate the {@link #contains(Object)} and {@linkplain #remove(Object)}
      * operations to the {@linkplain #storage} set instead than iterating over all elements.
      *
-     * @param <S> the type of elements in the storage set.
-     * @param <E> the type of elements in this set.
+     * @param  <S>  the type of elements in the storage set.
+     * @param  <E>  the type of elements in this set.
      */
     private static class Invertible<S,E> extends DerivedSet<S,E> {
         /**
@@ -188,8 +188,8 @@ class DerivedSet<S,E> extends SetOfUnkno
         /**
          * Creates a new derived set from the specified storage set.
          *
-         * @param storage   The set which actually store the elements.
-         * @param converter The type of elements in this derived set.
+         * @param storage    the set which actually store the elements.
+         * @param converter  the type of elements in this derived set.
          */
         Invertible(final Set<S> storage, final ObjectConverter<S,E> converter) {
             super(storage, converter);
@@ -213,7 +213,7 @@ class DerivedSet<S,E> extends SetOfUnkno
          *     return storage.contains(inverse.apply(element));
          * }
          *
-         * @param  element object to be checked for containment in this set.
+         * @param  element  object to be checked for containment in this set.
          * @return {@code true} if this set contains the specified element.
          */
         @Override
@@ -231,7 +231,7 @@ class DerivedSet<S,E> extends SetOfUnkno
          *     return storage.remove(inverse.apply(element));
          * }
          *
-         * @param  element element to be removed from this set, if present.
+         * @param  element  element to be removed from this set, if present.
          * @return {@code true} if the set contained the specified element.
          * @throws UnsupportedOperationException if the {@linkplain #storage} set doesn't
          *         supports the {@code remove} operation.
@@ -248,8 +248,8 @@ class DerivedSet<S,E> extends SetOfUnkno
      * The bijection allows us to query the {@linkplain #storage} set size directly
      * instead than iterating over all elements.
      *
-     * @param <S> the type of elements in the storage set.
-     * @param <E> the type of elements in this set.
+     * @param  <S>  the type of elements in the storage set.
+     * @param  <E>  the type of elements in this set.
      */
     private static final class Bijective<S,E> extends Invertible<S,E> {
         /**
@@ -260,8 +260,8 @@ class DerivedSet<S,E> extends SetOfUnkno
         /**
          * Creates a new derived set from the specified storage set.
          *
-         * @param storage   The set which actually store the elements.
-         * @param converter The type of elements in this derived set.
+         * @param storage    the set which actually store the elements.
+         * @param converter  the type of elements in this derived set.
          */
         Bijective(final Set<S> storage, final ObjectConverter<S,E> converter) {
             super(storage, converter);

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -128,7 +128,7 @@ public class RangeSet<E extends Comparab
      * comparator throws an exception. Such ambiguities should not happen in sequences
      * of ranges created by {@code RangeSet}.</p>
      *
-     * @param <E> The type of range elements.
+     * @param  <E>  the type of range elements.
      *
      * @author  Martin Desruisseaux (Geomatys)
      * @since   0.3
@@ -176,11 +176,10 @@ public class RangeSet<E extends Comparab
                     cmax = included ? +1 : -1;
                 }
             }
-            if (cmin == cmax) return cmax; // Easy case: min and max are both greater, smaller or eq.
-            if (cmin == 0)    return cmax; // Easy case: only max value differ.
-            if (cmax == 0)    return cmin; // Easy case: only min value differ.
-            // One range is included in the other.
-            throw new IllegalArgumentException(Errors.format(
+            if (cmin == cmax) return cmax;                      // Easy case: min and max are both greater, smaller or eq.
+            if (cmin == 0)    return cmax;                      // Easy case: only max value differ.
+            if (cmax == 0)    return cmin;                      // Easy case: only min value differ.
+            throw new IllegalArgumentException(Errors.format(   // One range is included in the other.
                     Errors.Keys.UndefinedOrderingForElements_2, r1, r2));
         }
 
@@ -270,8 +269,10 @@ public class RangeSet<E extends Comparab
         this.isMinIncluded = isMinIncluded;
         this.isMaxIncluded = isMaxIncluded;
         if (!isMinIncluded && !isMaxIncluded) {
-            // We do not localize this error message because it may disaspear
-            // in a future SIS version if we decide to support closed intervals.
+            /*
+             * We do not localize this error message because it may disaspear
+             * in a future SIS version if we decide to support closed intervals.
+             */
             throw new IllegalArgumentException("Open intervals are not yet supported.");
         }
     }
@@ -283,7 +284,7 @@ public class RangeSet<E extends Comparab
      * @param  elementType    the type of the range elements.
      * @param  isMinIncluded  {@code true} if the minimal values are inclusive, or {@code false} if exclusive.
      * @param  isMaxIncluded  {@code true} if the maximal values are inclusive, or {@code false} if exclusive.
-     * @return A new range set for range elements of the given type.
+     * @return a new range set for range elements of the given type.
      */
     @SuppressWarnings({"unchecked","rawtypes"})
     public static <E extends Comparable<? super E>> RangeSet<E> create(final Class<E> elementType,
@@ -339,6 +340,7 @@ public class RangeSet<E extends Comparab
     /**
      * Unconditionally copies the internal array in a new array having just the required length.
      */
+    @SuppressWarnings("SuspiciousSystemArraycopy")
     private void reallocate() {
         if (length == 0) {
             array = null;
@@ -370,6 +372,7 @@ public class RangeSet<E extends Comparab
      * @param  minValue  the first value to insert.
      * @param  maxValue  the second value to insert.
      */
+    @SuppressWarnings("SuspiciousSystemArraycopy")
     private void insertAt(final int lower, final E minValue, final E maxValue) {
         final Object oldArray = array;
         final int capacity = Array.getLength(oldArray);
@@ -391,6 +394,7 @@ public class RangeSet<E extends Comparab
      * @param  lower  first value to remove, inclusive.
      * @param  upper  last value to remove, exclusive.
      */
+    @SuppressWarnings("SuspiciousSystemArraycopy")
     private void removeAt(final int lower, final int upper) {
         final int oldLength = length;
         System.arraycopy(array, upper, array, lower, oldLength - upper);
@@ -826,13 +830,17 @@ public class RangeSet<E extends Comparab
             if (lower < 0) {
                 lower = ~lower;
                 if ((lower & 1) == 0) {
-                    // The lower endpoint of the given range falls between
-                    // two ranges of this set.
+                    /*
+                     * The lower endpoint of the given range falls between
+                     * two ranges of this set.
+                     */
                     return false;
                 }
             } else if ((lower & 1) == 0) {
-                // Lower endpoint of the given range matches exactly
-                // the lower endpoint of a range in this set.
+                /*
+                 * Lower endpoint of the given range matches exactly
+                 * the lower endpoint of a range in this set.
+                 */
                 if (!isMinIncluded && range.isMinIncluded()) {
                     return false;
                 }
@@ -845,13 +853,17 @@ public class RangeSet<E extends Comparab
             if (upper < 0) {
                 upper = ~upper;
                 if ((upper & 1) == 0) {
-                    // The upper endpoint of the given range falls between
-                    // two ranges of this set, or is after all ranges.
+                    /*
+                     * The upper endpoint of the given range falls between
+                     * two ranges of this set, or is after all ranges.
+                     */
                     return false;
                 }
             } else if ((upper & 1) != 0) {
-                // Upper endpoint of the given range matches exactly
-                // the upper endpoint of a range in this set.
+                /*
+                 * Upper endpoint of the given range matches exactly
+                 * the upper endpoint of a range in this set.
+                 */
                 if (!isMaxIncluded && range.isMaxIncluded()) {
                     return false;
                 }
@@ -1112,7 +1124,7 @@ public class RangeSet<E extends Comparab
         @Override
         public boolean remove(Object object) {
             if (object instanceof Range<?>) {
-                @SuppressWarnings("unchecked") // Type will actally be checked on the line after.
+                @SuppressWarnings("unchecked")              // Type will actally be checked on the line after.
                 final Range<E> range = (Range<E>) object;
                 if (range.getElementType() == elementType) {
                     object = subRange.intersect(range);
@@ -1129,7 +1141,7 @@ public class RangeSet<E extends Comparab
         @Override
         public boolean contains(final Object object) {
             if (object instanceof Range<?>) {
-                @SuppressWarnings("unchecked") // Type will actally be checked on the line after.
+                @SuppressWarnings("unchecked")              // Type will actally be checked on the line after.
                 final Range<E> range = (Range<E>) object;
                 if (range.getElementType() == elementType) {
                     if (!subRange.contains(range)) {
@@ -1351,8 +1363,10 @@ public class RangeSet<E extends Comparab
             }
             final Range<E> range = getRange(position);
             if (RangeSet.this.modCount != this.modCount) {
-                // Check it last, in case a change occurred
-                // while we were creating the range.
+                /*
+                 * This check has been performed last in case a change occurred
+                 * while we were creating the range.
+                 */
                 throw new ConcurrentModificationException();
             }
             position += 2;
@@ -1391,8 +1405,10 @@ public class RangeSet<E extends Comparab
     public int indexOfRange(final E value) {
         int index = binarySearch(value, 0, length);
         if (index < 0) {
-            // Found an insertion point. Make sure that the insertion
-            // point is inside a range (i.e. before the maximum value).
+            /*
+             * Found an insertion point. Make sure that the insertion
+             * point is inside a range (i.e. before the maximum value).
+             */
             index = ~index; // Tild sign, not minus.
             if ((index & 1) == 0) {
                 return -1;
@@ -1401,7 +1417,7 @@ public class RangeSet<E extends Comparab
             // The value is equals to an excluded endpoint.
             return -1;
         }
-        index /= 2; // Round toward 0 (odd index are maximum values).
+        index /= 2;             // Round toward 0 (odd index are maximum values).
         return index;
     }
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTables.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -131,10 +131,10 @@ public final class TreeTables extends St
      *             └─data
      * }
      *
-     * @param  from   The root node from which to start the search.
-     * @param  column The column containing the file name.
-     * @param  path   The path for which to find or create a node.
-     * @return The node for the given path, either as an existing node or a new node.
+     * @param  from    the root node from which to start the search.
+     * @param  column  the column containing the file name.
+     * @param  path    the path for which to find or create a node.
+     * @return the node for the given path, either as an existing node or a new node.
      */
     public static TreeTable.Node nodeForPath(TreeTable.Node from,
             final TableColumn<? super String> column, final Path path)
@@ -163,10 +163,10 @@ public final class TreeTables extends St
      * This method performs the same work than the above variant, but working on
      * {@code File} instances rather than {@code Path}.
      *
-     * @param  from   The root node from which to start the search.
-     * @param  column The column containing the file name.
-     * @param  path   The file for which to find or create a node.
-     * @return The node for the given file, either as an existing node or a new node.
+     * @param  from    the root node from which to start the search.
+     * @param  column  the column containing the file name.
+     * @param  path    the file for which to find or create a node.
+     * @return the node for the given file, either as an existing node or a new node.
      */
     public static TreeTable.Node nodeForPath(TreeTable.Node from,
             final TableColumn<? super String> column, final File path)
@@ -177,7 +177,7 @@ public final class TreeTables extends St
         }
         String name = path.getName();
         if (name.isEmpty() && parent == null) {
-            name = File.separator; // Root directory.
+            name = File.separator;                                  // Root directory in Unix path syntax.
         }
         for (final TreeTable.Node child : from.getChildren()) {
             if (name.equals(child.getValue(column))) {
@@ -197,9 +197,9 @@ public final class TreeTables extends St
      * <p>This method may be invoked before to serialize the table in order to reduce the
      * serialization stream size.</p>
      *
-     * @param  table  The table in which to replace values by their string representations.
-     * @param  locale The locale to use when replacing {@link InternationalString} instances. Can be {@code null}.
-     * @return Number of replacements done.
+     * @param  table   the table in which to replace values by their string representations.
+     * @param  locale  the locale to use when replacing {@link InternationalString} instances. Can be {@code null}.
+     * @return number of replacements done.
      */
     @SuppressWarnings({"unchecked", "rawtypes"})
     public static int replaceCharSequences(final TreeTable table, final Locale locale) {
@@ -219,11 +219,11 @@ public final class TreeTables extends St
     /**
      * Implementation of the public {@link #replaceCharSequences(TreeTable, Locale)} method.
      *
-     * @param  node    The node in which to replace values by their string representations.
-     * @param  columns The columns where to perform the replacements.
-     * @param  locale  The locale to use when replacing {@link InternationalString} instances. Can be {@code null}.
-     * @param  pool    An initially empty pool of string representations, to be filled by this method.
-     * @return Number of replacements done.
+     * @param  node     the node in which to replace values by their string representations.
+     * @param  columns  the columns where to perform the replacements.
+     * @param  locale   the locale to use when replacing {@link InternationalString} instances. Can be {@code null}.
+     * @param  pool     an initially empty pool of string representations, to be filled by this method.
+     * @return number of replacements done.
      */
     private static int replaceCharSequences(final TreeTable.Node node, final TableColumn<? super String>[] columns,
             final Locale locale, final Map<String,String> pool)
@@ -262,8 +262,8 @@ public final class TreeTables extends St
      * developers are encouraged to create and configure their own {@code TreeTableFormat}
      * instance.
      *
-     * @param  table The tree table to format.
-     * @return A string representation of the given tree table.
+     * @param  table  the tree table to format.
+     * @return a string representation of the given tree table.
      */
     public static String toString(final TreeTable table) {
         ArgumentChecks.ensureNonNull("table", table);
@@ -277,11 +277,11 @@ public final class TreeTables extends St
      * This helper method is sometime useful for quick tests or debugging purposes.
      * For more extensive use, consider using {@link TreeTableFormat} instead.
      *
-     * @param  tree         The string representation of the tree to parse.
-     * @param  labelColumn  The columns where to store the node labels. This is often {@link TableColumn#NAME}.
-     * @param  otherColumns Optional columns where to store the values, if any.
-     * @return A tree parsed from the given string.
-     * @throws ParseException If an error occurred while parsing the tree.
+     * @param  tree          the string representation of the tree to parse.
+     * @param  labelColumn   the columns where to store the node labels. This is often {@link TableColumn#NAME}.
+     * @param  otherColumns  optional columns where to store the values, if any.
+     * @return a tree parsed from the given string.
+     * @throws ParseException if an error occurred while parsing the tree.
      */
     public static TreeTable parse(final String tree, final TableColumn<?> labelColumn,
             final TableColumn<?>... otherColumns) throws ParseException

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakEntry.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -164,7 +164,7 @@ abstract class WeakEntry<E> extends Weak
         for (WeakEntry<E> next : oldTable) {
             while (next != null) {
                 final WeakEntry<E> e = next;
-                next = next.next; // We keep 'next' right now because its value will change.
+                next = next.next;                           // We keep 'next' right now because its value will change.
                 final int index = e.hash % table.length;
                 e.next = table[index];
                 table[index] = e;

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakHashSet.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -17,6 +17,7 @@
 package org.apache.sis.util.collection;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.Iterator;
 import java.util.AbstractSet;
 import java.lang.reflect.Array;
@@ -29,9 +30,6 @@ import org.apache.sis.util.NullArgumentE
 
 import static org.apache.sis.util.collection.WeakEntry.*;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * A set of objects hold by weak references. An entry in a {@code WeakHashSet} will automatically
@@ -284,9 +282,11 @@ public class WeakHashSet<E> extends Abst
      *         or the given {@code object} otherwise.
      */
     public synchronized <T extends E> T unique(final T element) {
-        // There is no way to make sure that this operation is really safe.
-        // We have to trust the Object.equals(Object) method to be strict
-        // about the type of compared objects.
+        /*
+         * There is no way to make sure that this operation is really safe.
+         * We have to trust the Object.equals(Object) method to be strict
+         * about the type of compared objects.
+         */
         return (T) intern(element, INTERN);
     }
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/WeakValueHashMap.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -21,6 +21,7 @@ import java.util.Set;
 import java.util.AbstractMap;
 import java.util.AbstractSet;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.Arrays;
 import java.lang.reflect.Array;
 import java.lang.ref.WeakReference;
@@ -33,9 +34,6 @@ import org.apache.sis.util.resources.Err
 
 import static org.apache.sis.util.collection.WeakEntry.*;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * A hashtable-based map implementation that uses {@linkplain WeakReference weak references},

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractFactory.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -41,7 +41,7 @@ public abstract class AbstractFactory im
      * The default implementation tries to fetch this information from the
      * manifest associated to the package of {@code this.getClass()}.
      *
-     * @return The vendor for this factory implementation, or {@code null} if unknown.
+     * @return the vendor for this factory implementation, or {@code null} if unknown.
      *
      * @see Package#getImplementationVendor()
      */

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultInternationalString.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -26,6 +26,7 @@ import java.util.LinkedHashMap;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import org.opengis.util.InternationalString;
@@ -37,9 +38,6 @@ import org.apache.sis.util.resources.Mes
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.internal.system.Modules;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * An international string using a map of strings for different locales.
@@ -90,7 +88,7 @@ public class DefaultInternationalString
      * The string specified to this constructor is the one that will be returned if no localized
      * string is found for the {@code Locale} argument in a call to {@link #toString(Locale)}.
      *
-     * @param string The string in no specific locale, or {@code null} if none.
+     * @param string  the string in no specific locale, or {@code null} if none.
      */
     public DefaultInternationalString(final String string) {
         if (string != null) {
@@ -105,7 +103,7 @@ public class DefaultInternationalString
      * The content of the given map is copied, so changes to that map after construction
      * will not be reflected into this international string.
      *
-     * @param strings The strings in various locales, or {@code null} if none.
+     * @param strings  the strings in various locales, or {@code null} if none.
      *
      * @see Types#toInternationalString(Map, String)
      */
@@ -132,8 +130,8 @@ public class DefaultInternationalString
     /**
      * Adds a string for the given locale.
      *
-     * @param  locale The locale for the {@code string} value.
-     * @param  string The localized string.
+     * @param  locale  the locale for the {@code string} value.
+     * @param  string  the localized string.
      * @throws IllegalArgumentException if a different string value was already set for the given locale.
      */
     public synchronized void add(final Locale locale, final String string) throws IllegalArgumentException {
@@ -143,7 +141,7 @@ public class DefaultInternationalString
             case 0: {
                 localeMap = Collections.singletonMap(locale, string);
                 localeSet = null;
-                defaultValue = null; // Will be recomputed when first needed.
+                defaultValue = null;                                // Will be recomputed when first needed.
                 return;
             }
             case 1: {
@@ -162,15 +160,15 @@ public class DefaultInternationalString
             throw new IllegalArgumentException(Errors.format(
                     Errors.Keys.ValueAlreadyDefined_1, locale));
         }
-        defaultValue = null; // Will be recomputed when first needed.
+        defaultValue = null;                                        // Will be recomputed when first needed.
     }
 
     /**
      * Adds the given character sequence. If the given sequence is an other {@link InternationalString} instance,
      * then only the string for the given locale is added. This method is for {@link Types} internal usage only.
      *
-     * @param  locale The locale for the {@code string} value.
-     * @param  string The character sequence to add.
+     * @param  locale  the locale for the {@code string} value.
+     * @param  string  the character sequence to add.
      * @throws IllegalArgumentException if a different string value was already set for the given locale.
      */
     final void add(final Locale locale, final CharSequence string) throws IllegalArgumentException {
@@ -194,7 +192,7 @@ public class DefaultInternationalString
     /**
      * Returns the set of locales defined in this international string.
      *
-     * @return The set of locales.
+     * @return the set of locales.
      *
      * @todo Current implementation does not return a synchronized set. We should synchronize
      *       on the same lock than the one used for accessing the internal locale map.
@@ -218,8 +216,8 @@ public class DefaultInternationalString
      * {@linkplain Locale#getCountry() country} part. If none are found, then this method returns
      * {@code null}.
      *
-     * @param  locale The locale to look for, or {@code null}.
-     * @return The string in the specified locale, or {@code null} if none was found.
+     * @param  locale  the locale to look for, or {@code null}.
+     * @return the string in the specified locale, or {@code null} if none was found.
      */
     private String getString(Locale locale) {
         while (locale != null) {
@@ -277,8 +275,8 @@ public class DefaultInternationalString
      * {@code Locale.ROOT}. However subclasses are free to use a different fallback. Client
      * code are encouraged to specify only non-null values for more determinist behavior.
      *
-     * @param  locale The desired locale for the string to be returned.
-     * @return The string in the given locale if available, or in an
+     * @param  locale  the desired locale for the string to be returned.
+     * @return the string in the given locale if available, or in an
      *         implementation-dependent fallback locale otherwise.
      */
     @Override
@@ -302,8 +300,8 @@ public class DefaultInternationalString
              */
             text = localeMap.get(Locale.ROOT);
             if (text == null) {
-                Locale fallback = Locale.US; // The fallback language for "unlocalized" string.
-                if (fallback != locale) { // Avoid requesting the same locale twice (optimization).
+                Locale fallback = Locale.US;        // The fallback language for "unlocalized" string.
+                if (fallback != locale) {           // Avoid requesting the same locale twice (optimization).
                     text = getString(fallback);
                     if (text != null) {
                         return text;
@@ -316,8 +314,10 @@ public class DefaultInternationalString
                         return text;
                     }
                 }
-                // Every else failed; pickup a random string.
-                // This behavior may change in future versions.
+                /*
+                 * Every else failed; pickup a random string.
+                 * This behavior may change in future versions.
+                 */
                 final Iterator<String> it = localeMap.values().iterator();
                 if (it.hasNext()) {
                     text = it.next();
@@ -350,9 +350,8 @@ public class DefaultInternationalString
      *   <li>Otherwise, this method returns {@code false}.</li>
      * </ul>
      *
-     * @param  candidate The object which may contains this international string.
-     * @return {@code true} if the given object contains all localized strings found in this
-     *         international string.
+     * @param  candidate  the object which may contains this international string.
+     * @return {@code true} if the given object contains all localized strings found in this international string.
      */
     public synchronized boolean isSubsetOf(final Object candidate) {
         if (candidate instanceof InternationalString) {
@@ -383,7 +382,7 @@ public class DefaultInternationalString
     /**
      * Compares this international string with the specified object for equality.
      *
-     * @param object The object to compare with this international string.
+     * @param  object  the object to compare with this international string.
      * @return {@code true} if the given object is equal to this string.
      */
     @Override
@@ -398,7 +397,7 @@ public class DefaultInternationalString
     /**
      * Returns a hash code value for this international text.
      *
-     * @return A hash code value for this international text.
+     * @return a hash code value for this international text.
      */
     @Override
     public synchronized int hashCode() {
@@ -408,9 +407,9 @@ public class DefaultInternationalString
     /**
      * Canonicalize the locales after deserialization.
      *
-     * @param  in The input stream from which to deserialize an international string.
-     * @throws IOException If an I/O error occurred while reading or if the stream contains invalid data.
-     * @throws ClassNotFoundException If the class serialized on the stream is not on the classpath.
+     * @param  in  the input stream from which to deserialize an international string.
+     * @throws IOException if an I/O error occurred while reading or if the stream contains invalid data.
+     * @throws ClassNotFoundException if the class serialized on the stream is not on the classpath.
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
@@ -418,7 +417,7 @@ public class DefaultInternationalString
         if (size == 0) {
             return;
         }
-        @SuppressWarnings({"unchecked","rawtypes"}) // Generic array creation.
+        @SuppressWarnings({"unchecked","rawtypes"})                         // Generic array creation.
         Map.Entry<Locale,String>[] entries = new Map.Entry[size];
         entries = localeMap.entrySet().toArray(entries);
         if (size == 1) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultLocalName.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -174,7 +174,7 @@ public class DefaultLocalName extends Ab
         final NameSpace scope = object.scope();
         final InternationalString name = object.toInternationalString();
         if (scope instanceof DefaultNameSpace) {
-            return ((DefaultNameSpace) scope).local(name, null); // May return a cached instance.
+            return ((DefaultNameSpace) scope).local(name, null);        // May return a cached instance.
         } else {
             return new DefaultLocalName(scope, name);
         }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultMemberName.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.util.iso;
 
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -25,9 +26,6 @@ import org.opengis.util.TypeName;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * The name to identify a member of a {@linkplain org.opengis.util.Record record}.
@@ -70,9 +68,9 @@ public class DefaultMemberName extends D
     /**
      * Constructs a member name from the given character sequence and attribute type.
      *
-     * @param scope The scope of this name, or {@code null} for a global scope.
-     * @param name  The local name (never {@code null}).
-     * @param attributeType The type of the data associated with the record member (can not be {@code null}).
+     * @param scope          the scope of this name, or {@code null} for a global scope.
+     * @param name           the local name (never {@code null}).
+     * @param attributeType  the type of the data associated with the record member (can not be {@code null}).
      */
     protected DefaultMemberName(final NameSpace scope, final CharSequence name, final TypeName attributeType) {
         super(scope, name);
@@ -92,8 +90,8 @@ public class DefaultMemberName extends D
      *       with the same values than the given name.</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.
      *
      * @since 0.5
@@ -108,7 +106,7 @@ public class DefaultMemberName extends D
     /**
      * Returns the type of the data associated with the record member.
      *
-     * @return The type of the data associated with the record member.
+     * @return the type of the data associated with the record member.
      */
     @Override
     public TypeName getAttributeType() {
@@ -118,7 +116,7 @@ public class DefaultMemberName extends D
     /**
      * Compares this member name with the specified object for equality.
      *
-     * @param object The object to compare with this name for equality.
+     * @param  object  the object to compare with this name for equality.
      * @return {@code true} if the given object is equal to this name.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecord.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -22,6 +22,7 @@ import java.util.AbstractMap;
 import java.util.AbstractSet;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.io.Serializable;
 import java.lang.reflect.Array;
 import org.opengis.util.MemberName;
@@ -33,9 +34,6 @@ import org.apache.sis.util.ArgumentCheck
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.internal.util.AbstractMapEntry;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * A list of logically related elements as (<var>name</var>, <var>value</var>) pairs in a dictionary.
@@ -84,7 +82,7 @@ public class DefaultRecord implements Re
      * The initial values are unspecified - they may be null or zero.
      * Callers can assign values by a call to {@link #setAll(Object[])}.
      *
-     * @param type The type definition of the new record.
+     * @param type  the type definition of the new record.
      */
     public DefaultRecord(final RecordType type) {
         ArgumentChecks.ensureNonNull("type", type);
@@ -99,7 +97,7 @@ public class DefaultRecord implements Re
     /**
      * Returns the type definition of this record.
      *
-     * @return The type definition of this record.
+     * @return the type definition of this record.
      */
     @Override
     public RecordType getRecordType() {
@@ -111,7 +109,7 @@ public class DefaultRecord implements Re
      * This method returns a view which will delegate all {@code get} and {@code put} operations to
      * the {@link #locate(MemberName)} and {@link #set(MemberName, Object)} methods respectively.
      *
-     * @return The dictionary of all (<var>name</var>, <var>value</var>) pairs in this record.
+     * @return the dictionary of all (<var>name</var>, <var>value</var>) pairs in this record.
      *
      * @see RecordType#getMemberTypes()
      */
@@ -228,8 +226,8 @@ public class DefaultRecord implements Re
     /**
      * Returns the value for an attribute of the specified name.
      *
-     * @param name The name of the attribute to lookup.
-     * @return The value of the attribute for the given name.
+     * @param  name  the name of the attribute to lookup.
+     * @return the value of the attribute for the given name.
      */
     @Override
     public Object locate(final MemberName name) {
@@ -240,8 +238,8 @@ public class DefaultRecord implements Re
     /**
      * Sets the value for the attribute of the specified name.
      *
-     * @param  name  The name of the attribute to modify.
-     * @param  value The new value for the attribute.
+     * @param  name   the name of the attribute to modify.
+     * @param  value  the new value for the attribute.
      * @throws IllegalArgumentException if the given name is not a member of this record.
      * @throws ClassCastException if the given value is not an instance of the expected type for this record.
      */
@@ -265,7 +263,7 @@ public class DefaultRecord implements Re
     /**
      * Sets all attribute values in this record, in attribute order.
      *
-     * @param  newValues The attribute values.
+     * @param  newValues  the attribute values.
      * @throws IllegalArgumentException if the given number of values does not match the expected number.
      * @throws ClassCastException if a value is not an instance of the expected type for this record.
      */
@@ -292,13 +290,13 @@ public class DefaultRecord implements Re
     /**
      * Compares this record with the given object for equality.
      *
-     * @param  object The object to compare with this record for equality.
+     * @param  object the object to compare with this record for equality.
      * @return {@code true} if both objects are equal.
      */
     @Override
     public boolean equals(final Object object) {
         if (object == this) {
-            return true; // Slight optimization for a common case.
+            return true;                            // Slight optimization for a common case.
         }
         if (object != null && object.getClass() == getClass()) {
             final DefaultRecord that = (DefaultRecord) object;
@@ -311,7 +309,7 @@ public class DefaultRecord implements Re
     /**
      * Returns a hash code value for this record.
      *
-     * @return A hash code value for this record.
+     * @return a hash code value for this record.
      */
     @Override
     public int hashCode() {
@@ -322,7 +320,7 @@ public class DefaultRecord implements Re
      * Returns a string representation of this record.
      * The string representation is for debugging purpose and may change in any future SIS version.
      *
-     * @return A string representation of this record.
+     * @return a string representation of this record.
      */
     @Debug
     @Override

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -121,9 +121,9 @@ public class DefaultRecordSchema impleme
     /**
      * Creates a new schema of the given name.
      *
-     * @param nameFactory The factory to use for creating names, or {@code null} for the default factory.
-     * @param parent      The parent namespace, or {@code null} if none.
-     * @param schemaName  The name of the new schema.
+     * @param nameFactory  the factory to use for creating names, or {@code null} for the default factory.
+     * @param parent       the parent namespace, or {@code null} if none.
+     * @param schemaName   the name of the new schema.
      */
     public DefaultRecordSchema(NameFactory nameFactory, final NameSpace parent, final CharSequence schemaName) {
         ArgumentChecks.ensureNonNull("schemaName", schemaName);
@@ -140,7 +140,7 @@ public class DefaultRecordSchema impleme
     /**
      * Returns the schema name.
      *
-     * @return The schema name.
+     * @return the schema name.
      */
     @Override
     public LocalName getSchemaName() {
@@ -151,10 +151,10 @@ public class DefaultRecordSchema impleme
      * Creates a new record type of the given name, which will contains the given members.
      * Members are declared in iteration order.
      *
-     * @param  typeName The record type name.
-     * @param  members  The name of each record member, together with the expected value types.
-     * @return A record type of the given name and members.
-     * @throws IllegalArgumentException If a record already exists for the given name but with different members.
+     * @param  typeName  the record type name.
+     * @param  members   the name of each record member, together with the expected value types.
+     * @return a record type of the given name and members.
+     * @throws IllegalArgumentException if a record already exists for the given name but with different members.
      */
     public RecordType createRecordType(final CharSequence typeName, final Map<CharSequence,Class<?>> members)
             throws IllegalArgumentException
@@ -180,15 +180,15 @@ public class DefaultRecordSchema impleme
         boolean hasNext;
         while ((hasNext = it1.hasNext()) == it2.hasNext()) {
             if (!hasNext) {
-                return record; // Finished comparison successfully.
+                return record;                                          // Finished comparison successfully.
             }
             final Map.Entry<CharSequence,Class<?>> e1 = it1.next();
             final Map.Entry<MemberName,Type> e2 = it2.next();
             if (!e2.getKey().tip().toString().equals(e1.toString())) {
-                break;      // Member names differ.
+                break;                                                  // Member names differ.
             }
             if (!((AttributeType) e2.getValue()).getValueClass().equals(e1.getValue())) {
-                break;      // Value classes differ.
+                break;                                                  // Value classes differ.
             }
         }
         throw new IllegalArgumentException(Errors.format(Errors.Keys.RecordAlreadyDefined_2, getSchemaName(), typeName));
@@ -199,8 +199,8 @@ public class DefaultRecordSchema impleme
      * of OGC/ISO specification when possible, e.g. {@code "GCO:CharacterString"} for {@code java.lang.String}.
      * See <cite>Mapping Java classes to type names</cite> in {@link DefaultTypeName} javadoc for more information.
      *
-     * @param  valueClass The value class to represent as an attribute type.
-     * @return Attribute type for the given value class.
+     * @param  valueClass  the value class to represent as an attribute type.
+     * @return attribute type for the given value class.
      */
     final Type toAttributeType(final Class<?> valueClass) {
         if (!TypeNames.isValid(valueClass)) {
@@ -229,7 +229,7 @@ public class DefaultRecordSchema impleme
     /**
      * Returns the dictionary of all (<var>name</var>, <var>record type</var>) pairs in this schema.
      *
-     * @return All (<var>name</var>, <var>record type</var>) pairs in this schema.
+     * @return all (<var>name</var>, <var>record type</var>) pairs in this schema.
      */
     @Override
     public Map<TypeName, RecordType> getDescription() {
@@ -240,8 +240,8 @@ public class DefaultRecordSchema impleme
      * Returns the record type for the given name.
      * If the type name is not defined within this schema, then this method returns {@code null}.
      *
-     * @param  name The name of the type to lookup.
-     * @return The type for the given name, or {@code null} if none.
+     * @param  name  the name of the type to lookup.
+     * @return the type for the given name, or {@code null} if none.
      */
     @Override
     public RecordType locate(final TypeName name) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordType.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -20,6 +20,7 @@ import java.util.Set;
 import java.util.Map;
 import java.util.LinkedHashMap;
 import java.util.Arrays;
+import java.util.Objects;
 import java.io.Serializable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -42,9 +43,6 @@ import org.apache.sis.util.collection.Co
 import org.apache.sis.util.ObjectConverters;
 import org.apache.sis.internal.converter.SurjectiveConverter;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * An immutable definition of the type of a {@linkplain DefaultRecord record}.
@@ -127,7 +125,7 @@ public class DefaultRecordType extends R
     /**
      * Creates a new record with the same names and members than the given one.
      *
-     * @param other The {@code RecordType} to copy.
+     * @param other  the {@code RecordType} to copy.
      */
     public DefaultRecordType(final RecordType other) {
         typeName    = other.getTypeName();
@@ -145,9 +143,9 @@ public class DefaultRecordType extends R
      * implementation is sufficient, the {@link DefaultRecordSchema#createRecordType(CharSequence, Map)}
      * method provides an easier alternative.</p>
      *
-     * @param typeName  The name that identifies this record type.
-     * @param container The schema that contains this record type.
-     * @param members   The name and type of the members to be included in this record type.
+     * @param typeName   the name that identifies this record type.
+     * @param container  the schema that contains this record type.
+     * @param members    the name and type of the members to be included in this record type.
      *
      * @see DefaultRecordSchema#createRecordType(CharSequence, Map)
      */
@@ -187,10 +185,10 @@ public class DefaultRecordType extends R
      * Creates a new record from member names specified as character sequence.
      * This constructor builds the {@link MemberName} instance itself.
      *
-     * @param typeName    The name that identifies this record type.
-     * @param container   The schema that contains this record type.
-     * @param members     The name of the members to be included in this record type.
-     * @param nameFactory The factory to use for instantiating {@link MemberName}.
+     * @param typeName     the name that identifies this record type.
+     * @param container    the schema that contains this record type.
+     * @param members      the name of the members to be included in this record type.
+     * @param nameFactory  the factory to use for instantiating {@link MemberName}.
      */
     DefaultRecordType(final TypeName typeName, final RecordSchema container,
             final Map<? extends CharSequence, ? extends Type> members, final NameFactory nameFactory)
@@ -214,9 +212,9 @@ public class DefaultRecordType extends R
      * Invoked on deserialization for restoring the transient fields.
      * See {@link #writeObject(ObjectOutputStream)} for the stream data description.
      *
-     * @param  in The input stream from which to deserialize an object.
-     * @throws IOException If an I/O error occurred while reading or if the stream contains invalid data.
-     * @throws ClassNotFoundException If the class serialized on the stream is not on the classpath.
+     * @param  in  the input stream from which to deserialize an object.
+     * @throws IOException if an I/O error occurred while reading or if the stream contains invalid data.
+     * @throws ClassNotFoundException if the class serialized on the stream is not on the classpath.
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();
@@ -235,11 +233,11 @@ public class DefaultRecordType extends R
     /**
      * Invoked on serialization for writing the member names and their type.
      *
-     * @serialData The number of members as an {@code int}, followed by a
+     * @serialData the number of members as an {@code int}, followed by a
      *             ({@code MemberName}, {@code Type}) pair for each member.
      *
-     * @param  out The output stream where to serialize this object.
-     * @throws IOException If an I/O error occurred while writing.
+     * @param  out  the output stream where to serialize this object.
+     * @throws IOException if an I/O error occurred while writing.
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         final int size = size();
@@ -265,8 +263,8 @@ public class DefaultRecordType extends R
      *       in the given object are not recursively copied.</li>
      * </ul>
      *
-     * @param  other The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the members of the given object
+     * @param  other  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the members of the given object
      *         (may be the given object itself), or {@code null} if the argument was {@code null}.
      */
     public static DefaultRecordType castOrCopy(final RecordType other) {
@@ -299,7 +297,7 @@ public class DefaultRecordType extends R
      * then this method can be think as the equivalent of the Java {@link Class#getName()} method.
      * </div>
      *
-     * @return The name that identifies this record type.
+     * @return the name that identifies this record type.
      */
     @Override
     public TypeName getTypeName() {
@@ -309,7 +307,7 @@ public class DefaultRecordType extends R
     /**
      * Returns the schema that contains this record type.
      *
-     * @return The schema that contains this record type.
+     * @return the schema that contains this record type.
      */
     @Override
     public RecordSchema getContainer() {
@@ -325,7 +323,7 @@ public class DefaultRecordType extends R
      * this method can be though as the related to the Java {@link Class#getFields()} method.
      * </div>
      *
-     * @return The dictionary of (<var>name</var>, <var>type</var>) pairs, or an empty map if none.
+     * @return the dictionary of (<var>name</var>, <var>type</var>) pairs, or an empty map if none.
      */
     @Override
     public Map<MemberName,Type> getMemberTypes() {
@@ -344,7 +342,7 @@ public class DefaultRecordType extends R
      *     getMemberTypes().keySet();
      * }
      *
-     * @return The set of attribute names, or an empty set if none.
+     * @return the set of attribute names, or an empty set if none.
      */
     @Override
     public Set<MemberName> getMembers() {
@@ -371,8 +369,8 @@ public class DefaultRecordType extends R
      * this method can be though as related to the Java {@link Class#getField(String)} method.
      * </div>
      *
-     * @param  memberName The attribute name for which to get the associated type name.
-     * @return The associated type name, or {@code null} if none.
+     * @param  memberName  the attribute name for which to get the associated type name.
+     * @return the associated type name, or {@code null} if none.
      */
     @Override
     public TypeName locate(final MemberName memberName) {
@@ -393,7 +391,7 @@ public class DefaultRecordType extends R
      * We do not require that {@code record.getRecordType() == this} in order to allow record
      * "sub-types" to define additional fields, in a way similar to Java sub-classing.</div>
      *
-     * @param  record The record to test for compatibility.
+     * @param  record  the record to test for compatibility.
      * @return {@code true} if the given record is compatible with this {@code RecordType}.
      */
     @Override
@@ -404,7 +402,7 @@ public class DefaultRecordType extends R
     /**
      * Compares the given object with this {@code RecordType} for equality.
      *
-     * @param  other The object to compare with this {@code RecordType}.
+     * @param  other  the object to compare with this {@code RecordType}.
      * @return {@code true} if both objects are equal.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultScopedName.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -83,7 +83,7 @@ public class DefaultScopedName extends A
      * Creates a new scoped names from the given list of local names. This constructor is
      * not public because we do not check if the given local names have the proper scope.
      *
-     * @param names The names to gives to the new scoped name.
+     * @param names  the names to gives to the new scoped name.
      */
     static AbstractName create(final UnmodifiableArrayList<? extends DefaultLocalName> names) {
         ArgumentChecks.ensureNonNull("names", names);
@@ -98,7 +98,7 @@ public class DefaultScopedName extends A
      * Creates a new scoped names from the given list of local names. This constructor is
      * not public because it does not check if the given local names have the proper scope.
      *
-     * @param names The names to gives to the new scoped name.
+     * @param names  the names to gives to the new scoped name.
      */
     private DefaultScopedName(final UnmodifiableArrayList<? extends LocalName> names) {
         parsedNames = names;
@@ -111,8 +111,8 @@ public class DefaultScopedName extends A
      * method will be invoked for fetching an unlocalized name.
      * Otherwise the {@link CharSequence#toString()} method will be used.
      *
-     * @param scope The scope of this name, or {@code null} for the global scope.
-     * @param names The local names. This list must have at least two elements.
+     * @param scope  the scope of this name, or {@code null} for the global scope.
+     * @param names  the local names. This list must have at least two elements.
      */
     protected DefaultScopedName(final NameSpace scope, final List<? extends CharSequence> names) {
         ArgumentChecks.ensureNonNull("names", names);
@@ -158,8 +158,8 @@ public class DefaultScopedName extends A
      * Constructs a scoped name as the concatenation of the given generic names.
      * The scope of the new name will be the scope of the {@code path} argument.
      *
-     * @param path The first part to concatenate.
-     * @param tail The second part to concatenate.
+     * @param path  the first part to concatenate.
+     * @param tail  the second part to concatenate.
      */
     @SuppressWarnings("SuspiciousToArrayCall")
     protected DefaultScopedName(final GenericName path, final GenericName tail) {
@@ -213,7 +213,7 @@ public class DefaultScopedName extends A
                 name = it.next();
             }
         }
-        if (index != locals.length) { // Paranoiac check.
+        if (index != locals.length) {               // Paranoiac check.
             throw new ConcurrentModificationException(Errors.format(Errors.Keys.UnexpectedChange_1, "tail"));
         }
         // Following line is safe because 'parsedNames' type is <? extends LocalName>.
@@ -235,8 +235,8 @@ public class DefaultScopedName extends A
     }
 
     /**
-     * Returns the size of the backing array. This is used only has a hint for optimizations
-     * in attempts to share internal arrays.
+     * Returns the size of the backing array.
+     * This is used only has a hint for optimizations in attempts to share internal arrays.
      */
     @Override
     final int arraySize() {
@@ -255,7 +255,7 @@ public class DefaultScopedName extends A
      * Returns every elements in the sequence of {@linkplain #getParsedNames() parsed names}
      * except for the {@linkplain #head() head}.
      *
-     * @return All elements except the first one in the in the list of {@linkplain #getParsedNames() parsed names}.
+     * @return all elements except the first one in the in the list of {@linkplain #getParsedNames() parsed names}.
      */
     @Override
     public synchronized GenericName tail() {
@@ -275,7 +275,7 @@ public class DefaultScopedName extends A
      * Returns every element in the sequence of {@linkplain #getParsedNames() parsed names}
      * except for the {@linkplain #tip() tip}.
      *
-     * @return All elements except the last one in the in the list of {@linkplain #getParsedNames() parsed names}.
+     * @return all elements except the last one in the in the list of {@linkplain #getParsedNames() parsed names}.
      */
     @Override
     public synchronized GenericName path() {
@@ -295,6 +295,7 @@ public class DefaultScopedName extends A
      * Returns the sequence of local name for this generic name.
      */
     @Override
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")                 // Safe because unmodifiable.
     public List<? extends LocalName> getParsedNames() {
         return parsedNames;
     }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java?rev=1779174&r1=1779173&r2=1779174&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/RecordDefinition.java [UTF-8] Tue Jan 17 11:50:21 2017
@@ -53,7 +53,7 @@ import org.apache.sis.internal.util.Coll
  * @module
  */
 @XmlTransient
-abstract class RecordDefinition { // Intentionally not Serializable.
+abstract class RecordDefinition {                                       // Intentionally not Serializable.
     /**
      * {@code RecordDefinition} implementation used as a fallback when the user-supplied {@link RecordType}
      * is not an instance of {@link DefaultRecordType}. So this adapter is used only if Apache SIS is mixed
@@ -71,7 +71,7 @@ abstract class RecordDefinition { // Int
         /**
          * The wrapped record type.
          */
-        private final RecordType recordType; // This is the only serialized field in this file.
+        private final RecordType recordType;            // This is the only serialized field in this file.
 
         /**
          * Creates a new adapter for the given record type.
@@ -84,9 +84,9 @@ abstract class RecordDefinition { // Int
         /**
          * Invoked on deserialization for restoring the transient fields.
          *
-         * @param  in The input stream from which to deserialize an attribute.
-         * @throws IOException If an I/O error occurred while reading or if the stream contains invalid data.
-         * @throws ClassNotFoundException If the class serialized on the stream is not on the classpath.
+         * @param  in  the input stream from which to deserialize an attribute.
+         * @throws IOException if an I/O error occurred while reading or if the stream contains invalid data.
+         * @throws ClassNotFoundException if the class serialized on the stream is not on the classpath.
          */
         private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
             in.defaultReadObject();
@@ -141,8 +141,8 @@ abstract class RecordDefinition { // Int
     /**
      * Invoked on construction or deserialization for computing the transient fields.
      *
-     * @param  memberTypes The (<var>name</var>, <var>type</var>) pairs in this record type.
-     * @return The values in the given map. This information is not stored in {@code RecordDefinition}
+     * @param  memberTypes  the (<var>name</var>, <var>type</var>) pairs in this record type.
+     * @return the values in the given map. This information is not stored in {@code RecordDefinition}
      *         because not needed by this class, but the {@link DefaultRecordType} subclass will store it.
      */
     final Type[] computeTransientFields(final Map<? extends MemberName, ? extends Type> memberTypes) {
@@ -222,7 +222,7 @@ abstract class RecordDefinition { // Int
      * Returns a string representation of this object.
      * The string representation is for debugging purpose and may change in any future SIS version.
      *
-     * @return A string representation of this record type.
+     * @return a string representation of this record type.
      */
     @Debug
     @Override
@@ -233,9 +233,9 @@ abstract class RecordDefinition { // Int
     /**
      * Returns a string representation of a {@code Record} or {@code RecordType}.
      *
-     * @param  head   Either {@code "Record"} or {@code "RecordType"}.
-     * @param  values The values as an array, or {@code null} for writing the types instead.
-     * @return The string representation.
+     * @param  head    either {@code "Record"} or {@code "RecordType"}.
+     * @param  values  the values as an array, or {@code null} for writing the types instead.
+     * @return the string representation.
      */
     final String toString(final String head, final Object values) {
         final StringBuilder buffer = new StringBuilder(250);



Mime
View raw message