sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1790195 [6/7] - in /sis/trunk: ./ application/sis-console/src/main/java/org/apache/sis/console/ application/sis-webapp/src/main/java/org/apache/sis/index/tree/ application/sis-webapp/src/main/java/org/apache/sis/services/ core/sis-feature/...
Date Wed, 05 Apr 2017 09:26:15 GMT
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -102,7 +102,6 @@ public final class StandardDateFormat ex
 
     /**
      * Converts the given temporal object into a date.
-     * The given temporal object is typically the value parsed by {@link #FORMAT}.
      *
      * @param  temporal  the temporal object to convert, or {@code null}.
      * @return the legacy date for the given temporal object, or {@code null} if the argument was null.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -87,7 +87,7 @@ public final class TemporalUtilities ext
 
     /**
      * Creates a period for the given begin and end dates. The given arguments can be null if the
-     * {@link TemporalFactory#createPosition(Date)} method accepts null dates, which stand for
+     * {@link TemporalFactory#createInstant(Date)} method accepts null dates, which stand for
      * undetermined position.
      *
      * @param  begin  the begin date, inclusive.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -146,7 +146,7 @@ final class AppendableWriter extends Wri
     }
 
     /**
-     * If {@link #out} implements {@link Flushable}, or is a {@link Appender} wrapper
+     * If {@link #out} implements {@link java.io.Flushable}, or is a {@link Appender} wrapper
      * around a flushable object, delegates to that object. Otherwise do nothing.
      */
     @Override
@@ -158,7 +158,7 @@ final class AppendableWriter extends Wri
     }
 
     /**
-     * If {@link #out} implements {@link Closeable}, or is a {@link Appender} wrapper
+     * If {@link #out} implements {@link java.io.Closeable}, or is a {@link Appender} wrapper
      * around a closeable object, delegates to that object. Otherwise just flush (if possible).
      */
     @Override

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/math/MathFunctions.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -168,7 +168,7 @@ public final class MathFunctions extends
      * returns directly the {@linkplain Math#abs(double) absolute value} of that element
      * without computing {@code sqrt(v²)}, in order to avoid rounding error. This special case
      * has been implemented because this method is often invoked for computing the length of
-     * {@linkplain org.opengis.coverage.grid.RectifiedGrid#getOffsetVectors() offset vectors},
+     * offset vectors,
      * typically aligned with the axes of a {@linkplain org.opengis.referencing.cs.CartesianCS
      * Cartesian coordinate system}.
      *

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -146,7 +146,7 @@ final class FormattedCharacterIterator e
     /**
      * The value to be returned by {@code getRunStart(…)} and {@code getRunLimit(…)}
      * when the index value is {@code validity}. Those values are updated when needed
-     * by the {@link #update(Set)} method.
+     * by the {@link #update(Attribute, Collection)} method.
      */
     private transient int start, limit, validity;
 

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/NumberRange.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -59,8 +59,8 @@ import org.apache.sis.util.collection.We
  * <a href="http://en.wikipedia.org/wiki/Interval_%28mathematics%29">mathematical definition of interval</a>.
  * It is closely related, while not identical, to the ISO 19123 (<cite>Coverage geometry and functions</cite>)
  * definition of "ranges". At the difference of the parent {@link Range} class, which can be used only with
- * {@linkplain org.opengis.coverage.DiscreteCoverage discrete coverages}, the {@code NumberRange} class can
- * also be used with {@linkplain org.opengis.coverage.ContinuousCoverage continuous coverages}.
+ * discrete coverages, the {@code NumberRange} class can
+ * also be used with continuous coverages.
  *
  * <div class="section">Immutability and thread safety</div>
  * This class and the {@link MeasurementRange} subclasses are immutable, and thus inherently thread-safe.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -56,21 +56,20 @@ import org.apache.sis.util.Numbers;
  *
  * <div class="section">Relationship with ISO 19123 definition of range</div>
  * The ISO 19123 standard (<cite>Coverage geometry and functions</cite>) defines the range as the set
- * (either finite or {@linkplain org.opengis.geometry.TransfiniteSet transfinite}) of feature attribute
- * values associated by a function (the {@linkplain org.opengis.coverage.Coverage coverage}) with the
+ * (either finite or transfinite) of feature attribute
+ * values associated by a function (the coverage) with the
  * elements of the coverage domain. In other words, if we see a coverage as a function, then a range
  * is the set of possible return values.
  *
  * <p>The characteristics of the spatial domain are defined by the ISO 19123 standard whereas the
  * characteristics of the attribute range are not part of that standard. In Apache SIS, those
- * characteristics are described by the {@link org.apache.sis.coverage.SampleDimension} class,
+ * characteristics are described by the {@code SampleDimension} class,
  * which may contain one or many {@code Range} instances. Consequently this {@code Range} class
  * is closely related, but not identical, to the ISO 19123 definition or range.</p>
  *
  * <p>Ranges are not necessarily numeric. Numeric and non-numeric ranges can be associated to
- * {@linkplain org.opengis.coverage.DiscreteCoverage discrete coverages}, while typically only
- * numeric ranges can be associated to {@linkplain org.opengis.coverage.ContinuousCoverage
- * continuous coverages}.</p>
+ * discrete coverages, while typically only
+ * numeric ranges can be associated to continuous coverages.</p>
  *
  * <div class="section">Immutability and thread safety</div>
  * This class and the {@link NumberRange} / {@link MeasurementRange} subclasses are immutable,

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -240,8 +240,8 @@ final class UnitDimension implements Dim
      * Returns the product or the quotient of this dimension with the specified one.
      *
      * @param  other   the dimension by which to multiply or divide this dimension.
-     * @param  mapping the operation to apply between the powers of {@code this} and {@code other} dimensions.
-     * @return the product of this dimension by the given dimension raised to the given power.
+     * @param  divide  {@code false} for a multiplication, {@code true} for a division.
+     * @return the product or division of this dimension by the given dimension.
      */
     private UnitDimension combine(final Dimension other, final boolean divide) {
         final Map<UnitDimension,Fraction> product = new LinkedHashMap<>(components);

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -103,9 +103,9 @@ public interface ObjectConverter<S,T> ex
      *       a sequence of decreasing <var>T</var> values.</li>
      * </ul>
      *
-     * Note that if the {@link #apply(Object)} method returns {@code null} for any non-convertible
-     * source value, then this properties set can not contain the {@link FunctionProperty#INJECTIVE}
-     * value. See class javadoc for more discussion.
+     * Note that if the {@link #apply(Object)} method returns {@code null} for unconvertible source values,
+     * then this properties set can not contain {@link FunctionProperty#INJECTIVE} because more than one
+     * source value could be converted to the same {@code null} target value.
      *
      * @return the manners in which source values are mapped to target values.
      *         May be an empty set, but never null.
@@ -128,9 +128,22 @@ public interface ObjectConverter<S,T> ex
 
     /**
      * Converts the given object from the source type <var>S</var> to the target type <var>T</var>.
-     * If the given object can not be converted, then this method may either returns {@code null} or
-     * throws an exception, at implementation choice. Note that this choice may affect the set of
-     * function {@linkplain #properties() properties} - see the class Javadoc for more discussion.
+     * If the given object can not be converted, then this method may either returns {@code null} or throws an exception,
+     * at implementation choice (except for {@linkplain FunctionProperty#INJECTIVE injective} functions, which must throw
+     * an exception - see the class Javadoc for more discussion about function {@linkplain #properties() properties}).
+     *
+     * <div class="note"><b>Example:</b>
+     * in Apache SIS implementation, converters from {@link String} to {@link Number} distinguish two kinds of
+     * unconvertible objects:
+     *
+     * <ul>
+     *   <li>Null or empty source string result in a {@code null} value to be returned.</li>
+     *   <li>All other kind of unparsable strings results in an exception to be thrown.</li>
+     * </ul>
+     *
+     * In other words, the {@code ""} value is unconvertible but nevertheless considered as part of the converter
+     * domain, and is mapped to <cite>"no number"</cite>. All other unparsable strings are considered outside the
+     * converter domain.</div>
      *
      * @param  object  the object to convert, or {@code null}.
      * @return the converted object, or {@code null}.

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -116,7 +116,7 @@ class DerivedSet<S,E> extends SetOfUnkno
 
     /**
      * Returns an iterator over the elements contained in this set.
-     * The iterator will invokes the {@link #baseToDerived(Object)} method for each element.
+     * The iterator will invoke the {@link ObjectConverter#apply(Object)} method for each element.
      *
      * @return an iterator over the elements contained in this set.
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -1003,9 +1003,8 @@ public class RangeSet<E extends Comparab
         private Range<E> subRange;
 
         /**
-         * Index of {@link #minValue} and {@link #maxValue} in the array of the enclosing
-         * {@code RangeSet}. Those indices need to be recomputed every time the enclosing
-         * {@code RangeSet} has been modified.
+         * Index of {@link #subRange} minimum and maximum values in the array of the enclosing {@code RangeSet}.
+         * Those indices need to be recomputed every time the enclosing {@code RangeSet} has been modified.
          *
          * @see #updateBounds()
          */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -111,7 +111,7 @@ public class TreeTableFormat extends Tab
     private static final long serialVersionUID = 147992015470098561L;
 
     /**
-     * Shared {@code TreeTableFormat} instance for {@link TreeTable#toString()} implementation.
+     * Shared {@code TreeTableFormat} instance for {@link DefaultTreeTable#toString()} implementation.
      * Usage of this instance shall be done in a synchronized block.
      */
     static final TreeTableFormat INSTANCE = new TreeTableFormat(null, null);
@@ -162,7 +162,7 @@ public class TreeTableFormat extends Tab
     private transient String treeBlank, treeLine, treeCross, treeEnd;
 
     /**
-     * The set to be given to {@link Writer#parentObjects},
+     * The set to be given to {@link Writer} constructor,
      * created when first needed and reused for subsequent formating.
      */
     private transient Set<TreeTable.Node> recursivityGuard;
@@ -303,8 +303,8 @@ public class TreeTableFormat extends Tab
      * The returned array may contain {@code null} elements, which means that the values
      * in that column can be stored as {@code String}s.
      *
-     * @param  mandatoy  {@code true} if an exception shall be thrown for unrecognized types, or
-     *                   {@code false} for storing a {@code null} value in the array instead.
+     * @param  mandatory  {@code true} if an exception shall be thrown for unrecognized types, or
+     *                    {@code false} for storing a {@code null} value in the array instead.
      * @throws IllegalStateException if {@code mandatory} is {@code true} and a column
      *         contains values of an unsupported type.
      */
@@ -504,7 +504,7 @@ public class TreeTableFormat extends Tab
      * <p>This work is done in a separated method instead than inlined in the
      * {@code parse(…)} method because of the {@code <V>} parametric value.</p>
      *
-     * @param  V        the type of values in the given column.
+     * @param  <V>      the type of values in the given column.
      * @param  node     the node in which to set the value.
      * @param  column   the column in which to set the value.
      * @param  format   the format to use for parsing the value, or {@code null}.
@@ -624,7 +624,7 @@ public class TreeTableFormat extends Tab
          * Creates a new instance which will write to the given appendable.
          *
          * @param  out               where to format the tree.
-         * @param  column            the columns of the tree table to format.
+         * @param  columns           the columns of the tree table to format.
          * @param  recursivityGuard  an initially empty set.
          */
         Writer(final Appendable out, final TableColumn<?>[] columns, final Set<TreeTable.Node> recursivityGuard) {

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -74,7 +74,7 @@ public class WarningListeners<S> impleme
     private WarningListener<? super S>[] listeners;
 
     /**
-     * Creates a new instance without source. This constructor is for {@link EmptyWarningListeners}
+     * Creates a new instance without source. This constructor is for {@code EmptyWarningListeners}
      * usage only, because it requires some method to be overloaded.
      */
     WarningListeners() {

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -117,8 +117,7 @@ final class NilObjectHandler implements
      *           type is returned.</li></ul></li>
      *   <li>If the invoked method is a setter method, throw a {@link UnsupportedOperationException}
      *       since the proxy instance is assumed unmodifiable.</li>
-     *   <li>If the invoked method is one of the {@link Object} method, delegate to the
-     *       {@link #reference}.</li>
+     *   <li>If the invoked method is one of the {@link Object} method, delegate to the {@link #attribute}.</li>
      * </ul>
      */
     @Override

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -39,10 +39,10 @@ final class PooledTemplate extends Poole
     /**
      * Creates a new template.
      *
-     * @param properties  the properties to be given to JAXB (un)marshallers, or {@code null} if none.
-     * @param internal    {@code true} if the JAXB implementation is the one bundled in JDK 6, or
-     *                    {@code false} if this is the external implementation provided as a JAR file
-     *                    in the endorsed directory.
+     * @param properties      the properties to be given to JAXB (un)marshallers, or {@code null} if none.
+     * @param implementation  {@link Implementation#INTERNAL} if the JAXB implementation is the one bundled in JDK 6, or
+     *                        {@link Implementation#ENDORSED} if this is the external implementation provided as a JAR
+     *                        file in the endorsed directory.
      */
     PooledTemplate(final Map<String,?> properties, final Implementation implementation) throws PropertyException {
         super(implementation == Implementation.INTERNAL);

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.internal.converter;
 
+import java.util.Queue;
 import java.util.Deque;
 import java.util.ArrayDeque;
 import java.io.Serializable;
@@ -40,7 +41,7 @@ import static org.apache.sis.test.Assert
  * isolated.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 0.8
  * @since   0.3
  * @module
  */
@@ -361,4 +362,59 @@ public final strictfp class ConverterReg
         assertEquals(double[].class, converter.getTargetClass());
         assertSame("Converter shall be cached.", converter, registry.find(float[].class, double[].class));
     }
+
+    /**
+     * Registers two converters where the source types are interfaces.
+     * The source type of one converter is a sub-type of the source type of the other converter.
+     *
+     * @return the converter having the most specific source type.
+     */
+    @SuppressWarnings("rawtypes")
+    private ObjectConverter<?,Integer> registerSourceInterfaces() {
+        final ObjectConverter<?,Integer> child = new SurjectiveConverter<Deque, Integer>() {
+            @Override public Class<Deque>   getSourceClass() {return Deque.class;}
+            @Override public Class<Integer> getTargetClass() {return Integer.class;}
+            @Override public Integer        apply(Deque o)   {return 43;}
+        };
+        register(new SurjectiveConverter<Queue, Integer>() {
+            @Override public Class<Queue>   getSourceClass() {return Queue.class;}
+            @Override public Class<Integer> getTargetClass() {return Integer.class;}
+            @Override public Integer        apply(Queue o)   {return 42;}
+        });
+        register(child);
+        return child;
+    }
+
+    /**
+     * Tests the search for a converter when the only available types are interfaces, and there is an ambiguity
+     * about which interfaces to choose. The search methods shall throw an {@link UnconvertibleObjectException}.
+     */
+    @Test
+    public void testAmbiguousInterfaces() {
+        registerSourceInterfaces();
+        register(new SurjectiveConverter<Serializable, Integer>() {
+            @Override public Class<Serializable> getSourceClass()      {return Serializable.class;}
+            @Override public Class<Integer>      getTargetClass()      {return Integer.class;}
+            @Override public Integer             apply(Serializable o) {return 44;}
+        });
+        try {
+            registry.find(ArrayDeque.class, Integer.class);
+            fail("Should not find a converter when there is an ambiguity in the interfaces.");
+        } catch (UnconvertibleObjectException e) {
+            final String message = e.getMessage();
+            assertTrue(message, message.contains("ArrayDeque"));
+            assertTrue(message, message.contains("Integer"));
+        }
+    }
+
+    /**
+     * Tests the search for a converter when the only available types are interfaces, and a most specific interface
+     * can be identified.
+     */
+    @Test
+    public void testSourceInterface() {
+        final ObjectConverter<?,Integer> child = registerSourceInterfaces();
+        assertSame("Shall fallback on most specific interface.", child, registry.find(ArrayDeque.class, Integer.class));
+        assertSame("Shall fallback on most specific interface.", child, registry.find(ArrayDeque.class, Number.class));
+    }
 }

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -58,7 +58,7 @@ public final strictfp class ModifiableId
      * identifier to be replaced by {@code "xlink:href"}.
      *
      * @param  expected  the expected content.
-     * @return the map to compare with the expected content.
+     * @param  map       the map to compare with the expected content.
      */
     private static void assertMapEquals(String expected, final Map<Citation,String> map) {
         final int start = expected.indexOf(TO_REPLACE);

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -19,6 +19,7 @@ package org.apache.sis.internal.jaxb.gco
 import java.util.UUID;
 import org.apache.sis.util.iso.SimpleInternationalString;
 import org.apache.sis.xml.XLink;
+import org.apache.sis.xml.MarshalContext;
 import org.apache.sis.xml.IdentifierSpace;
 import org.apache.sis.xml.ReferenceResolverMock;
 import org.apache.sis.test.DependsOnMethod;
@@ -171,7 +172,7 @@ public final strictfp class PropertyType
      *
      *   <li>If {@code useReferenceResolverMock} is {@code true}, then the metadata object shall be replaced
      *       by the XLink because the {@link ReferenceResolverMock#canSubstituteByReference(MarshalContext,
-     *       Class, Object, Xlink)} method returns {@code true}.</li>
+     *       Class, Object, XLink)} method returns {@code true}.</li>
      * </ul>
      */
     private void testWithXLink(final boolean useReferenceResolverMock) {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -47,7 +47,7 @@ public final strictfp class StringAdapte
     }
 
     /**
-     * Tests {@link StringAdapter#toString(CharSequence)} for an {@link InternationalString}
+     * Tests {@link StringAdapter#toString(CharSequence)} for an {@link org.opengis.util.InternationalString}
      * having localizations in different languages.
      */
     @Test

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
  */
 public final strictfp class OffsetDateTimeTest extends TestCase {
     /**
-     * Tests {@link OffsetDateTime#parse(String)}.
+     * Tests {@link OffsetDateTime#parse(CharSequence)}.
      */
     @Test
     public void testParse() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -27,7 +27,7 @@ import static org.junit.Assert.*;
  */
 public final strictfp class OffsetTimeTest extends TestCase {
     /**
-     * Tests {@link OffsetDateTime#parse(String)}.
+     * Tests {@link OffsetDateTime#parse(CharSequence)}.
      */
     @Test
     public void testParse() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -32,7 +32,7 @@ import static org.apache.sis.test.Assert
  */
 public final strictfp class AssertTest extends TestCase {
     /**
-     * Tests the {@link Assert#assertMultilinesEquals(String, String)} method.
+     * Tests the {@link org.apache.sis.test.Assert#assertMultilinesEquals(CharSequence, CharSequence)} method.
      */
     @Test
     public void testAssertEqualsMultilines() {
@@ -55,7 +55,7 @@ public final strictfp class AssertTest e
     }
 
     /**
-     * Tests the {@link Assert#assertSerializedEquals(Object)} method.
+     * Tests the {@link org.apache.sis.test.Assert#assertSerializedEquals(Object)} method.
      */
     @Test
     public void testAssertSerializedEquals() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -33,7 +33,7 @@ import static org.junit.Assert.*;
  */
 public final strictfp class TestUtilitiesTest extends TestCase {
     /**
-     * Tests {@link TestUtilities#toTreeStructure(String)}.
+     * Tests {@link org.apache.sis.test.TestUtilities#toTreeStructure(CharSequence)}.
      */
     @Test
     public void testToTreeStructure() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.internal.util;
 
-import org.opengis.referencing.ReferenceIdentifier;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
@@ -190,7 +189,7 @@ public final strictfp class DefinitionUR
     }
 
     /**
-     * Tests {@link DefinitionURI#format(String, ReferenceIdentifier)}.
+     * Tests {@link DefinitionURI#format(String, String, String, String)}.
      */
     @Test
     public void testToURN() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -43,7 +43,7 @@ public final strictfp class StandardDate
     }
 
     /**
-     * Tests {@link StandardDateFormat#dateToISO(String, int, boolean)} method.
+     * Tests {@link StandardDateFormat#dateToISO(CharSequence, int, boolean)} method.
      */
     @Test
     public void testDateToISO() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -48,7 +48,7 @@ public final strictfp class X364Test ext
     }
 
     /**
-     * Tests the {@link X364#plain(String)} method.
+     * Tests the {@link X364#plain(CharSequence, int, int)} method.
      */
     @Test
     public void testPlain() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -17,7 +17,6 @@
 package org.apache.sis.math;
 
 import java.util.Random;
-import org.opengis.geometry.DirectPosition;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
@@ -43,7 +42,7 @@ public final strictfp class PlaneTest ex
     private double pearson;
 
     /**
-     * Invokes {@link Plane#fit(DirectPosition[])} with the given arrays,
+     * Invokes {@link Plane#fit(Iterable)} with the given arrays,
      * and compares the fitted values against the original values.
      *
      * This method also verifies that the Pearson coefficient is close to 1.
@@ -78,7 +77,7 @@ public final strictfp class PlaneTest ex
     }
 
     /**
-     * Tests {@link Plane#fit(DirectPosition[])} with 3 points.
+     * Tests {@link Plane#fit(Iterable)} with 3 points.
      * The solution is expected to be exact.
      */
     @Test

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -127,7 +127,7 @@ public final strictfp class VectorTest e
     }
 
     /**
-     * Tests {@link ArrayVector.Float} backed by an array of float type.
+     * Tests {@link ArrayVector} backed by an array of float type.
      */
     @Test
     public void testFloatArray() {
@@ -150,7 +150,7 @@ public final strictfp class VectorTest e
     }
 
     /**
-     * Tests {@link ArrayVector.Double} backed by an array of double type.
+     * Tests {@link ArrayVector} backed by an array of double type.
      */
     @Test
     public void testDoubleArray() {
@@ -226,7 +226,7 @@ public final strictfp class VectorTest e
     /**
      * Tests a vector backed by an array of strings.
      * This is not recommended, but happen in GDAL extensions of GeoTIFF.
-     * See {@link org.apache.sis.storage.geotiff.Type#ASCII}.
+     * See {@code org.apache.sis.storage.geotiff.Type.ASCII}.
      */
     @Test
     public void testStringArray() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -51,7 +51,7 @@ public final strictfp class FormattedCha
     static final String LATITUDE_STRING = "45°30′15.0″N";
 
     /**
-     * The numerical value corresponding to {@link #ANGLE_STRING}.
+     * The numerical value corresponding to {@link #LATITUDE_STRING}.
      * This information is used by {@link AngleFormatTest}.
      */
     static final double LATITUDE_VALUE = 45.50416666666667;

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -50,8 +50,8 @@ import static org.apache.sis.test.TestUt
  *       {@link #getExpectedXmlTypeForElement expected value}.</li>
  *   <li>The name declared in the {@code XmlRootElement} (classes) or {@link XmlElement} (methods)
  *       annotations matches the identifier declared in the {@link UML} annotation of the GeoAPI interfaces.
- *       The UML - XML name mapping can be changed by overriding {@link #getExpectedXmlElementName(UML)} and
- *       {@link #getExpectedXmlRootElementName(UML)}.</li>
+ *       The UML - XML name mapping can be changed by overriding {@link #getExpectedXmlElementName(Class, UML)} and
+ *       {@link #getExpectedXmlElementName(Class, UML)}.</li>
  *   <li>The {@code XmlElement.required()} boolean is consistent with the UML {@linkplain Obligation obligation}.</li>
  *   <li>The namespace declared in the {@code XmlRootElement} or {@code XmlElement} annotations
  *       is not redundant with the {@link XmlSchema} annotation in the package.</li>

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -83,9 +83,9 @@ public abstract strictfp class TestCase
     protected static final double STRICT = 0;
 
     /**
-     * The seed for the random number generator created by {@link TestUtilities#createRandomNumberGenerator(String)},
-     * or 0 if none. This information is used for printing the seed in case of test failure, in order to allow the
-     * developer to reproduce the failure.
+     * The seed for the random number generator created by {@link TestUtilities#createRandomNumberGenerator()},
+     * or 0 if none. This information is used for printing the seed in case of test failure, in order to allow
+     * the developer to reproduce the failure.
      */
     static long randomSeed;
 
@@ -181,7 +181,7 @@ public abstract strictfp class TestCase
 
     /**
      * Invoked by {@link TestRunner} in order to clear the buffer before a new test begin.
-     * This is necessary when the previous test succeeded and the {@link #verbose} flag is
+     * This is necessary when the previous test succeeded and the {@link #VERBOSE} flag is
      * {@code false}, since the {@link #flushOutput()} method has not been invoked in such
      * case.
      */
@@ -197,8 +197,6 @@ public abstract strictfp class TestCase
      * The stream content will be flushed to the {@linkplain System#console() console}
      * if available, or to the {@linkplain System#out standard output stream} otherwise.
      * This method clears the stream buffer.
-     *
-     * @param success {@code true} if this method is invoked on build success,
      */
     @SuppressWarnings("UseOfSystemOutOrSystemErr")
     static void flushOutput() {

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -101,7 +101,7 @@ public final strictfp class TestUtilitie
 
     /**
      * Prints and clear the current content of {@link TestCase#out}, regardless of whether
-     * {@link TestCase#verbose} is {@code true} or {@code false}. This method should rarely
+     * {@link TestCase#VERBOSE} is {@code true} or {@code false}. This method should rarely
      * be needed.
      *
      * @since 0.4

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -70,6 +70,7 @@ import org.junit.BeforeClass;
     // Collections.
     org.apache.sis.internal.util.CheckedArrayListTest.class,
     org.apache.sis.internal.system.ReferenceQueueConsumerTest.class,
+    org.apache.sis.util.collection.FrequencySortedSetTest.class,
     org.apache.sis.util.collection.IntegerListTest.class,
     org.apache.sis.util.collection.WeakHashSetTest.class,
     org.apache.sis.util.collection.WeakValueHashMapTest.class,

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -73,7 +73,7 @@ public final strictfp class CharactersTe
     }
 
     /**
-     * Tests the {@link Characters#isHexadecimal()} method.
+     * Tests the {@link Characters#isHexadecimal(int)} method.
      *
      * @since 0.5
      */

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -45,7 +45,7 @@ public final strictfp class DerivedMapTe
     /**
      * The value to replace by {@code null}.
      */
-    protected static final int EXCLUDED = 17; // non-private for javadoc purpose.
+    protected static final int EXCLUDED = 17;                       // non-private for javadoc purpose.
 
     /**
      * Fills test values in the given maps.
@@ -124,7 +124,7 @@ public final strictfp class DerivedMapTe
      */
     @Override
     public Integer apply(final Integer value) {
-        if (value.intValue() == EXCLUDED) {
+        if (value == EXCLUDED) {
             return null;
         }
         return value * 100;

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -43,7 +43,7 @@ public final strictfp class DerivedSetTe
     /**
      * The value to replace by {@code null}.
      */
-    protected static final int EXCLUDED = 19; // non-private for javadoc purpose.
+    protected static final int EXCLUDED = 19;                   // non-private for javadoc purpose.
 
     /**
      * Tests {@link DerivedSet} without excluded value.
@@ -102,7 +102,7 @@ public final strictfp class DerivedSetTe
      */
     @Override
     public Integer apply(final Integer value) {
-        if (value.intValue() == EXCLUDED) {
+        if (value == EXCLUDED) {
             return null;
         }
         return value * 10;

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -34,8 +34,8 @@ import static org.apache.sis.internal.ut
 
 
 /**
- * Tests the {@link TypeNames} class. Tests are performed through the {@link DefaultNameFactory#toTypeName(Class)}
- * method on the {@link DefaultFactories#SIS_NAMES} instance.
+ * Tests the {@link TypeNames} class.
+ * Tests are performed through the {@link DefaultNameFactory#toTypeName(Class)} method.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypesTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -108,7 +108,7 @@ public final strictfp class TypesTest ex
 
     /**
      * Tests the {@link Types#forEnumName(Class, String)} method with an enumeration from the JDK.
-     * Such enumerations do not implement the {@link org.opengis.util.ControlledVocabulary} interface.
+     * Such enumerations do not implement the {@code org.opengis.util.ControlledVocabulary} interface.
      *
      * @since 0.5
      */
@@ -178,7 +178,7 @@ public final strictfp class TypesTest ex
     }
 
     /**
-     * Tests the {@link Types#getDescription(ControlledVocabulary)} method.
+     * Tests the {@code Types.getDescription(ControlledVocabulary)} method.
      */
     @Test
     public void testGetCodeDescription() {
@@ -192,7 +192,7 @@ public final strictfp class TypesTest ex
     }
 
     /**
-     * Tests the examples given in {@link Types#getListName(ControlledVocabulary)} javadoc.
+     * Tests the examples given in {@code Types.getListName(ControlledVocabulary)} javadoc.
      */
     @Test
     public void testGetListName() {
@@ -202,7 +202,7 @@ public final strictfp class TypesTest ex
     }
 
     /**
-     * Tests the examples given in {@link Types#getCodeName(ControlledVocabulary)} javadoc.
+     * Tests the examples given in {@code Types.getCodeName(ControlledVocabulary)} javadoc.
      */
     @Test
     public void testGetCodeName() {
@@ -212,7 +212,7 @@ public final strictfp class TypesTest ex
     }
 
     /**
-     * Tests the examples given in {@link Types#getCodeLabel(ControlledVocabulary)} javadoc.
+     * Tests the examples given in {@code Types.getCodeLabel(ControlledVocabulary)} javadoc.
      */
     @Test
     public void testGetCodeLabel() {
@@ -222,7 +222,7 @@ public final strictfp class TypesTest ex
     }
 
     /**
-     * Tests {@link Types#getCodeTitle(ControlledVocabulary)}.
+     * Tests {@code Types.getCodeTitle(ControlledVocabulary)}.
      * Also opportunistically tests {@link Types#forCodeTitle(CharSequence)}.
      */
     @Test

Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/resources/IndexedResourceBundleTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -118,7 +118,7 @@ public final strictfp class IndexedResou
     }
 
     /**
-     * Tests the {@link IndexedResourceBundle#getString(int)} method on different locales.
+     * Tests the {@link IndexedResourceBundle#getString(short)} method on different locales.
      */
     @Test
     @DependsOnMethod("testGetResources")
@@ -146,7 +146,7 @@ public final strictfp class IndexedResou
     }
 
     /**
-     * Tests the {@link IndexedResourceBundle#getString(int, Object)} method on different locales.
+     * Tests the {@link IndexedResourceBundle#getString(short, Object)} method on different locales.
      */
     @Test
     @DependsOnMethod("testGetString")
@@ -159,7 +159,7 @@ public final strictfp class IndexedResou
     }
 
     /**
-     * Tests the {@link IndexedResourceBundle#getString(int, Object)} method with a {@code CodeList} argument.
+     * Tests the {@link IndexedResourceBundle#getString(short, Object)} method with a {@code CodeList} argument.
      * The intend is to test the code list localization.
      */
     @Test
@@ -192,7 +192,7 @@ public final strictfp class IndexedResou
     }
 
     /**
-     * Tests the {@link IndexedResourceBundle#getLogRecord(Level, int, Object)} method.
+     * Tests the {@link IndexedResourceBundle#getLogRecord(Level, short, Object)} method.
      */
     @Test
     @DependsOnMethod("testGetResources")

Modified: sis/trunk/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.properties?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Wed Apr  5 09:26:10 2017
@@ -157,7 +157,7 @@ debug.test.classpath=\
 #
 # Build configuration and destination directories.
 #
-javac.compilerargs                       = -Xdoclint:syntax,html,missing/protected,accessibility/protected
+javac.compilerargs                       = -Xdoclint:syntax,html,reference,missing/protected,accessibility/protected
 javac.deprecation                        = true
 javac.external.vm                        = false
 javadoc.windowtitle                      = Apache SIS

Modified: sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java [UTF-8] (original)
+++ sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -111,7 +111,7 @@ final class LandsatReader {
      * Names of Landsat bands.
      *
      * @see #bands
-     * @see #band(int)
+     * @see #band(String, int)
      */
     private static final String[] BAND_NAMES = {
         "Coastal Aerosol",                      //   433 nm
@@ -131,7 +131,7 @@ final class LandsatReader {
      * Peak response wavelength for the Landsat bands, in nanometres.
      *
      * @see #bands
-     * @see #band(int)
+     * @see #band(String, int)
      */
     private static final short[] WAVELENGTHS = {
         433, 482, 562, 655, 865, 1610, 2200, 590, 1375, 10800, 12000
@@ -185,7 +185,7 @@ final class LandsatReader {
     private static final int NUM_GROUPS = 3;
 
     /**
-     * Index of panchromatic, reflective or thermal groups in the {@link #gridSize} array.
+     * Index of panchromatic, reflective or thermal groups in the {@link #gridSizes} array.
      * The image size is each group is given by {@value #DIM} integers: the width and the height.
      */
     static final int PANCHROMATIC = 0*DIM,
@@ -270,7 +270,7 @@ final class LandsatReader {
      *
      * @see #BAND_NAMES
      * @see #WAVELENGTHS
-     * @see #band(int)
+     * @see #band(String, int)
      */
     private final DefaultBand[] bands;
 

Modified: sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java [UTF-8] (original)
+++ sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatStore.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -32,7 +32,7 @@ import org.apache.sis.util.Debug;
 
 
 /**
- * Parses Landsat metadata as {@linkplain DefaultMetadata ISO-19115 Metadata} object.
+ * Parses Landsat metadata as {@linkplain org.apache.sis.metadata.iso.DefaultMetadata ISO-19115 Metadata} object.
  * Landsat data are distributed as a collection of TIFF files, together with a single
  * text file like below:
  *

Modified: sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/doc-files/LandsatMetadata.html
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/doc-files/LandsatMetadata.html?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/doc-files/LandsatMetadata.html [UTF-8] (original)
+++ sis/trunk/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/doc-files/LandsatMetadata.html [UTF-8] Wed Apr  5 09:26:10 2017
@@ -101,7 +101,7 @@
     <ul>
       <li><a href="http://www.iso.org/iso/home/store/catalogue_ics/catalogue_detail_ics.htm?csnumber=53798">ISO 19115-1:2014
           - Geographic information - Metadata - Part 1: Fundamentals</a></li>
-      <li><a href="https://landsat.usgs.gov/documents/LSDS-809.pdf">LANDSAT 8 (L8) level 1 (L1) Data Format Control Book (DFCB)</a></li>
+      <li><a href="https://landsat.usgs.gov/sites/default/files/documents/LSDS-809_V10.0.pdf">LANDSAT 8 (L8) level 1 (L1) Data Format Control Book (DFCB)</a></li>
     </ul>
     <table>
       <caption>Metadata mapping</caption>

Modified: sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java [UTF-8] (original)
+++ sis/trunk/storage/sis-earth-observation/src/test/java/org/apache/sis/storage/earthobservation/LandsatReaderTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -71,7 +71,7 @@ public class LandsatReaderTest extends T
     }
 
     /**
-     * Tests {@link LandsatReader#read()}.
+     * Tests {@link LandsatReader#read(BufferedReader)}.
      *
      * <p><b>NOTE FOR MAINTAINER:</b> if the result of this test changes, consider updating
      * <a href="./doc-files/LandsatMetadata.html">./doc-files/LandsatMetadata.html</a> accordingly.</p>

Modified: sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java [UTF-8] (original)
+++ sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/CRSBuilder.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -179,7 +179,7 @@ final class CRSBuilder {
 
     /**
      * Minimal length that a key in a name must have before we compare them to the {@link #NAME_KEYS}.
-     * For example a value of 5 means that {@link #parseName(String)} will accept {@code "Ellip"},
+     * For example a value of 5 means that {@link #splitName(String)} will accept {@code "Ellip"},
      * {@code "Ellips"}, {@code "Ellipso"} and {@code "Ellipsoi"} as if they were {@code "Ellipsoid"}.
      * This length shall not be greater than the length of the shortest string in {@link #NAME_KEYS}.
      */
@@ -239,7 +239,7 @@ final class CRSBuilder {
     private DefaultCoordinateOperationFactory operationFactory;
 
     /**
-     * Name of the last object created. This is used by {@link #properties(String)} for reusing existing instance
+     * Name of the last object created. This is used by {@link #properties(Object)} for reusing existing instance
      * if possible. This is useful in GeoTIFF files since the same name is used for different geodetic components,
      * for example the datum and the ellipsoid.
      */
@@ -425,8 +425,7 @@ final class CRSBuilder {
      * A warning is reported before to throw the exception. There is no attempt to provide a good message
      * in the exception since is should be caught by {@link ImageFileDirectory}.
      *
-     * @param  key        the GeoTIFF key for which to get a value.
-     * @param  mandatory  whether a value is mandatory for the given key.
+     * @param  key  the GeoTIFF key for which to get a value.
      * @return a string representation of the value for the given key.
      * @throws NoSuchElementException if no value has been found.
      */
@@ -443,8 +442,7 @@ final class CRSBuilder {
      * A warning is reported before to throw the exception. There is no attempt to provide a good message in
      * the exception since is should be caught by {@link ImageFileDirectory}.
      *
-     * @param  key        the GeoTIFF key for which to get a value.
-     * @param  mandatory  whether a value is mandatory for the given key.
+     * @param  key  the GeoTIFF key for which to get a value.
      * @return the floating point value for the given key.
      * @throws NoSuchElementException if no value has been found.
      * @throws NumberFormatException if the value was stored as a string and can not be parsed.
@@ -1038,8 +1036,8 @@ final class CRSBuilder {
      *   <li>A code given by {@link GeoKeys#GeodeticDatum}.</li>
      *   <li>If above code is {@link GeoCodes#userDefined}, then:<ul>
      *     <li>a name given by {@link GeoKeys#GeogCitation},</li>
-     *     <li>all values required by {@link #createPrimeMeridian(Unit)} (optional),</li>
-     *     <li>all values required by {@link #createEllipsoid(Unit)}.</li>
+     *     <li>all values required by {@link #createPrimeMeridian(String[], Unit)} (optional),</li>
+     *     <li>all values required by {@link #createEllipsoid(String[], Unit)}.</li>
      *   </ul></li>
      * </ul>
      *
@@ -1051,8 +1049,8 @@ final class CRSBuilder {
      * @throws ClassCastException if an object defined by an EPSG code is not of the expected type.
      * @throws FactoryException if an error occurred during objects creation with the factories.
      *
-     * @see #createPrimeMeridian(Unit)
-     * @see #createEllipsoid(Unit)
+     * @see #createPrimeMeridian(String[], Unit)
+     * @see #createEllipsoid(String[], Unit)
      */
     private GeodeticDatum createGeodeticDatum(final String[] names, final Unit<Angle> angularUnit, final Unit<Length> linearUnit)
             throws FactoryException
@@ -1108,7 +1106,7 @@ final class CRSBuilder {
      * matches the given datum created from the EPSG geodetic dataset.
      * This method does not verify the EPSG code of the given datum.
      *
-     * @param  ellipsoid    the datum created from the EPSG geodetic dataset.
+     * @param  datum        the datum created from the EPSG geodetic dataset.
      * @param  angularUnit  unit of measurement declared in the GeoTIFF file.
      * @param  linearUnit   unit of measurement declared in the GeoTIFF file.
      */
@@ -1220,7 +1218,7 @@ final class CRSBuilder {
      * @throws ClassCastException if an object defined by an EPSG code is not of the expected type.
      * @throws FactoryException if an error occurred during objects creation with the factories.
      *
-     * @see #createGeodeticDatum(String, Unit, Unit)
+     * @see #createGeodeticDatum(String[], Unit, Unit)
      */
     private GeographicCRS createGeographicCRS(final boolean rightHanded, final Unit<Angle> angularUnit) throws FactoryException {
         final int epsg = getAsInteger(GeoKeys.GeographicType);
@@ -1288,7 +1286,7 @@ final class CRSBuilder {
      * @throws ClassCastException if an object defined by an EPSG code is not of the expected type.
      * @throws FactoryException if an error occurred during objects creation with the factories.
      *
-     * @see #createGeodeticDatum(String, Unit, Unit)
+     * @see #createGeodeticDatum(String[], Unit, Unit)
      */
     private GeocentricCRS createGeocentricCRS() throws FactoryException {
         final int epsg = getAsInteger(GeoKeys.GeographicType);
@@ -1374,8 +1372,8 @@ final class CRSBuilder {
      * @throws ClassCastException if an object defined by an EPSG code is not of the expected type.
      * @throws FactoryException if an error occurred during objects creation with the factories.
      *
-     * @see #createGeographicCRS(boolean)
-     * @see #createConversion(String)
+     * @see #createGeographicCRS(boolean, Unit)
+     * @see #createConversion(String, Unit, Unit)
      */
     private ProjectedCRS createProjectedCRS() throws FactoryException {
         final int epsg = getAsInteger(GeoKeys.ProjectedCSType);

Modified: sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Compression.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Compression.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Compression.java [UTF-8] (original)
+++ sis/trunk/storage/sis-geotiff/src/main/java/org/apache/sis/storage/geotiff/Compression.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -26,7 +26,7 @@ package org.apache.sis.storage.geotiff;
  *
  * <blockquote>OGC 12-100: GML Application Schema - Coverages - GeoTIFF Coverage Encoding Profile</blockquote>
  *
- * The main exception is {@link #CCITT}, which has different name in CSW query and response.
+ * The main exception is {@code CCITT}, which has different name in CSW query and response.
  *
  * @author  Johann Sorel (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/trunk/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java [UTF-8] (original)
+++ sis/trunk/storage/sis-geotiff/src/test/java/org/apache/sis/storage/geotiff/CompressionTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
  */
 public final strictfp class CompressionTest extends TestCase {
     /**
-     * Tests {@link Compression#valueOf(int)}.
+     * Tests {@link Compression#valueOf(long)}.
      */
     @Test
     public void testValueOf() {

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/Decoder.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -168,7 +168,7 @@ public abstract class Decoder implements
      * {@link ucar.nc2.NetcdfFile#getId()} method for that purpose, which we will use when
      * possible in case that {@code getId()} method is defined in an other way.
      *
-     * <p>This method is used by {@link org.apache.sis.storage.netcdf.MetadataReader} in last resort
+     * <p>This method is used by {@link org.apache.sis.storage.netcdf.NetcdfStore#getMetadata()} in last resort
      * when no value were found for the attributes defined by the CF standard or by THREDDS.</p>
      *
      * @return the global dataset identifier, or {@code null} if none.
@@ -182,7 +182,7 @@ public abstract class Decoder implements
      * {@link ucar.nc2.NetcdfFile#getTitle()} method for that purpose, which we will use when
      * possible in case that {@code getTitle()} method is defined in an other way.
      *
-     * <p>This method is used by {@link org.apache.sis.storage.netcdf.MetadataReader} in last resort
+     * <p>This method is used by {@link org.apache.sis.storage.netcdf.NetcdfStore#getMetadata()} in last resort
      * when no value were found for the attributes defined by the CF standard or by THREDDS.</p>
      *
      * @return the dataset title, or {@code null} if none.

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/ChannelDecoder.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -166,7 +166,7 @@ public final class ChannelDecoder extend
      * @todo Fixed to ISO-LATIN-1 for now, needs to be determined in a better way.
      *
      * @see #NAME_ENCODING
-     * @see #readString(String)
+     * @see #readValues(DataType, int)
      */
     private final String encoding = "ISO-8859-1";
 
@@ -296,7 +296,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Returns the localized error resource bundle for the locale given by {@link #getLocale()}.
+     * Returns the localized error resource bundle for the locale given by {@link WarningListeners#getLocale()}.
      *
      * @return the localized error resource bundle.
      */
@@ -305,7 +305,7 @@ public final class ChannelDecoder extend
     }
 
     /**
-     * Returns the NetCDF-specific resource bundle for the locale given by {@link #getLocale()}.
+     * Returns the NetCDF-specific resource bundle for the locale given by {@link WarningListeners#getLocale()}.
      *
      * @return the localized error resource bundle.
      */
@@ -360,8 +360,6 @@ public final class ChannelDecoder extend
     /**
      * Reads a string from the channel in the {@value #NAME_ENCODING}. This is suitable for the dimension,
      * variable and attribute names in the header. Note that attribute value may have a different encoding.
-     *
-     * @param  length  number of bytes to read. The number of bytes actually read may be greater.
      */
     private String readName() throws IOException, DataStoreException {
         final int length = input.readInt();
@@ -456,7 +454,7 @@ public final class ChannelDecoder extend
      *
      * <ul>
      *   <li>The dimension name     (use {@link #readName()})</li>
-     *   <li>The dimension length   (use {@link #readInt()})</li>
+     *   <li>The dimension length   (use {@link ChannelDataInput#readInt()})</li>
      * </ul>
      *
      * @param  nelems  the number of dimensions to read.
@@ -485,9 +483,9 @@ public final class ChannelDecoder extend
      *
      * <ul>
      *   <li>The attribute name                             (use {@link #readName()})</li>
-     *   <li>The attribute type (BYTE, SHORT, …)            (use {@link #readInt()})</li>
-     *   <li>The number of values of the above type         (use {@link #readInt()})</li>
-     *   <li>The actual values as a variable length list    (use {@link #readValues(String,int,int)})</li>
+     *   <li>The attribute type (BYTE, SHORT, …)            (use {@link ChannelDataInput#readInt()})</li>
+     *   <li>The number of values of the above type         (use {@link ChannelDataInput#readInt()})</li>
+     *   <li>The actual values as a variable length list    (use {@link #readValues(DataType,int)})</li>
      * </ul>
      *
      * If the value is a {@code String}, then leading and trailing spaces and control characters
@@ -514,13 +512,13 @@ public final class ChannelDecoder extend
      *
      * <ul>
      *   <li>The variable name          (use {@link #readName()})</li>
-     *   <li>The number of dimensions   (use {@link #readInt()})</li>
-     *   <li>Index of all dimensions    (use {@link #readInt()} <var>n</var> time)</li>
-     *   <li>The {@link #ATTRIBUTE} tag (use {@link #readInt()} - actually combined as a long with next item)</li>
-     *   <li>Number of attributes       (use {@link #readInt()} - actually combined as a long with above item)</li>
+     *   <li>The number of dimensions   (use {@link ChannelDataInput#readInt()})</li>
+     *   <li>Index of all dimensions    (use {@link ChannelDataInput#readInt()} <var>n</var> time)</li>
+     *   <li>The {@link #ATTRIBUTE} tag (use {@link ChannelDataInput#readInt()} - actually combined as a long with next item)</li>
+     *   <li>Number of attributes       (use {@link ChannelDataInput#readInt()} - actually combined as a long with above item)</li>
      *   <li>The attribute values       (use {@link #readAttributes(int)})</li>
-     *   <li>The data type (BYTE, …)    (use {@link #readInt()})</li>
-     *   <li>The variable size          (use {@link #readInt()})</li>
+     *   <li>The data type (BYTE, …)    (use {@link ChannelDataInput#readInt()})</li>
+     *   <li>The variable size          (use {@link ChannelDataInput#readInt()})</li>
      *   <li>Offset where data begins   (use {@link #readOffset()})</li>
      * </ul>
      *
@@ -646,8 +644,8 @@ public final class ChannelDecoder extend
 
     /**
      * Returns the NetCDF attribute of the given name, or {@code null} if none.
-     * The {@code name} argument is typically (but is not restricted too) one of
-     * the constants defined in the {@link AttributeNames} class.
+     * The {@code name} argument is typically (but is not restricted to) one of the constants
+     * defined in the {@link org.apache.sis.storage.netcdf.AttributeNames} class.
      *
      * @param  name  the name of the attribute to search, or {@code null}.
      * @return the attribute value, or {@code null} if none.

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/impl/GridGeometryInfo.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -90,7 +90,7 @@ final class GridGeometryInfo extends Gri
 
     /**
      * Returns all axes of the NetCDF coordinate system, together with the grid dimension to which the axis
-     * is associated. See {@link org.apache.sis.internal.netcdf.ucar.GridGeometryWrapper#getAxes()} for more
+     * is associated. See {@code org.apache.sis.internal.netcdf.ucar.GridGeometryWrapper.getAxes()} for more
      * information on the algorithm applied here, and relationship with the UCAR library.
      */
     @Override

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/DecoderWrapper.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -171,11 +171,11 @@ public final class DecoderWrapper extend
     /**
      * Returns the NetCDF attribute of the given name in the given group, or {@code null} if none.
      * This method is invoked for every global and group attributes to be read by this class (but
-     * not {@linkplain VariableSimpleIF variable} attributes), thus providing a single point where
-     * we can filter the attributes to be read - if we want to do that in a future version.
+     * not {@linkplain ucar.nc2.VariableSimpleIF variable} attributes), thus providing a single point
+     * where we can filter the attributes to be read - if we want to do that in a future version.
      *
      * <p>The {@code name} argument is typically (but is not restricted too) one of the constants
-     * defined in the {@link AttributeNames} class.</p>
+     * defined in the {@link org.apache.sis.storage.netcdf.AttributeNames} class.</p>
      *
      * @param  group  the group in which to search the attribute, or {@code null} for global attributes.
      * @param  name   the name of the attribute to search (can not be null).

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/GridGeometryWrapper.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -83,7 +83,7 @@ final class GridGeometryWrapper extends
      * (domain) and output (range) of the function that convert grid indices to geodetic coordinates.</p>
      *
      * <p>The domain of all axes (or the {@linkplain CoordinateSystem#getDomain() coordinate system domain})
-     * is often the same than the {@linkplain #getDomain() domain of the variable}, but not necessarily.
+     * is often the same than the domain of the variable, but not necessarily.
      * In particular, the relationship is not straightforward when the coordinate system contains instances
      * of {@link CoordinateAxis2D}.</p>
      */

Modified: sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -92,15 +92,15 @@ import static org.apache.sis.internal.ut
  * </ol>
  *
  * The {@code "CFMetadata"} group has precedence over the global attributes because the
- * {@linkplain #LONGITUDE longitude} and {@linkplain #LATITUDE latitude} resolutions are
- * often more accurate in that group.
+ * {@linkplain AttributeNames#LONGITUDE longitude} and {@linkplain AttributeNames#LATITUDE latitude}
+ * resolutions are often more accurate in that group.
  *
  * <div class="section">Known limitations</div>
  * <ul>
  *   <li>{@code "degrees_west"} and {@code "degrees_south"} units not correctly handled.</li>
  *   <li>Units of measurement not yet declared in the {@link Band} elements.</li>
- *   <li>{@link #FLAG_VALUES} and {@link #FLAG_MASKS} not yet included in the
- *       {@link RangeElementDescription} elements.</li>
+ *   <li>{@link AttributeNames#FLAG_VALUES} and {@link AttributeNames#FLAG_MASKS}
+ *       not yet included in the {@link RangeElementDescription} elements.</li>
  *   <li>Services (WMS, WCS, OPeNDAP, THREDDS) <i>etc.</i>) and transfer options not yet declared.</li>
  * </ul>
  *
@@ -125,7 +125,7 @@ final class MetadataReader {
 
     /**
      * The string to use as a keyword separator. This separator is used for parsing the
-     * {@value org.apache.sis.metadata.netcdf.AttributeNames#KEYWORDS} attribute value.
+     * {@value org.apache.sis.storage.netcdf.AttributeNames#KEYWORDS} attribute value.
      * This is a regular expression.
      */
     private static final String KEYWORD_SEPARATOR = ",";
@@ -133,8 +133,7 @@ final class MetadataReader {
     /**
      * The vertical coordinate reference system to be given to the object created by {@link #createExtent()}.
      *
-     * @todo Should be set to {@link org.apache.sis.referencing.crs.DefaultVerticalCRS#GEOIDAL_HEIGHT}
-     *       after we ported the {@code sis-referencing} module.
+     * @todo Should be set to {@code CommonCRS.MEAN_SEA_LEVEL}.
      */
     private static final VerticalCRS VERTICAL_CRS = null;
 
@@ -200,7 +199,8 @@ final class MetadataReader {
     }
 
     /**
-     * Returns the localized error resource bundle for the locale given by {@link #getLocale()}.
+     * Returns the localized error resource bundle for the locale given by
+     * {@link org.apache.sis.util.logging.WarningListeners#getLocale()}.
      *
      * @return the localized error resource bundle.
      */
@@ -886,7 +886,7 @@ final class MetadataReader {
      * Creates a {@code <gmd:rangeElementDescription>} elements from the given information.
      *
      * <p><b>Note:</b> ISO 19115 range elements are approximatively equivalent to
-     * {@link org.apache.sis.coverage.Category} in the {@code sis-coverage} module.</p>
+     * {@code org.apache.sis.coverage.Category} in the {@code sis-coverage} module.</p>
      *
      * @param  variable  the NetCDF variable.
      * @param  name      one of the elements in the {@link AttributeNames#FLAG_NAMES} attribute, or {@code null}.
@@ -915,8 +915,8 @@ final class MetadataReader {
      * The default implementation builds the identifier from the following attributes:
      *
      * <ul>
-     *   <li>{@value #NAMING_AUTHORITY} used as the {@linkplain Identifier#getAuthority() authority}.</li>
-     *   <li>{@value #IDENTIFIER}, or {@link ucar.nc2.NetcdfFile#getId()} if no identifier attribute was found.</li>
+     *   <li>{@value AttributeNames#NAMING_AUTHORITY} used as the {@linkplain Identifier#getAuthority() authority}.</li>
+     *   <li>{@value AttributeNames#IDENTIFIER}, or {@link ucar.nc2.NetcdfFile#getId()} if no identifier attribute was found.</li>
      * </ul>
      *
      * @return the globally unique identifier, or {@code null} if none.

Modified: sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridGeometryTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridGeometryTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridGeometryTest.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/GridGeometryTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -29,7 +29,7 @@ import static org.apache.sis.test.TestUt
 
 /**
  * Tests the {@link GridGeometry} implementation. The default implementation tests
- * {@link org.apache.sis.internal.netcdf.ucar.GridGeometryWrapper} since the UCAR
+ * {@code org.apache.sis.internal.netcdf.ucar.GridGeometryWrapper} since the UCAR
  * library is our reference implementation. However subclasses can override the
  * {@link #createDecoder(String)} method in order to test a different implementation.
  *

Modified: sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/TestCase.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -89,10 +89,8 @@ public abstract strictfp class TestCase
      * The {@code name} parameter can be one of the following values:
      *
      * <ul>
-     *   <li>{@link #THREDDS} for a NcML file.</li>
      *   <li>{@link #NCEP}    for a NetCDF binary file.</li>
      *   <li>{@link #CIP}     for a NetCDF binary file.</li>
-     *   <li>{@link #LANDSAT} for a NetCDF binary file.</li>
      * </ul>
      *
      * The default implementation first delegates to {@link #open(String)}, then wraps the result

Modified: sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java?rev=1790195&r1=1790194&r2=1790195&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java [UTF-8] (original)
+++ sis/trunk/storage/sis-netcdf/src/test/java/org/apache/sis/internal/netcdf/VariableTest.java [UTF-8] Wed Apr  5 09:26:10 2017
@@ -27,7 +27,7 @@ import static org.opengis.test.Assert.*;
 
 /**
  * Tests the {@link Variable} implementation. The default implementation tests
- * {@link org.apache.sis.internal.netcdf.ucar.VariableWrapper} since the UCAR
+ * {@code org.apache.sis.internal.netcdf.ucar.VariableWrapper} since the UCAR
  * library is our reference implementation. However subclasses can override the
  * {@link #createDecoder(String)} method in order to test a different implementation.
  *



Mime
View raw message