From commits-return-8757-apmail-sis-commits-archive=sis.apache.org@sis.apache.org Sat Jan 21 09:15:07 2017 Return-Path: X-Original-To: apmail-sis-commits-archive@www.apache.org Delivered-To: apmail-sis-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 74E53193A2 for ; Sat, 21 Jan 2017 09:15:06 +0000 (UTC) Received: (qmail 5284 invoked by uid 500); 21 Jan 2017 09:15:06 -0000 Delivered-To: apmail-sis-commits-archive@sis.apache.org Received: (qmail 5248 invoked by uid 500); 21 Jan 2017 09:15:06 -0000 Mailing-List: contact commits-help@sis.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sis-dev@sis.apache.org Delivered-To: mailing list commits@sis.apache.org Received: (qmail 5163 invoked by uid 99); 21 Jan 2017 09:15:06 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 21 Jan 2017 09:15:06 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id D31163A47B8 for ; Sat, 21 Jan 2017 09:15:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1779709 [13/15] - in /sis/trunk: ./ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/ core/sis-referencing/src/main/java/org/apache/sis/geometry/ core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/refere... Date: Sat, 21 Jan 2017 09:15:01 -0000 To: commits@sis.apache.org From: desruisseaux@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170121091504.D31163A47B8@svn01-us-west.apache.org> Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ProjectiveTransform.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -68,7 +68,7 @@ class ProjectiveTransform extends Abstra * Constructs a transform from the specified matrix. * The matrix is usually square and affine, but this is not enforced. * - * @param matrix The matrix. + * @param matrix the matrix. */ protected ProjectiveTransform(final Matrix matrix) { numRow = matrix.getNumRow(); @@ -98,7 +98,7 @@ class ProjectiveTransform extends Abstra final int n = (numRow - 1) * numCol; for (int i = 0; i != numCol;) { if (elt[n + i] != (++i == numCol ? 1 : 0)) { - return this; // Transform is not affine (ignoring if square or not). + return this; // Transform is not affine (ignoring if square or not). } } /* @@ -212,12 +212,12 @@ class ProjectiveTransform extends Abstra * x₁, y₁, z₁..., * xn, yn, zn]. * - * @param srcPts The array containing the source point coordinates. - * @param srcOff The offset to the first point to be transformed in the source array. - * @param dstPts The array into which the transformed point coordinates are returned. - * @param dstOff The offset to the location of the first transformed point that is stored in the - * destination array. The source and destination array sections can overlap. - * @param numPts The number of points to be transformed. + * @param srcPts the array containing the source point coordinates. + * @param srcOff the offset to the first point to be transformed in the source array. + * @param dstPts the array into which the transformed point coordinates are returned. + * @param dstOff the offset to the location of the first transformed point that is stored in the + * destination array. The source and destination array sections can overlap. + * @param numPts the number of points to be transformed. */ @Override public final void transform(double[] srcPts, int srcOff, final double[] dstPts, int dstOff, int numPts) { @@ -283,12 +283,12 @@ class ProjectiveTransform extends Abstra * x₁, y₁, z₁..., * xn, yn, zn]. * - * @param srcPts The array containing the source point coordinates. - * @param srcOff The offset to the first point to be transformed in the source array. - * @param dstPts The array into which the transformed point coordinates are returned. - * @param dstOff The offset to the location of the first transformed point that is stored in the - * destination array. The source and destination array sections can overlap. - * @param numPts The number of points to be transformed. + * @param srcPts the array containing the source point coordinates. + * @param srcOff the offset to the first point to be transformed in the source array. + * @param dstPts the array into which the transformed point coordinates are returned. + * @param dstOff the offset to the location of the first transformed point that is stored in the + * destination array. The source and destination array sections can overlap. + * @param numPts the number of points to be transformed. */ @Override public final void transform(float[] srcPts, int srcOff, final float[] dstPts, int dstOff, int numPts) { @@ -340,11 +340,11 @@ class ProjectiveTransform extends Abstra /** * Transforms an array of floating point coordinates by this matrix. * - * @param srcPts The array containing the source point coordinates. - * @param srcOff The offset to the first point to be transformed in the source array. - * @param dstPts The array into which the transformed point coordinates are returned. - * @param dstOff The offset to the location of the first transformed point that is stored in the destination array. - * @param numPts The number of points to be transformed. + * @param srcPts the array containing the source point coordinates. + * @param srcOff the offset to the first point to be transformed in the source array. + * @param dstPts the array into which the transformed point coordinates are returned. + * @param dstOff the offset to the location of the first transformed point that is stored in the destination array. + * @param numPts the number of points to be transformed. */ @Override public final void transform(final double[] srcPts, int srcOff, final float[] dstPts, int dstOff, int numPts) { @@ -357,7 +357,7 @@ class ProjectiveTransform extends Abstra double sum = elt[mix + srcDim]; for (int i=0; in, yn, zn]. * - * @param srcPts The array containing the source point coordinates. - * @param srcOff The offset to the first point to be transformed in the source array. - * @param dstPts The array into which the transformed point coordinates are returned. - * @param dstOff The offset to the location of the first transformed point that is stored in the - * destination array. The source and destination array sections can overlap. - * @param numPts The number of points to be transformed. + * @param srcPts the array containing the source point coordinates. + * @param srcOff the offset to the first point to be transformed in the source array. + * @param dstPts the array into which the transformed point coordinates are returned. + * @param dstOff the offset to the location of the first transformed point that is stored in the + * destination array. The source and destination array sections can overlap. + * @param numPts the number of points to be transformed. */ @Override public void transform(double[] srcPts, int srcOff, final double[] dstPts, int dstOff, int numPts) { @@ -222,12 +222,12 @@ final class ScaleTransform extends Abstr * x₁, y₁, z₁..., * xn, yn, zn]. * - * @param srcPts The array containing the source point coordinates. - * @param srcOff The offset to the first point to be transformed in the source array. - * @param dstPts The array into which the transformed point coordinates are returned. - * @param dstOff The offset to the location of the first transformed point that is stored in the - * destination array. The source and destination array sections can overlap. - * @param numPts The number of points to be transformed. + * @param srcPts the array containing the source point coordinates. + * @param srcOff the offset to the first point to be transformed in the source array. + * @param dstPts the array into which the transformed point coordinates are returned. + * @param dstOff the offset to the location of the first transformed point that is stored in the + * destination array. The source and destination array sections can overlap. + * @param numPts the number of points to be transformed. */ @Override public void transform(float[] srcPts, int srcOff, final float[] dstPts, int dstOff, int numPts) { @@ -250,11 +250,11 @@ final class ScaleTransform extends Abstr /** * Transforms an array of floating point coordinates by this matrix. * - * @param srcPts The array containing the source point coordinates. - * @param srcOff The offset to the first point to be transformed in the source array. - * @param dstPts The array into which the transformed point coordinates are returned. - * @param dstOff The offset to the location of the first transformed point that is stored in the destination array. - * @param numPts The number of points to be transformed. + * @param srcPts the array containing the source point coordinates. + * @param srcOff the offset to the first point to be transformed in the source array. + * @param dstPts the array into which the transformed point coordinates are returned. + * @param dstOff the offset to the location of the first transformed point that is stored in the destination array. + * @param numPts the number of points to be transformed. */ @Override public void transform(final double[] srcPts, int srcOff, final float[] dstPts, int dstOff, int numPts) { @@ -269,11 +269,11 @@ final class ScaleTransform extends Abstr /** * Transforms an array of floating point coordinates by this matrix. * - * @param srcPts The array containing the source point coordinates. - * @param srcOff The offset to the first point to be transformed in the source array. - * @param dstPts The array into which the transformed point coordinates are returned. - * @param dstOff The offset to the location of the first transformed point that is stored in the destination array. - * @param numPts The number of points to be transformed. + * @param srcPts the array containing the source point coordinates. + * @param srcOff the offset to the first point to be transformed in the source array. + * @param dstPts the array into which the transformed point coordinates are returned. + * @param dstOff the offset to the location of the first transformed point that is stored in the destination array. + * @param numPts the number of points to be transformed. */ @Override public void transform(final float[] srcPts, int srcOff, final double[] dstPts, int dstOff, int numPts) { @@ -289,7 +289,7 @@ final class ScaleTransform extends Abstr * Gets the derivative of this transform at a point. * For a matrix transform, the derivative is the same everywhere. * - * @param point Ignored (can be {@code null}). + * @param point ignored (can be {@code null}). */ @Override public Matrix derivative(final DirectPosition point) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransferFunction.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransferFunction.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransferFunction.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransferFunction.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -56,7 +56,7 @@ import org.apache.sis.util.Debug; * * @author Martin Desruisseaux (Geomatys) * @since 0.5 - * @version 0.5 + * @version 0.8 * @module */ public class TransferFunction implements Cloneable, Serializable { @@ -106,7 +106,7 @@ public class TransferFunction implements /** * Returns the transfer function type (linear, logarithmic or exponential). * - * @return The transfer function type. + * @return the transfer function type. */ public TransferFunctionType getType() { return type; @@ -116,7 +116,7 @@ public class TransferFunction implements * Sets the transfer function type. * The default value is {@link TransferFunctionType#LINEAR}. * - * @param type The transfer function type. + * @param type the transfer function type. */ public void setType(final TransferFunctionType type) { ArgumentChecks.ensureNonNull("type", type); @@ -129,7 +129,7 @@ public class TransferFunction implements * This value is always 1 for {@link TransferFunctionType#LINEAR}, * and usually (but not necessarily) 10 for the logarithmic and exponential types. * - * @return The logarithmic or exponent base. + * @return the logarithmic or exponent base. */ public double getBase() { return TransferFunctionType.LINEAR.equals(type) ? 1 : base; @@ -140,7 +140,7 @@ public class TransferFunction implements * This value is ignored for {@link TransferFunctionType#LINEAR}. * For other supported types, the default value is 10. * - * @param base The new logarithm or exponent base. + * @param base the new logarithm or exponent base. */ public void setBase(final double base) { ArgumentChecks.ensureStrictlyPositive("base", base); @@ -151,7 +151,7 @@ public class TransferFunction implements /** * Returns the scale factor of the transfer function. * - * @return The scale factor. + * @return the scale factor. */ public double getScale() { return scale; @@ -161,7 +161,7 @@ public class TransferFunction implements * Sets the scale factor of the transfer function. * The default value is 1. * - * @param scale The new scale factor. + * @param scale the new scale factor. */ public void setScale(final double scale) { this.scale = scale; @@ -171,7 +171,7 @@ public class TransferFunction implements /** * Returns the offset of the transfer function. * - * @return The offset. + * @return the offset. */ public double getOffset() { return offset; @@ -181,7 +181,7 @@ public class TransferFunction implements * Sets the offset of the transfer function. * The default value is 0. * - * @param offset The new offset. + * @param offset the new offset. */ public void setOffset(final double offset) { this.offset = offset; @@ -192,7 +192,7 @@ public class TransferFunction implements * Returns the transform from sample values to geophysics values, as specified by the * current properties of this {@code TransferFunction}. * - * @return The transform from sample to geophysics values. + * @return the transform from sample to geophysics values. */ public MathTransform1D getTransform() { if (transform == null) { @@ -200,7 +200,7 @@ public class TransferFunction implements transform = LinearTransform1D.create(scale, offset); } else if (TransferFunctionType.EXPONENTIAL.equals(type)) { transform = ExponentialTransform1D.create(base, scale); - if (offset != 0) { // Rarely occurs in practice. + if (offset != 0) { // Rarely occurs in practice. transform = MathTransforms.concatenate(transform, LinearTransform1D.create(0, offset)); } } else if (TransferFunctionType.LOGARITHMIC.equals(type)) { @@ -228,7 +228,7 @@ public class TransferFunction implements * This method infers the {@linkplain #getBase() base}, {@linkplain #getScale() scale} and * {@linkplain #getOffset() offset} values from the given transform. * - * @param function The transform to set. + * @param function the transform to set. * @throws IllegalArgumentException if this method does not recognize the given transform. */ public void setTransform(final MathTransform1D function) throws IllegalArgumentException { @@ -277,7 +277,7 @@ public class TransferFunction implements /** * Sets the {@link #scale} and {@link #offset} terms from the given function. * - * @param function The transform to set. + * @param function the transform to set. * @throws IllegalArgumentException if this method does not recognize the given transform. */ private void setLinearTerms(final LinearTransform function) throws IllegalArgumentException { @@ -293,10 +293,26 @@ public class TransferFunction implements } /** + * Returns a clone of this transfer function. + * + * @return a clone of this transfer function. + * + * @since 0.8 + */ + @Override + public TransferFunction clone() { + try { + return (TransferFunction) super.clone(); + } catch (CloneNotSupportedException e) { + throw new AssertionError(e); // Should never happen since we are cloneable. + } + } + + /** * Returns a string representation of this transfer function for debugging purpose. * The string returned by this method may change in any future SIS version. * - * @return A string representation of this transfer function. + * @return a string representation of this transfer function. */ @Debug @Override Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -147,7 +147,7 @@ public class TransformSeparator { assert ArraysExt.isSorted(sequence, true); int i = Arrays.binarySearch(sequence, dimension); if (i < 0) { - i = ~i; // Tild, not the minus sign. + i = ~i; // Tild, not the minus sign. sequence = ArraysExt.insert(sequence, i, 1); sequence[i] = dimension; } @@ -457,7 +457,7 @@ public class TransformSeparator { * {@code step.getTargetDimensions()} exclusive. * * - * @param step the transform for which to retain only a subset of the source dimensions. + * @param step the transform for which to retain only a subset of the source dimensions. * @param dimensions indices of the source dimensions of {@code step} to retain. * @return a transform expecting only the given source dimensions. * @throws FactoryException if the given transform is not separable. @@ -508,8 +508,10 @@ public class TransformSeparator { } dim += numNewDim; } - // Dimension n belong to heading or trailing dimensions. - // Passthrough, after adjustment for trailing dimensions. + /* + * Dimension n belong to heading or trailing dimensions. + * Passthrough, after adjustment for trailing dimensions. + */ targetDimensions = insert(targetDimensions, dim); } subDimensions = ArraysExt.resize(subDimensions, n); @@ -566,8 +568,10 @@ reduce: for (int j=0; j <= numTgt; j if (filteredColumn < dimensions.length && dimensions[filteredColumn] == i) { elements[startOfRow + filteredColumn++] = element; } else if (element != 0) { - // Output dimension 'j' depends on one of discarded input dimension 'i'. - // The whole row will be discarded. + /* + * Output dimension 'j' depends on one of discarded input dimension 'i'. + * The whole row will be discarded. + */ continue reduce; } } @@ -575,8 +579,10 @@ reduce: for (int j=0; j <= numTgt; j assert filteredColumn == numFilteredColumns : filteredColumn; // We should have used all values in the 'dimensions' array. startOfRow += numFilteredColumns; if (j == numTgt) { - // In an affine transform, the last row is usually [0 0 0 … 1]. - // This is not a real dimension, but nevertheless mandatory. + /* + * In an affine transform, the last row is usually [0 0 0 … 1]. + * This is not a real dimension, but nevertheless mandatory. + */ isLastRowAccepted = true; } else { targetDimensions = insert(targetDimensions, j); @@ -614,7 +620,7 @@ reduce: for (int j=0; j <= numTgt; j * transform may keep only the (longitude, latitude) part for the same inputs. * In most cases, the filtered transform is non-invertible since it loose informations. * - * @param step the transform for which to retain only a subset of the target dimensions. + * @param step the transform for which to retain only a subset of the target dimensions. * @param dimensions indices of the target dimensions of {@code step} to retain. * @return a transform producing only the given target dimensions. * @throws FactoryException if the given transform is not separable. @@ -707,7 +713,7 @@ reduce: for (int j=0; j <= numTgt; j if (index >= 0) { return true; } - index = ~index; // Tild, not minus sign. + index = ~index; // Tild, not minus sign. return (index < sequence.length) && (sequence[index] < upper); } return false; Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/AbstractEnvelopeTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -83,7 +83,7 @@ public final strictfp class AbstractEnve GeneralEnvelope ge = new GeneralEnvelope(5); ge.setRange(1, xmin, xmax); ge.setRange(2, ymin, ymax); - ge.setRange(0, 2, 3); // Following values will be verified in verifyInvariants(…) + ge.setRange(0, 2, 3); // Following values will be verified in verifyInvariants(…) ge.setRange(3, 4, 6); ge.setRange(4, 8, 9); ge = ge.subEnvelope(1, 3); @@ -205,7 +205,7 @@ public final strictfp class AbstractEnve assertEquals(label, -4, upper .getOrdinate(0), STRICT); assertEquals(label, +180, envelope.getMaximum (0), STRICT); assertEquals(label, -176, envelope.getMedian (0), STRICT); - assertEquals(label, 344, envelope.getSpan (0), STRICT); // 360° - testSimpleEnvelope() + assertEquals(label, 344, envelope.getSpan (0), STRICT); // 360° - testSimpleEnvelope() switch (type) { default: { final AbstractEnvelope ext = (AbstractEnvelope) envelope; @@ -266,8 +266,8 @@ public final strictfp class AbstractEnve assertEquals(label, -180, envelope.getMinimum (0), STRICT); assertEquals(label, -364, upper .getOrdinate(0), STRICT); assertEquals(label, +180, envelope.getMaximum (0), STRICT); - assertEquals(label, 4, envelope.getMedian (0), STRICT); // Note the alternance with the previous test methods. - assertEquals(label, NaN, envelope.getSpan (0), STRICT); // testCrossingAntiMeridian() + 360°. + assertEquals(label, 4, envelope.getMedian (0), STRICT); // Note the alternance with the previous test methods. + assertEquals(label, NaN, envelope.getSpan (0), STRICT); // testCrossingAntiMeridian() + 360°. if (envelope instanceof AbstractEnvelope) { final AbstractEnvelope ext = (AbstractEnvelope) envelope; assertTrue (label, ext.contains (inside)); @@ -321,8 +321,8 @@ public final strictfp class AbstractEnve assertEquals(label, -180, envelope.getMinimum (0), STRICT); assertEquals(label, -364, upper .getOrdinate(0), STRICT); assertEquals(label, +180, envelope.getMaximum (0), STRICT); - assertEquals(label, -176, envelope.getMedian (0), STRICT); // Note the alternance with the previous test methods. - assertEquals(label, NaN, envelope.getSpan (0), STRICT); // testCrossingAntiMeridianTwice() + 360°. + assertEquals(label, -176, envelope.getMedian (0), STRICT); // Note the alternance with the previous test methods. + assertEquals(label, NaN, envelope.getSpan (0), STRICT); // testCrossingAntiMeridianTwice() + 360°. switch (type) { default: { final AbstractEnvelope ext = (AbstractEnvelope) envelope; Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/EnvelopesTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -102,7 +102,7 @@ public final strictfp class EnvelopesTes * Tests {@link Envelopes#fromWKT(CharSequence)}. This test is provided as a matter of principle, * but the real test is done by {@link GeneralEnvelopeTest#testWktParsing()}. * - * @throws FactoryException Should never happen. + * @throws FactoryException if an error occurred during WKT parsing. */ @Test public void testFromWKT() throws FactoryException { Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralDirectPositionTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -75,6 +75,7 @@ public final strictfp class GeneralDirec * with invalid input strings. */ @Test + @SuppressWarnings("ResultOfObjectAllocationIgnored") public void testWktParsingFailures() { try { new GeneralDirectPosition("POINT(6 10 2"); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/GeneralEnvelopeTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -87,11 +87,11 @@ public strictfp class GeneralEnvelopeTes * *

This method assumes that only the x axis may be a wraparound axis.

* - * @param test The actual envelope to verify. - * @param xLower The expected first x ordinate value. May be greater than {@code xUpper}. - * @param xUpper The expected last x ordinate value. May be less than {@code xLower}. - * @param ymin The expected minimal y ordinate value. Must be less than {@code ymax}. - * @param ymax The expected maximal y ordinate value. Must be greater than {@code ymax}. + * @param test the actual envelope to verify. + * @param xLower the expected first x ordinate value. May be greater than {@code xUpper}. + * @param xUpper the expected last x ordinate value. May be less than {@code xLower}. + * @param ymin the expected minimal y ordinate value. Must be less than {@code ymax}. + * @param ymax the expected maximal y ordinate value. Must be greater than {@code ymax}. */ private static void assertEnvelopeEquals(final Envelope test, final double xLower, final double ymin, final double xUpper, final double ymax) @@ -131,7 +131,7 @@ public strictfp class GeneralEnvelopeTes private static void assertIntersectEquals(final GeneralEnvelope e1, final GeneralEnvelope e2, final double xmin, final double ymin, final double xmax, final double ymax) { - final boolean isEmpty = !(((xmax - xmin) * (ymax - ymin)) != 0); // Use ! for catching NaN. + final boolean isEmpty = !(((xmax - xmin) * (ymax - ymin)) != 0); // Use ! for catching NaN. final Envelope2D r1 = new Envelope2D(e1); final Envelope2D r2 = new Envelope2D(e2); final Envelope2D ri = r1.createIntersection(r2); @@ -350,25 +350,25 @@ public strictfp class GeneralEnvelopeTes */ @Test public void testAddPoint() { - final double ymin=-20, ymax=30; // Will not change anymore + final double ymin=-20, ymax=30; // Will not change anymore final GeneralEnvelope e = create(20, ymin, 80, ymax); final DirectPosition2D p = new DirectPosition2D(40, 15); assertAddEquals(e, p, 20, ymin, 80, ymax); - p.x = 100; // Add on the right side. + p.x = 100; // Add on the right side. assertAddEquals(e, p, 20, ymin, 100, ymax); - p.x = -10; // Add on the left side. + p.x = -10; // Add on the left side. assertAddEquals(e, p, -10, ymin, 80, ymax); e.setRange(0, 80, 20); - p.x = 100; // No change expected. + p.x = 100; // No change expected. assertAddEquals(e, p, 80, ymin, 20, ymax); - p.x = 70; // Add on the right side. + p.x = 70; // Add on the right side. assertAddEquals(e, p, 70, ymin, 20, ymax); - p.x = 30; // Add on the left side. + p.x = 30; // Add on the left side. assertAddEquals(e, p, 80, ymin, 30, ymax); verifyInvariants(e); @@ -405,7 +405,7 @@ public strictfp class GeneralEnvelopeTes */ @Test public void testNormalizeWorld() { - GeneralEnvelope e = create(-195, -90, +170, +90); // -195° is equivalent to 165° + GeneralEnvelope e = create(-195, -90, +170, +90); // -195° is equivalent to 165° assertTrue(e.normalize()); assertEnvelopeEquals(e, -180, -90, +180, +90); verifyInvariants(e); @@ -558,6 +558,7 @@ public strictfp class GeneralEnvelopeTes */ @Test @DependsOnMethod("testToString") + @SuppressWarnings("ResultOfObjectAllocationIgnored") public void testWktParsing() { GeneralEnvelope envelope = new GeneralEnvelope("BOX(-180 -90,180 90)"); assertEquals(2, envelope.getDimension()); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/geometry/TransformTestCase.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -44,7 +44,7 @@ import static org.apache.sis.test.Refere * This base class allows us to perform the same tests on both kind of objects. * All tests performed by this class are two-dimensional. * - * @param the type of geometric objects, either {@link GeneralEnvelope} or {@link java.awt.geom.Rectangle2D}. + * @param the type of geometric objects, either {@link GeneralEnvelope} or {@link java.awt.geom.Rectangle2D}. * * @author Martin Desruisseaux (IRD, Geomatys) * @since 0.8 Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_GeneralOperationParameterTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -103,11 +103,11 @@ public final strictfp class CC_GeneralOp * Creates a parameter descriptor from the given properties. * All properties except {@code defaultValue} can be part of GML documents. * - * @param name The parameter descriptor name. - * @param remarks The remarks, or {@code null} if none. + * @param name the parameter descriptor name. + * @param remarks the remarks, or {@code null} if none. * @param mandatory {@code true} for a mandatory parameter, or {@code false} for an optional one. - * @param defaultValue The default value, or {@code null} if none. - * @return The parameter descriptor. + * @param defaultValue the default value, or {@code null} if none. + * @return the parameter descriptor. */ private static DefaultParameterDescriptor create(final String name, final String remarks, final boolean mandatory, final Integer defaultValue) Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroupTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -190,8 +190,8 @@ public final strictfp class CC_Operation /** * Verifies the properties of an operation method parameter. * - * @param expected A parameter descriptor containing the expected properties (except remarks). - * @param actual The parameter descriptor to verify. + * @param expected a parameter descriptor containing the expected properties (except remarks). + * @param actual the parameter descriptor to verify. */ public static void verifyMethodParameter(final ParameterDescriptor expected, final ParameterDescriptor actual) @@ -207,9 +207,9 @@ public final strictfp class CC_Operation /** * Same verification than {@link #verifyMethodParameter(ParameterDescriptor, ParameterDescriptor)}, but stricter. * - * @param expected A parameter descriptor containing the expected properties (except remarks). - * @param remarks The expected remarks, or {@code null} for fetching this information from {@code expected}. - * @param actual The parameter descriptor to verify. + * @param expected a parameter descriptor containing the expected properties (except remarks). + * @param remarks the expected remarks, or {@code null} for fetching this information from {@code expected}. + * @param actual the parameter descriptor to verify. */ private static void verifyMethodParameter(final ParameterDescriptor expected, final String remarks, final ParameterDescriptor actual) Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ReferencingUtilitiesTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -58,9 +58,9 @@ public final strictfp class ReferencingU /** * Asserts that normalization of the given CRS produces {@link HardCodedCRS#WGS84} (ignoring metadata). * - * @param message The message to show in case of failure. - * @param createExpected {@code true} if we expect normalization to create a new CRS object. - * @param crs The CRS for which to test normalization. + * @param message the message to show in case of failure. + * @param createExpected {@code true} if we expect normalization to create a new CRS object. + * @param crs the CRS for which to test normalization. */ private static void assertNormalizedEqualsWGS84(final String message, final boolean createExpected, final CoordinateReferenceSystem crs) Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/ServicesForMetadataTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -68,9 +68,9 @@ public final strictfp class ServicesForM final GeneralEnvelope envelope = new GeneralEnvelope(crs); switch (crs.getCoordinateSystem().getDimension()) { default: throw new AssertionError(); - case 4: envelope.setRange(3, 51000, 52000); // Fall through - case 3: envelope.setRange(2, -10, 70); // Fall through - case 2: envelope.setRange(1, -20, 30); // Fall through + case 4: envelope.setRange(3, 51000, 52000); // Fall through + case 3: envelope.setRange(2, -10, 70); // Fall through + case 2: envelope.setRange(1, -20, 30); // Fall through case 1: envelope.setRange(0, -40, 60); case 0: break; } Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/j2d/ShapeUtilitiesViewer.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -194,7 +194,7 @@ final strictfp class ShapeUtilitiesViewe /** * Paints the visual test. * - * @param graphics Where to paint the test. + * @param graphics where to paint the test. */ @Override protected void paintComponent(final Graphics graphics) { @@ -229,7 +229,7 @@ final strictfp class ShapeUtilitiesViewe /** * Shows the viewer. * - * @param args Ignored. + * @param args ignored. */ public static void main(final String[] args) { final ShapeUtilitiesViewer viewer = new ShapeUtilitiesViewer(); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolationTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -20,6 +20,8 @@ import java.net.URL; import java.net.URISyntaxException; import java.io.BufferedReader; import java.io.IOException; +import java.nio.file.Paths; +import java.nio.file.Path; import javax.measure.quantity.Angle; import javax.measure.quantity.Length; import org.opengis.geometry.Envelope; @@ -33,8 +35,6 @@ import org.junit.Test; import static org.opengis.test.Assert.*; // Branch-dependent imports -import java.nio.file.Paths; -import java.nio.file.Path; import org.apache.sis.internal.jdk8.JDK8; @@ -66,8 +66,8 @@ public final strictfp class FranceGeocen * version 1.0, April 1997 in http://www.ign.fr * * - * @param step The step as a value from 1 to 3 inclusive. - * @return The sample point at the given step. + * @param step the step as a value from 1 to 3 inclusive. + * @return the sample point at the given step. */ public static double[] samplePoint(final int step) { switch (step) { @@ -131,7 +131,7 @@ public final strictfp class FranceGeocen *

This method is part of a chain. * The next method is {@link #testGridAsShorts(DatumShiftGridFile)}.

* - * @return The loaded grid with values as {@code float}. + * @return the loaded grid with values as {@code float}. * @throws URISyntaxException if the URL to the test file can not be converted to a path. * @throws IOException if an error occurred while loading the grid. * @throws FactoryException if an error occurred while computing the grid. @@ -162,8 +162,8 @@ public final strictfp class FranceGeocen *

This method is part of a chain. * The previous method is {@link #testGridAsFloats()}.

* - * @param grid The grid created by {@link #testGridAsFloats()}. - * @return The given grid, but compressed as {@code short} values. + * @param grid the grid created by {@link #testGridAsFloats()}. + * @return the given grid, but compressed as {@code short} values. * @throws TransformException if an error occurred while computing the envelope. */ @TestStep Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/GeocentricTranslationTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -80,8 +80,8 @@ public final strictfp class GeocentricTr * Step 4: Target point in ED50: 53°48'36.565"N, 02'07"51.477"E, 28.02 metres. * * - * @param step The step as a value from 1 to 5 inclusive. - * @return The sample point at the given step. + * @param step the step as a value from 1 to 5 inclusive. + * @return the sample point at the given step. */ public static double[] samplePoint(final int step) { switch (step) { @@ -117,8 +117,8 @@ public final strictfp class GeocentricTr /** * Returns the sample point precision for the given step. * - * @param step The step as a value from 1 to 4 inclusive. - * @return The sample point precision for the given step. + * @param step the step as a value from 1 to 4 inclusive. + * @return the sample point precision for the given step. */ public static double precision(final int step) { switch (step) { @@ -134,7 +134,7 @@ public final strictfp class GeocentricTr /** * Creates a transformation for the given method. * - * @param method The method to test. + * @param method the method to test. */ private void create(final GeocentricAffine method) throws FactoryException { final ParameterValueGroup values = method.getParameters().createValue(); @@ -151,13 +151,13 @@ public final strictfp class GeocentricTr * steps are created without the use of any {@link ParameterValueGroup}. This way to create the * datum shift is provided for better separation of aspects being tested. * - * @param factory The factory to use for creating the transforms. - * @param source The source ellipsoid. - * @param target The target ellipsoid. - * @param tX Geocentric translation on the X axis. - * @param tY Geocentric translation on the Y axis. - * @param tZ Geocentric translation on the Z axis. - * @return Transform performing the datum shift. + * @param factory the factory to use for creating the transforms. + * @param source the source ellipsoid. + * @param target the target ellipsoid. + * @param tX geocentric translation on the X axis. + * @param tY geocentric translation on the Y axis. + * @param tZ geocentric translation on the Z axis. + * @return transform performing the datum shift. * @throws FactoryException if an error occurred while creating the transform. * @throws NoninvertibleTransformException if an error occurred while creating the transform. * @@ -184,8 +184,8 @@ public final strictfp class GeocentricTr * Creates a "Geographic 2D to 3D → Geocentric → Affine → Geographic → Geographic 3D to 2D" chain * using EPSG or OGC standard operation methods and parameters. This is used for integration tests. * - * @param factory The math transform factory to use for creating and concatenating the transform. - * @return The chain of transforms. + * @param factory the math transform factory to use for creating and concatenating the transform. + * @return the chain of transforms. * @throws FactoryException if an error occurred while creating a transform. */ public static MathTransform createDatumShiftForGeographic2D(final MathTransformFactory factory) throws FactoryException { @@ -222,8 +222,8 @@ public final strictfp class GeocentricTr /** * Tests transformation of the sample point from WGS84 to ED50. * - * @param sourceStep The {@link #samplePoint(int)} to use as the source coordinate. - * @param targetStep The {@link #samplePoint(int)} expected as a result of the transformation. + * @param sourceStep the {@link #samplePoint(int)} to use as the source coordinate. + * @param targetStep the {@link #samplePoint(int)} expected as a result of the transformation. */ private void datumShift(final int sourceStep, final int targetStep) throws TransformException { tolerance = precision(targetStep); @@ -242,7 +242,7 @@ public final strictfp class GeocentricTr public void testGeocentricDomain() throws FactoryException, TransformException { create(new GeocentricTranslation()); assertTrue(transform instanceof LinearTransform); - derivativeDeltas = new double[] {100, 100, 100}; // In metres + derivativeDeltas = new double[] {100, 100, 100}; // In metres datumShift(2, 3); } @@ -274,7 +274,7 @@ public final strictfp class GeocentricTr @Test @DependsOnMethod("testGeographicDomain") public void testRandomPoints() throws FactoryException, TransformException { - testGeographicDomain(); // For creating the transform. + testGeographicDomain(); // For creating the transform. tolerance = Formulas.LINEAR_TOLERANCE; // toleranceModifier = ToleranceModifier.GEOGRAPHIC; verifyInDomain(CoordinateDomain.GEOGRAPHIC, 831342815); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2DTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -72,10 +72,10 @@ public final strictfp class Geographic3D * Creates a "Geographic 2D to 3D → Geocentric → Affine → Geographic → Geographic 3D to 2D" chain. * This method is used for integration tests. * - * @param factory The math transform factory to use for creating and concatenating the transform. - * @param affine The math transform for the operation in geocentric Cartesian domain. - * @param pv The parameters for the operation in geographic coordinates. - * @return The chain of transforms. + * @param factory the math transform factory to use for creating and concatenating the transform. + * @param affine the math transform for the operation in geocentric Cartesian domain. + * @param pv the parameters for the operation in geographic coordinates. + * @return the chain of transforms. * @throws FactoryException if an error occurred while creating a transform. * * @see GeocentricTranslationTest#createDatumShiftForGeographic2D(MathTransformFactory) Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NADCONTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -21,6 +21,8 @@ import java.io.BufferedWriter; import java.io.IOException; import java.net.URL; import java.net.URISyntaxException; +import java.nio.file.Path; +import java.nio.file.Paths; import javax.measure.quantity.Angle; import org.opengis.geometry.Envelope; import org.opengis.util.FactoryException; @@ -35,8 +37,6 @@ import org.junit.Test; import static org.apache.sis.test.Assert.*; // Branch-dependent imports -import java.nio.file.Path; -import java.nio.file.Paths; import org.apache.sis.internal.jdk8.JDK8; @@ -61,7 +61,7 @@ public final strictfp class NADCONTest e * NADCON tools on NOAA website.

* * @param step The step as a value from 1 to 3 inclusive. - * @return The sample point at the given step. + * @return the sample point at the given step. */ public static double[] samplePoint(final int step) { switch (step) { @@ -119,8 +119,8 @@ public final strictfp class NADCONTest e * not redistribute the datum shift grid files. But developers can invoke this method explicitely if they can * provide a path to those files. * - * @param latitudeShifts Path to the official {@code "conus.las"} file. - * @param longitudeShifts Path to the official {@code "conus.los"} file. + * @param latitudeShifts path to the official {@code "conus.las"} file. + * @param longitudeShifts path to the official {@code "conus.los"} file. * @throws IOException if an error occurred while loading the grid. * @throws FactoryException if an error occurred while computing the grid. * @throws TransformException if an error occurred while computing the envelope or testing the point. @@ -134,10 +134,10 @@ public final strictfp class NADCONTest e /** * Implementation of {@link #testLoader()} and {@link #testNADCON(Path)}. * - * @param xmin Westmost longitude. - * @param xmax Eastmost longitude. - * @param ymin Southmost latitude. - * @param ymax Northmost latitude. + * @param xmin westmost longitude. + * @param xmax eastmost longitude. + * @param ymin southmost latitude. + * @param ymax northmost latitude. */ private static void testNADCON(final Path latitudeShifts, final Path longitudeShifts, final double xmin, final double xmax, final double ymin, final double ymax) @@ -219,13 +219,13 @@ public final strictfp class NADCONTest e * This ensure that the grid indices (129.83277, 76.89632) is included in the test file. * Those grid indices is the location of the (39°13′26.71″N, 98°32′31.75″W) test point to interpolate. * - * @param grid The full grid from which to extract a few values. - * @param file Where to write the test file. - * @param dim 0 for writing longitudes, or 1 for writing latitudes. - * @param gridX Index along the longitude axis of the first cell to write. - * @param gridY Index along the latitude axis of the first cell to write. - * @param nx Number of cells to write along the longitude axis. - * @param ny Number of cells to write along the latitude axis. + * @param grid the full grid from which to extract a few values. + * @param file where to write the test file. + * @param dim 0 for writing longitudes, or 1 for writing latitudes. + * @param gridX index along the longitude axis of the first cell to write. + * @param gridY index along the latitude axis of the first cell to write. + * @param nx number of cells to write along the longitude axis. + * @param ny number of cells to write along the latitude axis. * @throws TransformException if an error occurred while computing the envelope. * @throws IOException if an error occurred while writing the test file. */ Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/NTv2Test.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -21,6 +21,10 @@ import java.net.URISyntaxException; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.Files; +import java.nio.file.StandardOpenOption; import java.nio.channels.WritableByteChannel; import java.nio.charset.StandardCharsets; import javax.measure.quantity.Angle; @@ -36,12 +40,6 @@ import org.junit.Test; import static org.apache.sis.test.Assert.*; -// Branch-dependent imports -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.Files; -import java.nio.file.StandardOpenOption; - /** * Tests the {@link NTv2} grid loader. Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/PositionVector7ParamTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -54,8 +54,8 @@ public final strictfp class PositionVect * IOGP Publication 373-7-2 – Geomatics Guidance Note number 7, part 2 – April 2015 * * - * @param step The step as a value from 1 to 4 inclusive. - * @return The sample point at the given step. + * @param step the step as a value from 1 to 4 inclusive. + * @return the sample point at the given step. */ static double[] samplePoint(final int step) { switch (step) { @@ -86,8 +86,8 @@ public final strictfp class PositionVect /** * Creates the transformation from WGS 72 to WGS 84. * - * @param method The operation method to use. - * @param rotationSign {@code +1} for Position Vector, or -1 for Frame Rotation. + * @param method the operation method to use. + * @param rotationSign {@code +1} for Position Vector, or -1 for Frame Rotation. */ static MathTransform createTransform(final GeocentricAffine method, final int rotationSign) throws FactoryException { final ParameterValueGroup values = method.getParameters().createValue(); @@ -118,7 +118,7 @@ public final strictfp class PositionVect @Test public void testGeocentricDomain() throws FactoryException, TransformException { createTransform(new PositionVector7Param()); - tolerance = 0.01; // Precision for (X,Y,Z) values given by EPSG + tolerance = 0.01; // Precision for (X,Y,Z) values given by EPSG derivativeDeltas = new double[] {100, 100, 100}; // In metres assertTrue(transform instanceof LinearTransform); verifyTransform(samplePoint(2), samplePoint(3)); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/internal/referencing/provider/ProviderMock.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -52,9 +52,9 @@ abstract strictfp class ProviderMock ext /** * Not yet supported. * - * @param factory Ignored. - * @param parameters Ignored. - * @return A dummy math transform. + * @param factory ignored. + * @param parameters ignored. + * @return a dummy math transform. */ @Override public final MathTransform createMathTransform(MathTransformFactory factory, ParameterValueGroup parameters) { Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/io/wkt/GeodeticObjectParserTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -771,9 +771,9 @@ public final strictfp class GeodeticObje * This is used by the methods in this class which test a CRS using less frequently used units and prime * meridian. * - * @param datum The datum to verify. + * @param datum the datum to verify. * @param hasToWGS84 Whether the datum is expected to have a {@code TOWGS84[…]} element. - * @return The prime meridian, to be verified by the caller because the unit of measurement depends on the test. + * @return the prime meridian, to be verified by the caller because the unit of measurement depends on the test. */ private static PrimeMeridian verifyNTF(final GeodeticDatum datum, final boolean hasToWGS84) { assertNameAndIdentifierEqual("Nouvelle Triangulation Française (Paris)", 0, datum); @@ -798,7 +798,7 @@ public final strictfp class GeodeticObje * Verifies the parameter values for a projected CRS which is expected to be “NTF (Paris) / Lambert zone II”. * This is used by the methods in this class which test a CRS using less frequently used units and prime meridian. * - * @return The latitude of origin, to be verified by the caller because the unit of measurement depends on the test. + * @return the latitude of origin, to be verified by the caller because the unit of measurement depends on the test. */ private static ParameterValue verifyNTF(final ParameterValueGroup param) { assertEquals("Lambert Conic Conformal (1SP)", param.getDescriptor().getName().getCode()); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorGroupTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -82,6 +82,7 @@ public final strictfp class DefaultParam * Ensures that the constructor detects duplicated names. */ @Test + @SuppressWarnings("ResultOfObjectAllocationIgnored") public void testConstruction() { final Class type = Integer.class; final Map properties = new HashMap<>(4); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterDescriptorTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -51,8 +51,8 @@ public final strictfp class DefaultParam /** * Creates the map of properties to be given to {@link DefaultParameterDescriptor} constructor. * - * @param name The parameter name. - * @return The properties to be given to descriptor constructor. + * @param name the parameter name. + * @return the properties to be given to descriptor constructor. */ private static Map properties(final String name) { final Map properties = new HashMap<>(4); @@ -64,9 +64,9 @@ public final strictfp class DefaultParam /** * Creates a descriptor for an optional parameter without default value, minimum or maximum value. * - * @param name The parameter name. - * @param type The type of values. - * @return The parameter descriptor. + * @param name the parameter name. + * @param type the type of values. + * @return the parameter descriptor. */ static DefaultParameterDescriptor createSimpleOptional(final String name, final Class type) { return new DefaultParameterDescriptor<>(properties(name), 0, 1, type, null, null, null); @@ -75,11 +75,11 @@ public final strictfp class DefaultParam /** * Creates a descriptor for a mandatory parameter in a range of integer values. * - * @param name The parameter name. - * @param minimumValue The minimum parameter value. - * @param maximumValue The maximum parameter value. - * @param defaultValue The default value for the parameter. - * @return The parameter descriptor for the given range of values. + * @param name the parameter name. + * @param minimumValue the minimum parameter value. + * @param maximumValue the maximum parameter value. + * @param defaultValue the default value for the parameter. + * @return the parameter descriptor for the given range of values. */ static DefaultParameterDescriptor create(final String name, final int minimumValue, final int maximumValue, final int defaultValue) @@ -91,12 +91,12 @@ public final strictfp class DefaultParam /** * Creates a descriptor for a mandatory parameter in a range of floating point values. * - * @param name The parameter name. - * @param minimumValue The minimum parameter value, or {@link Double#NEGATIVE_INFINITY} if none. - * @param maximumValue The maximum parameter value, or {@link Double#POSITIVE_INFINITY} if none. - * @param defaultValue The default value for the parameter, or {@link Double#NaN} if none. - * @param unit The unit for default, minimum and maximum values. - * @return The parameter descriptor for the given range of values. + * @param name the parameter name. + * @param minimumValue the minimum parameter value, or {@link Double#NEGATIVE_INFINITY} if none. + * @param maximumValue the maximum parameter value, or {@link Double#POSITIVE_INFINITY} if none. + * @param defaultValue the default value for the parameter, or {@link Double#NaN} if none. + * @param unit the unit for default, minimum and maximum values. + * @return the parameter descriptor for the given range of values. */ static DefaultParameterDescriptor create(final String name, final double minimumValue, final double maximumValue, final double defaultValue, final Unit unit) @@ -110,11 +110,11 @@ public final strictfp class DefaultParam * Creates a descriptor for a parameter restricted to a set of valid values. * This is typically (but not necessarily) a code list parameter. * - * @param name The parameter name. - * @param type The type of values. - * @param validValues The valid values. - * @param defaultValue The default value for the parameter. - * @return The parameter descriptor for the given range of values. + * @param name the parameter name. + * @param type the type of values. + * @param validValues the valid values. + * @param defaultValue the default value for the parameter. + * @return the parameter descriptor for the given range of values. */ static DefaultParameterDescriptor create(final String name, final Class type, final T[] validValues, final T defaultValue) @@ -125,11 +125,11 @@ public final strictfp class DefaultParam /** * Creates a descriptor for an array of {@code double[]} values. * - * @param name The parameter name. - * @param minimumValue The minimum parameter value, or {@link Double#NEGATIVE_INFINITY} if none. - * @param maximumValue The maximum parameter value, or {@link Double#POSITIVE_INFINITY} if none. - * @param unit The unit for minimum and maximum values. - * @return The parameter descriptor for the given range of values. + * @param name the parameter name. + * @param minimumValue the minimum parameter value, or {@link Double#NEGATIVE_INFINITY} if none. + * @param maximumValue the maximum parameter value, or {@link Double#POSITIVE_INFINITY} if none. + * @param unit the unit for minimum and maximum values. + * @return the parameter descriptor for the given range of values. */ static DefaultParameterDescriptor createForArray(final String name, final double minimumValue, final double maximumValue, final Unit unit) @@ -141,9 +141,9 @@ public final strictfp class DefaultParam /** * Creates a descriptor with the given EPSG identifier. * - * @param name The parameter name. - * @param code The parameter identifier. - * @return The descriptor with the given EPSG identifier. + * @param name the parameter name. + * @param code the parameter identifier. + * @return the descriptor with the given EPSG identifier. */ public static DefaultParameterDescriptor createEPSG(final String name, final short code) { final Map properties = properties(name); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/DefaultParameterValueTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -55,7 +55,7 @@ public final strictfp class DefaultParam * A subclass of {@code DefaultParameterValue} which store the value converted by {@link Verifier}. * This allows {@link DefaultParameterValueTest} methods to verify the conversion result. */ - @SuppressWarnings("serial") + @SuppressWarnings({"serial", "CloneableClassWithoutClone"}) private static final strictfp class Watcher extends DefaultParameterValue { /** The value converted by {@link Verifier}. */ T convertedValue; @@ -87,9 +87,9 @@ public final strictfp class DefaultParam * Constructs an optional parameter initialized to the given value. * The descriptor has no default value, no minimum and no maximum. * - * @param name The parameter name. - * @param value The parameter value. - * @return A new parameter instance for the given name and value. + * @param name the parameter name. + * @param value the parameter value. + * @return a new parameter instance for the given name and value. */ private static Watcher createOptional(final String name, final int value) { final Watcher parameter = new Watcher<>( @@ -101,10 +101,10 @@ public final strictfp class DefaultParam /** * Constructs a mandatory parameter initialize to the given value and unit. * - * @param name The parameter name. - * @param value The parameter value. - * @param unit The unit for the parameter value. - * @return A new parameter instance for the given name and value. + * @param name the parameter name. + * @param value the parameter value. + * @param unit the unit for the parameter value. + * @return a new parameter instance for the given name and value. */ private static Watcher create(final String name, final double value, final Unit unit) { final Watcher parameter = new Watcher<>(DefaultParameterDescriptorTest.create( Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MapProjectionParametersTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -51,7 +51,7 @@ public final strictfp class MapProjectio * Creates a map projection descriptor with semi-major/minor axis lengths * and the given amount of standard parallels. * - * @param numStandardParallels 1 or 2 for including the standard parallels. + * @param numStandardParallels 1 or 2 for including the standard parallels. */ @SuppressWarnings("fallthrough") private static MapProjectionDescriptor createDescriptor(final int numStandardParallels) { Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/MatrixParametersTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -56,10 +56,10 @@ public strictfp class MatrixParametersTe /** * Creates a new test case for a {@link MatrixParameters} defined by the subclass. * - * @param param The instance tested by this class. - * @param names The expected parameter names for all matrix elements. - * @param aliases The expected parameter aliases for all matrix elements, or {@code null} for no alias. - * @param identifiers The expected parameter identifiers for all matrix elements, or {@code null} for no identifier. + * @param param the instance tested by this class. + * @param names the expected parameter names for all matrix elements. + * @param aliases the expected parameter aliases for all matrix elements, or {@code null} for no alias. + * @param identifiers the expected parameter identifiers for all matrix elements, or {@code null} for no identifier. */ MatrixParametersTest(TensorParameters param, String[][] names, String[][] aliases, short[][] identifiers) { super(param, names, aliases, identifiers); Modified: sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/test/java/org/apache/sis/parameter/ParameterMarshallingTest.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -18,6 +18,7 @@ package org.apache.sis.parameter; import java.util.Collections; import java.util.Iterator; +import java.util.Objects; import java.net.URI; import java.net.URISyntaxException; import javax.xml.bind.JAXBException; @@ -40,9 +41,6 @@ import org.junit.Test; import static org.apache.sis.test.ReferencingAssert.*; -// Branch-dependent imports -import java.util.Objects; - /** * Tests XML (un)marshalling of {@link DefaultParameterValue}. @@ -70,8 +68,8 @@ public final strictfp class ParameterMar /** * Marshals the given object, then unmarshals it and compare with the original value. * - * @param parameter The parameter to marshal. - * @param expected The expected XML (ignoring {@code xmlns}). + * @param parameter the parameter to marshal. + * @param expected the expected XML (ignoring {@code xmlns}). */ private static void testMarshallAndUnmarshall(final DefaultParameterValue parameter, final String expected) throws JAXBException @@ -127,7 +125,7 @@ public final strictfp class ParameterMar * change in any future Apache SIS version. */ assertNull("valueDomain", r.getValueDomain()); - assertNull("valueClass", r.getValueClass()); // May change in any future SIS release. + assertNull("valueClass", r.getValueClass()); // May change in any future SIS release. } /** @@ -318,11 +316,11 @@ public final strictfp class ParameterMar /** * Verifies that the given parameter descriptor has the expected EPSG code, name and OGC alias. * - * @param code The expected EPSG code. - * @param name The expected EPSG name. - * @param alias The expected OGC alias. - * @param required {@code true} if the parameter should be mandatory, or {@code false} if optional. - * @param descriptor The parameter descriptor to verify. + * @param code the expected EPSG code. + * @param name the expected EPSG name. + * @param alias the expected OGC alias. + * @param required {@code true} if the parameter should be mandatory, or {@code false} if optional. + * @param descriptor the parameter descriptor to verify. */ private static void verifyDescriptor(final int code, final String name, final String alias, final boolean required, final GeneralParameterDescriptor descriptor) @@ -336,13 +334,13 @@ public final strictfp class ParameterMar /** * Verifies that the given parameter value has the expected value and descriptor properties. * - * @param code The expected EPSG code. - * @param name The expected EPSG name. - * @param alias The expected OGC alias. - * @param value The expected value. - * @param unit The expected unit of measurement for both the value and the descriptor. - * @param descriptor The expected parameter descriptor associated to the parameter value. - * @param parameter The parameter value to verify. + * @param code the expected EPSG code. + * @param name the expected EPSG name. + * @param alias the expected OGC alias. + * @param value the expected value. + * @param unit the expected unit of measurement for both the value and the descriptor. + * @param descriptor the expected parameter descriptor associated to the parameter value. + * @param parameter the parameter value to verify. */ private static void verifyParameter(final int code, final String name, final String alias, final double value, final Unit unit, final GeneralParameterDescriptor descriptor,