sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1790135 [4/5] - in /sis/branches/JDK7: ./ 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-...
Date Tue, 04 Apr 2017 15:23:15 GMT
Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/NonSquareMatrixTest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -44,7 +44,7 @@ import static org.opengis.test.Assert.*;
 @DependsOn(SolverTest.class)
 public final strictfp class NonSquareMatrixTest extends MatrixTestCase {
     /**
-     * Number of rows and columns, initialized by {@link #initialize(String, boolean)}.
+     * Number of rows and columns, initialized by {@link #prepareNewMatrixSize(Random)}.
      */
     private int numRow, numCol;
 
@@ -203,7 +203,7 @@ public final strictfp class NonSquareMat
 
     /**
      * Prints the statistics about the differences between JAMA and SIS matrix elements.
-     * Those statistics will be visible only if {@link #verbose} is {@code true}.
+     * Those statistics will be visible only if {@link #VERBOSE} is {@code true}.
      */
     @AfterClass
     public static void printStatistics() {

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/matrix/SolverTest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -120,7 +120,8 @@ public final strictfp class SolverTest e
     }
 
     /**
-     * Tests {@link Solver#inverse(MatrixSIS, boolean)} with a square matrix that contains a {@link Double#NaN} value.
+     * Tests {@link Solver#inverse(org.opengis.referencing.operation.Matrix, boolean)}
+     * with a square matrix that contains a {@link Double#NaN} value.
      *
      * @throws NoninvertibleMatrixException if an unexpected error occurred while inverting the matrix.
      */

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/ConformalProjectionTest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -92,7 +92,7 @@ public final strictfp class ConformalPro
 
     /**
      * Implementation of {@link #testExpOfNorthing()}.
-     * The {@link #projection} field must have been set before this method is called.
+     * The {@link #transform} field must have been set before this method is called.
      */
     private void doTestExpOfNorthing() {
         assertEquals("f(NaN) = NaN",       NaN, expOfNorthing(NaN),               tolerance);
@@ -158,7 +158,7 @@ public final strictfp class ConformalPro
     }
 
     /**
-     * Tests the {@link NormalizedProjection#expOfNorthing(double, double)} function.
+     * Tests the {@link ConformalProjection#expOfNorthing(double, double)} function.
      *
      * {@preformat text
      *   Forward:  y = -log(t(φ))
@@ -176,7 +176,7 @@ public final strictfp class ConformalPro
     }
 
     /**
-     * Tests the {@link NormalizedProjection#dy_dφ(double, double)} method.
+     * Tests the {@link ConformalProjection#dy_dφ(double, double)} method.
      *
      * @throws TransformException if an error occurred while projecting a point.
      */
@@ -190,7 +190,6 @@ public final strictfp class ConformalPro
 
     /**
      * Implementation of {@link #test_dy_dφ()}.
-     * The {@link #projection} field must have been set before this method is called.
      */
     private void doTest_dy_dφ(final NoOp projection) throws TransformException {
         transform = new AbstractMathTransform1D() {
@@ -231,7 +230,7 @@ public final strictfp class ConformalPro
 
     /**
      * Tests the {@link ConformalProjection#φ(double)} function. We expect it to be
-     * the converse of the {@link NormalizedProjection#expOfNorthing(double, double)} function.
+     * the converse of the {@link ConformalProjection#expOfNorthing(double, double)} function.
      * In theory only the [-90° … +90°] range needs to be tested. However the function is still
      * consistent in the [-90° … +270°] range so we test that range for tracking this fact.
      *
@@ -250,7 +249,7 @@ public final strictfp class ConformalPro
 
     /**
      * Implementation of {@link #test_φ()}.
-     * The {@link #projection} field must have been set before this method is called.
+     * The {@link #transform} field must have been set before this method is called.
      */
     private void doTest_φ() throws ProjectionException {
         assertEquals("φ(NaN) = NaN",    NaN,   φ(NaN),               tolerance);

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -267,7 +267,7 @@ public final class MercatorMethodCompari
      *
      * @param  min  the first eccentricity value to test.
      * @param  max  the maximal eccentricity value to test.
-     * @throws ProjectionException if an error occurred in {@link #φ(double)}.
+     * @throws ProjectionException if an error occurred in {@link ConformalProjection#φ(double)}.
      */
     public static void printErrorForExcentricities(final double min, final double max) throws ProjectionException {
         final TableAppender table = new TableAppender(out);
@@ -300,7 +300,7 @@ public final class MercatorMethodCompari
     /**
      * Compares the performance of the 3 methods.
      *
-     * @throws ProjectionException if an error occurred in {@link #φ(double)}.
+     * @throws ProjectionException if an error occurred in {@link ConformalProjection#φ(double)}.
      */
     private void benchmark() throws ProjectionException {
         final Random random = new Random();
@@ -335,7 +335,7 @@ public final class MercatorMethodCompari
      * The result is printed to the standard output stream.
      *
      * @param  args  ignored.
-     * @throws ProjectionException if an error occurred in {@link #φ(double)}.
+     * @throws ProjectionException if an error occurred in {@link ConformalProjection#φ(double)}.
      * @throws InterruptedException if the thread has been interrupted between two benchmarks.
      */
     public static void main(String[] args) throws ProjectionException, InterruptedException {

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/PolarStereographicTest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -48,9 +48,6 @@ import static java.lang.StrictMath.*;
 public final strictfp class PolarStereographicTest extends MapProjectionTestCase {
     /**
      * Creates a new instance of {@link PolarStereographic}.
-     *
-     * @param  ellipse           {@code false} for a sphere, or {@code true} for WGS84 ellipsoid.
-     * @param  latitudeOfOrigin  the latitude of origin, in decimal degrees.
      */
     private void createNormalizedProjection(final MapProjection method) {
         final Parameters parameters = parameters(method, false);

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransformTest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -110,8 +110,8 @@ public final strictfp class Concatenated
 
     /**
      * Tests the concatenation of a 3D affine transform with a pass-through transform.
-     * The {@link ConcatenatedTransform#create(MathTransform, MathTransform)} method
-     * should optimize this case.
+     * The {@link ConcatenatedTransform#create(MathTransform, MathTransform, MathTransformFactory)}
+     * method should optimize this case.
      *
      * @throws FactoryException if an error occurred while creating the math transform to test.
      */

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MathTransformTestCase.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -413,8 +413,6 @@ public abstract strictfp class MathTrans
     /**
      * Prints the current {@linkplain #transform transform} as normal and internal WKT.
      * This method is for debugging purpose only.
-     *
-     * @see #verifyWKT(String)
      */
     @Debug
     protected final void printInternalWKT() {

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/MolodenskyTransformTest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -87,7 +87,7 @@ public final strictfp class MolodenskyTr
     /**
      * Compares the Molodensky (non-abridged) transform with a geocentric translation.
      * Molodensky is an approximation of geocentric translation, so we test here how good this approximation is.
-     * If {@link TestCase#verbose} is {@code true}, then this method will print error statistics.
+     * If {@link TestCase#VERBOSE} is {@code true}, then this method will print error statistics.
      *
      * @throws FactoryException if an error occurred while creating a transform step.
      * @throws TransformException if a transformation failed.
@@ -299,7 +299,7 @@ public final strictfp class MolodenskyTr
      *   <li>(More areas may be added later).</li>
      * </ul>
      *
-     * If {@link TestCase#verbose} is {@code true}, then this method will print error statistics.
+     * If {@link TestCase#VERBOSE} is {@code true}, then this method will print error statistics.
      *
      * @throws FactoryException if an error occurred while creating a transform step.
      * @throws TransformException if a transformation failed.

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/transform/ProjectiveTransformTest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -42,7 +42,7 @@ import org.opengis.test.referencing.Affi
 
 /**
  * Tests the {@link ProjectiveTransform} class by inheriting the tests defined in GeoAPI conformance module.
- * We use the {@link AffineTransform2D} class as a reference, so we need to avoid NaN values.
+ * We use the {@link java.awt.geom.AffineTransform} class as a reference, so we need to avoid NaN values.
  * Note that {@link CopyTransformTest} will use {@code ProjectiveTransform} as a reference,
  * this time with NaN values.
  *

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/report/HTMLGenerator.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -86,7 +86,7 @@ abstract strictfp class HTMLGenerator im
      *
      * @param  filename  the name of the file where to write.
      * @param  title     the document title.
-     * @param  path      path to the CSS file.
+     * @param  css       path to the CSS file.
      * @throws IOException if the file can not be created (e.g. because it already exists).
      */
     HTMLGenerator(final String filename, final String title, final String css) throws IOException {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/ConverterRegistry.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -49,7 +49,7 @@ import org.apache.sis.util.resources.Err
  * from multiple threads.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.3
+ * @version 0.8
  * @since   0.3
  * @module
  */
@@ -473,8 +473,37 @@ public class ConverterRegistry {
                 }
             }
             /*
+             * If the source type is a class (not an interface), verify if a converter has been
+             * explicitely registered for that interface. We do not perform this check if the given
+             * sourceClass is already an interface because this case was handled by previous block.
+             * If we find more than one converter for different interface, select the most specific.
+             */
+            if (!sourceClass.isInterface()) {
+                for (final Class<? super S> source : Classes.getAllInterfaces(sourceClass)) {
+                    final ObjectConverter<? super S, ? extends T> c = get(new ClassPair<>(source, targetClass));
+                    if (c != null) {
+                        if (converter != null) {
+                            final Class<? super S> previous = converter.getSourceClass();
+                            if (source.isAssignableFrom(previous)) {
+                                continue;               // Previous type was more specific – keep it.
+                            } else if (!previous.isAssignableFrom(source)) {
+                                converter = null;
+                                break;                  // No relationship between the two types – abort.
+                            }
+                            // This type is more specific – take it instead than the previous type.
+                        }
+                        converter = c;
+                    }
+                }
+                if (converter != null) {
+                    put(key, converter);
+                    return converter;
+                }
+            }
+            /*
              * No converter found. Gives a chance to subclasses to provide dynamically-generated
-             * converter.
+             * converter. The SystemRegistry subclass provides special cases, including from any
+             * object to String.
              */
             converter = createConverter(sourceClass, targetClass);
             if (converter != null) {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/FallbackConverter.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -89,7 +89,7 @@ final class FallbackConverter<S,T> exten
      * @param  primary      a first converter.
      * @param  fallback     a second converter.
      *
-     * @see #create(ObjectConverter, ObjectConverter)
+     * @see #merge(ObjectConverter, ObjectConverter)
      */
     private FallbackConverter(final Class<S> sourceClass, final Class<T> targetClass,
                               final ObjectConverter<S, ? extends T> primary,

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/PathConverter.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -65,7 +65,7 @@ abstract class PathConverter<S,T> extend
     /**
      * Converts the given path to the target type of this converter.
      * This method verifies that the given path is non-null,
-     * then delegates to {@link #doConvert(S)}.
+     * then delegates to {@link #doConvert(Object)}.
      *
      * @param  source  the path to convert, or {@code null}.
      * @return the converted value, or {@code null} if the given path was null.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/StringConverter.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -84,7 +84,6 @@ abstract class StringConverter<T> extend
      * Creates a new converter for the given target class.
      *
      * @param  targetClass  the {@linkplain #getTargetClass() target class}.
-     * @param  inverse      the inverse converter from the target to the source class.
      */
     @SuppressWarnings("OverridableMethodCallDuringObjectConstruction")
     StringConverter(final Class<T> targetClass) {

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/SystemRegistry.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -126,7 +126,7 @@ public final class SystemRegistry extend
     }
 
     /**
-     * Create dynamically the converters for a few special cases.
+     * Creates dynamically the converters for a few special cases.
      * This method is invoked only the first time that a new pair of source and target classes is
      * requested. Then, the value returned by this method will be cached for future invocations.
      *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/converter/package-info.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -25,8 +25,8 @@
  * <div class="section">Adding system-wide converters</div>
  * Applications can add system-wide custom converters either by explicit calls to the
  * {@code SystemRegistry.INSTANCE.register(ObjectConverter)} method, or by listing the
- * fully qualified classnames of their {@link ObjectConverter} instances in a file having
- * exactly the following name:
+ * fully qualified classnames of their {@link org.apache.sis.util.ObjectConverter} instances
+ * in a file having exactly the following name:
  *
  * {@preformat text
  *     META-INF/services/org.apache.sis.util.ObjectConverter
@@ -42,7 +42,7 @@
  * classpath changes.</p>
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @version 0.7
+ * @version 0.8
  * @since   0.3
  * @module
  */

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapAdapter.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -382,9 +382,9 @@ public class IdentifierMapAdapter extend
     }
 
     /**
-     * The iterator over the (<var>citation</var>, <var>code</var>) entries. This iterator is created by
-     * the {@link IdentifierMapAdapter.Entries} collection. It extends {@link HashMap} as an opportunist
-     * implementation strategy, but users does not need to know this detail.
+     * The iterator over the (<var>citation</var>, <var>code</var>) entries. This iterator is created by the
+     * {@link #entrySet()} collection. It extends {@link HashMap} as an opportunist implementation strategy,
+     * but users do not need to know this detail.
      *
      * <p>This iterator supports the {@link #remove()} operation if the underlying collection supports it.</p>
      *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/IdentifierMapEntry.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -24,11 +24,9 @@ import org.apache.sis.internal.util.Cita
 
 
 /**
- * An entry in the {@link IdentifierMap}. This class implements both the
- * {@link Map.Entry} interface (for inclusion in the set to be returned
- * by {@link IdentifierMapAdapter#entrySet()}) and the {@link Identifier}
- * interface (for inclusion in the {@link IdentifierMapAdapter#identifiers}
- * collection).
+ * An entry in {@link org.apache.sis.xml.IdentifierMap}. This class implements both the {@link AbstractMap.Entry}
+ * interface (for inclusion in the set to be returned by {@link IdentifierMapAdapter#entrySet()}) and the
+ * {@link Identifier} interface (for inclusion in the {@link IdentifierMapAdapter#identifiers} collection).
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.5

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/TypeRegistration.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -170,7 +170,7 @@ public abstract class TypeRegistration {
     }
 
     /**
-     * Returns the shared {@code JAXBContext} for the set of {@link #load()}.
+     * Returns the shared {@code JAXBContext} for the set of classes returned by {@link #load(boolean)}.
      * Note that the {@code JAXBContext} class is thread safe, but the {@code Marshaller},
      * {@code Unmarshaller}, and {@code Validator} classes are not thread safe.
      *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gco/GO_LocalName.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -52,7 +52,7 @@ public final class GO_LocalName extends
     }
 
     /**
-     * Does the link between an {@link AbstractName} and the adapter associated.
+     * Does the link between an {@link org.apache.sis.util.iso.AbstractName} and the adapter associated.
      * JAXB calls automatically this method at marshalling-time.
      *
      * @param  value  the implementing class for this metadata value.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeListUID.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -23,8 +23,7 @@ import org.apache.sis.util.iso.Types;
 
 
 /**
- * JAXB adapter for {@link GMLCodeList}, in order to integrate the value in an element
- * complying with OGC/ISO standard.
+ * An element of the XML documented created for GML {@link CodeList}.
  *
  * @author  Guilhem Legal (Geomatys)
  * @version 0.7

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/Measure.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -37,7 +37,7 @@ import org.apache.sis.measure.Units;
  * A measurement value together with its unit of measure.
  * This is used for marshalling an element defined by ISO-19103.
  *
- * <p>This class duplicates {@link org.apache.sis.measure.Measure}, but we have to do that way
+ * <p>This class duplicates {@code org.apache.sis.measure.Measure}, but we have to do that way
  * because that {@code Measure} extends {@link Number} and we are not allowed to use the
  * {@code @XmlValue} annotation on a class that extends an other class.</p>
  *
@@ -65,7 +65,6 @@ import org.apache.sis.measure.Units;
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.8
  *
- * @see org.apache.sis.measure.Measure
  * @see org.apache.sis.internal.jaxb.gml.MeasureList
  * @see org.apache.sis.internal.jaxb.gco.UnitAdapter
  *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/DelayedExecutor.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -30,7 +30,7 @@ import org.apache.sis.util.logging.Loggi
  *
  * <p>The methods for use in this class are:</p>
  * <ul>
- *   <li>{@link #schedule(Runnable, long)}</li>
+ *   <li>{@link #schedule(DelayedRunnable)}</li>
  * </ul>
  *
  * <div class="section">Comparison with {@code java.util.concurrent}</div>

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Semaphores.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -21,8 +21,8 @@ import org.apache.sis.util.Workaround;
 
 /**
  * Thread-local booleans that need to be shared across different packages. Each thread has its own set of booleans.
- * The {@link #clear(int)} method <strong>must</strong> be invoked after the {@link #queryAndSet(int)} method in a
- * {@code try ... finally} block.
+ * The {@link #clear(byte)} method <strong>must</strong> be invoked after the {@link #queryAndSet(byte)} method in
+ * a {@code try ... finally} block.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @version 0.7
@@ -31,9 +31,8 @@ import org.apache.sis.util.Workaround;
  */
 public final class Semaphores {
     /**
-     * A lock for avoiding never-ending recursivity in the {@code equals} method of
-     * {@link org.apache.sis.referencing.crs.AbstractDerivedCRS} and
-     * {@link org.apache.sis.referencing.operation.AbstractCoordinateOperation}.
+     * A lock for avoiding never-ending recursivity in the {@code equals} method of {@code AbstractDerivedCRS}
+     * and {@link org.apache.sis.referencing.operation.AbstractCoordinateOperation}.
      * It is set to {@code true} when a comparison is in progress. This lock is necessary because
      * {@code AbstractDerivedCRS} objects contain a {@code conversionFromBase} field, which contains a
      * {@code DefaultConversion.targetCRS} field referencing back the {@code AbstractDerivedCRS} object.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -725,7 +725,7 @@ public final class CollectionsExt extend
     /**
      * Returns the elements of the given collection as an array. This method can be used when the {@code valueClass}
      * argument is not known at compile-time. If the {@code valueClass} is known at compile-time, then callers should
-     * use {@link Collection#toArray(T[])} instead.
+     * use {@link Collection#toArray(Object[])} instead.
      *
      * @param  <T>         the compile-time value of {@code valueClass}.
      * @param  collection  the collection from which to get the elements.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DefinitionURI.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -175,8 +175,6 @@ public final class DefinitionURI {
      *
      * <div class="note"><b>Example:</b>
      * In the {@code "urn:ogc:def:crs:EPSG:8.2:4326"} URN, this is {@code "EPSG"}.</div>
-     *
-     * @see org.apache.sis.internal.metadata.NameMeaning#authority(String)
      */
     public String authority;
 

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/DoubleDouble.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -82,7 +82,7 @@ public final class DoubleDouble extends
      * omitted by the compiler from the class files in normal operations.</p>
      *
      * <p>Setting this flag to {@code true} causes some JUnit tests to fail. This is normal. The main
-     * purpose of this flag is to allow {@link org.apache.sis.referencing.operation.matrix.MatrixTestCase}
+     * purpose of this flag is to allow {@code org.apache.sis.referencing.operation.matrix.MatrixTestCase}
      * to perform strict comparisons of matrix operation results with JAMA, which is taken as the reference
      * implementation. Since JAMA uses {@code double} arithmetic, SIS needs to disable {@code double-double}
      * arithmetic if the results are to be compared for strict equality.</p>

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/EmptyQueue.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -42,7 +42,7 @@ final class EmptyQueue<E> extends Abstra
     private static final long serialVersionUID = 2798927118201392605L;
 
     /**
-     * The singleton instance to be returned by {@link Collections#emptyQueue()}.
+     * The singleton instance to be returned by {@link CollectionsExt#emptyQueue()}.
      * This is not parameterized on intend.
      */
     @SuppressWarnings("rawtypes")

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LazySet.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -59,8 +59,6 @@ public class LazySet<E> extends SetOfUnk
     /**
      * The iterator to use for filling this set, or {@code null} if the iteration did not started yet or is finished.
      * Those two cases can be distinguished by looking whether the {@link #cachedElements} array is null or not.
-     *
-     * @see #sourceIterator()
      */
     private Iterator<? extends E> sourceIterator;
 
@@ -130,7 +128,7 @@ public class LazySet<E> extends SetOfUnk
 
     /**
      * Creates the {@link #cachedElements} array. This array will contains the elements
-     * given by {@link #initialContent()} if that method returned a non-null and non-empty array.
+     * given by {@link #initialValues()} if that method returned a non-null and non-empty array.
      *
      * @return {@code true} if {@link #initialValues()} initialized the set with at least one value.
      */

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/MetadataServices.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -42,8 +42,9 @@ public class MetadataServices extends Op
     private static volatile MetadataServices instance;
 
     /**
-     * For subclass only. This constructor registers this instance as a {@link SystemListener}
-     * in order to force a new {@code MetadataServices} lookup if the classpath changes.
+     * For subclass only. This constructor registers this instance as a
+     * {@link org.apache.sis.internal.system.SystemListener} in order to
+     * force a new {@code MetadataServices} lookup if the classpath changes.
      */
     protected MetadataServices() {
         super(Modules.UTILITIES, "sis-metadata");
@@ -129,7 +130,7 @@ public class MetadataServices extends Op
      * @param  locale  language to use if possible.
      * @return the information, or {@code null} if none.
      *
-     * @see org.apache.sis.internal.metadata.ReferencingServices#getInformation(String)
+     * @see org.apache.sis.internal.metadata.ReferencingServices#getInformation(String, Locale)
      */
     public String getInformation(String key, Locale locale) {
         return null;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/StandardDateFormat.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/TemporalUtilities.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/io/AppendableWriter.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/Range.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -63,7 +63,7 @@ import org.apache.sis.util.Numbers;
  *
  * <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>
  *

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/measure/UnitDimension.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/ObjectConverter.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/DerivedSet.java [UTF-8] Tue Apr  4 15:23:12 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.
      */

Copied: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java (from r1790133, sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java?p2=sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java&p1=sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java&r1=1790133&r2=1790135&rev=1790135&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/FrequencySortedSet.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -366,8 +366,11 @@ public class FrequencySortedSet<E> exten
      * The comparator used for sorting map entries.
      * Must be consistent with {@link #compare(Object, Object)} implementation.
      */
-    private static final Comparator<Map.Entry<?,Integer>> COMPARATOR =
-            (Map.Entry<?,Integer> o1, Map.Entry<?,Integer> o2) -> o1.getValue().compareTo(o2.getValue());
+    private static final Comparator<Map.Entry<?,Integer>> COMPARATOR = new Comparator<Map.Entry<?,Integer>>() {
+        @Override public int compare(Map.Entry<?,Integer> o1, Map.Entry<?,Integer> o2) {
+            return o1.getValue().compareTo(o2.getValue());
+        }
+    };
 
     /**
      * Returns the comparator used to order the elements in this set.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/RangeSet.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/NilObjectHandler.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/xml/PooledTemplate.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/converter/ConverterRegistryTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/ModifiableIdentifierMapTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/PropertyTypeTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jaxb/gco/StringAdapterTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetDateTimeTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/jdk8/OffsetTimeTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/AssertTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/test/TestUtilitiesTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DefinitionURITest.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -16,7 +16,6 @@
  */
 package org.apache.sis.internal.util;
 
-import org.opengis.metadata.Identifier;
 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, Identifier)}.
+     * Tests {@link DefinitionURI#format(String, String, String, String)}.
      */
     @Test
     public void testToURN() {

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/X364Test.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/PlaneTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/math/VectorTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] Tue Apr  4 15:23:12 2017
@@ -51,8 +51,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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java [UTF-8] Tue Apr  4 15:23:12 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/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java?rev=1790135&r1=1790134&r2=1790135&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/CharactersTest.java [UTF-8] Tue Apr  4 15:23:12 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
      */



Mime
View raw message