From commits-return-8755-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 5FBB6193A0 for ; Sat, 21 Jan 2017 09:15:06 +0000 (UTC) Received: (qmail 5190 invoked by uid 500); 21 Jan 2017 09:15:06 -0000 Delivered-To: apmail-sis-commits-archive@sis.apache.org Received: (qmail 5157 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 5105 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 C4F6B3A47B3 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 [12/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.C4F6B3A47B3@svn01-us-west.apache.org> Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ExponentialTransform1D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -102,8 +102,8 @@ final class ExponentialTransform1D exten * Instances should be created using the {@linkplain #create(double, double) factory method}, * which may returns optimized implementations for some particular argument values. * - * @param base The base to be raised to a power. - * @param scale The scale value to be multiplied. + * @param base the base to be raised to a power. + * @param scale the scale value to be multiplied. */ protected ExponentialTransform1D(final double base, final double scale) { this.base = base; @@ -114,9 +114,9 @@ final class ExponentialTransform1D exten /** * Constructs a new exponential transform which include the given scale factor applied after the exponentiation. * - * @param base The base to be raised to a power. - * @param scale The scale value to be multiplied. - * @return The math transform. + * @param base the base to be raised to a power. + * @param scale the scale value to be multiplied. + * @return the math transform. */ public static MathTransform1D create(final double base, final double scale) { if (base == 0 || scale == 0) { @@ -217,12 +217,11 @@ final class ExponentialTransform1D exten * {@code MathTransform}. This implementation can optimize some concatenation with * {@link LinearTransform1D} and {@link LogarithmicTransform1D}. * - * @param other The math transform to apply. - * @param applyOtherFirst {@code true} if the transformation order is {@code other} - * followed by {@code this}, or {@code false} if the transformation order is - * {@code this} followed by {@code other}. - * @param factory The factory which is (indirectly) invoking this method, or {@code null} if none. - * @return The combined math transform, or {@code null} if no optimized combined transform is available. + * @param other the math transform to apply. + * @param applyOtherFirst {@code true} if the transformation order is {@code other} followed by {@code this}, or + * {@code false} if the transformation order is {@code this} followed by {@code other}. + * @param factory the factory which is (indirectly) invoking this method, or {@code null} if none. + * @return the combined math transform, or {@code null} if no optimized combined transform is available. */ @Override final MathTransform concatenate(final MathTransform other, final boolean applyOtherFirst, @@ -251,10 +250,10 @@ final class ExponentialTransform1D exten * Concatenates in an optimized way a {@link LogarithmicTransform1D} {@code other} * to this {@code ExponentialTransform1D}. * - * @param other The math transform to apply. - * @param applyOtherFirst {@code true} if the transformation order is {@code other} followed by {@code this}, - * or {@code false} if the transformation order is {@code this} followed by {@code other}. - * @return The combined math transform, or {@code null} if no optimized combined transform is available. + * @param other the math transform to apply. + * @param applyOtherFirst {@code true} if the transformation order is {@code other} followed by {@code this}, or + * {@code false} if the transformation order is {@code this} followed by {@code other}. + * @return the combined math transform, or {@code null} if no optimized combined transform is available. */ final MathTransform concatenateLog(final LogarithmicTransform1D other, final boolean applyOtherFirst) { final double newScale = lnBase / other.lnBase(); @@ -266,8 +265,10 @@ final class ExponentialTransform1D exten if (scale > 0) { newOffset = other.log(scale) + other.offset(); } else { - // Maybe the Math.log(...) argument will become - // positive if we rewrite the equation that way... + /* + * Maybe the Math.log(double) argument will become + * positive if we rewrite the equation that way... + */ newOffset = other.log(scale * other.offset() * other.lnBase()); } if (!Double.isNaN(newOffset)) { @@ -292,7 +293,7 @@ final class ExponentialTransform1D exten @Override public boolean equals(final Object object, final ComparisonMode mode) { if (object == this) { - return true; // Optimization for a common case. + return true; // Optimization for a common case. } if (super.equals(object, mode)) { final ExponentialTransform1D that = (ExponentialTransform1D) object; Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IdentityTransform.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IdentityTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IdentityTransform.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IdentityTransform.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -57,7 +57,7 @@ final class IdentityTransform extends Ab /** * Constructs an identity transform of the specified dimension. * - * @param dimension The dimension of the transform to be created. + * @param dimension the dimension of the transform to be created. * * @see MathTransforms#identity(int) */ @@ -70,8 +70,8 @@ final class IdentityTransform extends Ab * dimension 1 and 2, this method returns instances of {@link LinearTransform1D} or * {@link AffineTransform2D} respectively. * - * @param dimension The dimension of the transform to be returned. - * @return An identity transform of the specified dimension. + * @param dimension the dimension of the transform to be returned. + * @return an identity transform of the specified dimension. * * @see MathTransforms#identity(int) */ Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -154,9 +154,9 @@ public class InterpolatedGeocentricTrans /** * Constructs the inverse of an interpolated geocentric transform. * - * @param inverse The transform for which to create the inverse. - * @param source The source ellipsoid of the given {@code inverse} transform. - * @param target The target ellipsoid of the given {@code inverse} transform. + * @param inverse the transform for which to create the inverse. + * @param source the source ellipsoid of the given {@code inverse} transform. + * @param target the target ellipsoid of the given {@code inverse} transform. */ InterpolatedGeocentricTransform(final InterpolatedGeocentricTransform inverse, Ellipsoid source, Ellipsoid target) { this(target, inverse.getTargetDimensions() > 2, @@ -190,11 +190,11 @@ public class InterpolatedGeocentricTrans * {@linkplain #getContextualParameters()}.{@linkplain ContextualParameters#completeTransform * completeTransform}(factory, this)}. * - * @param source The source ellipsoid. + * @param source the source ellipsoid. * @param isSource3D {@code true} if the source coordinates have a height. - * @param target The target ellipsoid. + * @param target the target ellipsoid. * @param isTarget3D {@code true} if the target coordinates have a height. - * @param grid The grid of datum shifts from source to target datum. + * @param grid the grid of datum shifts from source to target datum. * The {@link DatumShiftGrid#interpolateInCell DatumShiftGrid.interpolateInCell(…)} method * shall compute (ΔX, ΔY, ΔZ) translations from source to target in the * unit of source ellipsoid axes. @@ -309,16 +309,16 @@ public class InterpolatedGeocentricTrans * Note however that the given {@code grid} instance shall expect geographic coordinates (λ,φ) * in radians. * - * @param factory The factory to use for creating the transform. - * @param source The source ellipsoid. + * @param factory the factory to use for creating the transform. + * @param source the source ellipsoid. * @param isSource3D {@code true} if the source coordinates have a height. - * @param target The target ellipsoid. + * @param target the target ellipsoid. * @param isTarget3D {@code true} if the target coordinates have a height. - * @param grid The grid of datum shifts from source to target datum. + * @param grid the grid of datum shifts from source to target datum. * The {@link DatumShiftGrid#interpolateInCell DatumShiftGrid.interpolateInCell(…)} method * shall compute (ΔX, ΔY, ΔZ) translations from source to target in the * unit of source ellipsoid axes. - * @return The transformation between geographic coordinates in degrees. + * @return the transformation between geographic coordinates in degrees. * @throws FactoryException if an error occurred while creating a transform. */ public static MathTransform createGeodeticTransformation(final MathTransformFactory factory, @@ -339,7 +339,7 @@ public class InterpolatedGeocentricTrans /** * Gets the dimension of input points. * - * @return The input dimension, which is 2 or 3. + * @return the input dimension, which is 2 or 3. */ @Override public int getSourceDimensions() { @@ -349,7 +349,7 @@ public class InterpolatedGeocentricTrans /** * Gets the dimension of output points. * - * @return The output dimension, which is 2 or 3. + * @return the output dimension, which is 2 or 3. */ @Override public int getTargetDimensions() { @@ -417,9 +417,9 @@ public class InterpolatedGeocentricTrans * But this is a little bit complicated (need to convert to normalized units and divide by the grid * cell size) for a very small difference. For now we neglect that part. * - * @param m1 The derivative computed by the "geographic to geocentric" conversion. - * @param m2 The derivative computed by the "geocentric to geographic" conversion. - * @return The derivative for the "interpolated geocentric" transformation. + * @param m1 the derivative computed by the "geographic to geocentric" conversion. + * @param m2 the derivative computed by the "geocentric to geographic" conversion. + * @return the derivative for the "interpolated geocentric" transformation. */ final Matrix concatenate(final Matrix m1, final Matrix m2) { for (int i = m1.getNumCol(); --i >= 0;) { // Number of columns can be 2 or 3. @@ -434,7 +434,7 @@ public class InterpolatedGeocentricTrans * Returns the inverse of this interpolated geocentric transform. * The source ellipsoid of the returned transform will be the target ellipsoid of this transform, and conversely. * - * @return A transform from the target ellipsoid to the source ellipsoid of this transform. + * @return a transform from the target ellipsoid to the source ellipsoid of this transform. */ @Override public MathTransform inverse() { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform2D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform2D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform2D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedGeocentricTransform2D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -97,9 +97,9 @@ final class InterpolatedGeocentricTransf /** * Constructs the inverse of an interpolated geocentric transform. * - * @param inverse The transform for which to create the inverse. - * @param source The source ellipsoid of the given {@code inverse} transform. - * @param target The target ellipsoid of the given {@code inverse} transform. + * @param inverse the transform for which to create the inverse. + * @param source the source ellipsoid of the given {@code inverse} transform. + * @param target the target ellipsoid of the given {@code inverse} transform. */ Inverse(final InterpolatedGeocentricTransform inverse, final Ellipsoid source, final Ellipsoid target) { super(inverse, source, target); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -99,9 +99,9 @@ public class InterpolatedMolodenskyTrans /** * Constructs the inverse of an interpolated Molodensky transform. * - * @param inverse The transform for which to create the inverse. - * @param source The source ellipsoid of the given {@code inverse} transform. - * @param target The target ellipsoid of the given {@code inverse} transform. + * @param inverse the transform for which to create the inverse. + * @param source the source ellipsoid of the given {@code inverse} transform. + * @param target the target ellipsoid of the given {@code inverse} transform. */ InterpolatedMolodenskyTransform(final InterpolatedMolodenskyTransform inverse, Ellipsoid source, Ellipsoid target) { super(inverse, source, target, INVERSE); @@ -134,11 +134,11 @@ public class InterpolatedMolodenskyTrans * {@linkplain #getContextualParameters()}.{@linkplain ContextualParameters#completeTransform * completeTransform}(factory, this)}. * - * @param source The source ellipsoid. + * @param source the source ellipsoid. * @param isSource3D {@code true} if the source coordinates have a height. - * @param target The target ellipsoid. + * @param target the target ellipsoid. * @param isTarget3D {@code true} if the target coordinates have a height. - * @param grid The grid of datum shifts from source to target datum. + * @param grid the grid of datum shifts from source to target datum. * The {@link DatumShiftGrid#interpolateInCell DatumShiftGrid.interpolateInCell(…)} method * shall compute (ΔX, ΔY, ΔZ) translations from source to target in the * unit of source ellipsoid axes. @@ -178,16 +178,16 @@ public class InterpolatedMolodenskyTrans * Note however that the given {@code grid} instance shall expect geographic coordinates (λ,φ) * in radians. * - * @param factory The factory to use for creating the transform. - * @param source The source ellipsoid. + * @param factory the factory to use for creating the transform. + * @param source the source ellipsoid. * @param isSource3D {@code true} if the source coordinates have a height. - * @param target The target ellipsoid. + * @param target the target ellipsoid. * @param isTarget3D {@code true} if the target coordinates have a height. - * @param grid The grid of datum shifts from source to target datum. + * @param grid the grid of datum shifts from source to target datum. * The {@link DatumShiftGrid#interpolateInCell DatumShiftGrid.interpolateInCell(…)} method * shall compute (ΔX, ΔY, ΔZ) translations from source to target in the * unit of source ellipsoid axes. - * @return The transformation between geographic coordinates in degrees. + * @return the transformation between geographic coordinates in degrees. * @throws FactoryException if an error occurred while creating a transform. */ public static MathTransform createGeodeticTransformation(final MathTransformFactory factory, @@ -209,10 +209,10 @@ public class InterpolatedMolodenskyTrans /** * Invoked by constructor and by {@link #getParameterValues()} for setting all parameters other than axis lengths. * - * @param pg Where to set the parameters. - * @param semiMinor The semi minor axis length, in unit of {@code unit}. - * @param unit The unit of measurement to declare. - * @param Δf Ignored. + * @param pg where to set the parameters. + * @param semiMinor the semi minor axis length, in unit of {@code unit}. + * @param unit the unit of measurement to declare. + * @param Δf ignored. */ @Override final void completeParameters(final Parameters pg, final double semiMinor, final Unit unit, double Δf) { @@ -315,7 +315,7 @@ public class InterpolatedMolodenskyTrans * Returns the inverse of this interpolated Molodensky transform. * The source ellipsoid of the returned transform will be the target ellipsoid of this transform, and conversely. * - * @return A transform from the target ellipsoid to the source ellipsoid of this transform. + * @return a transform from the target ellipsoid to the source ellipsoid of this transform. */ @Override public MathTransform inverse() { @@ -351,9 +351,9 @@ public class InterpolatedMolodenskyTrans /** * Constructs the inverse of an interpolated Molodensky transform. * - * @param inverse The transform for which to create the inverse. - * @param source The source ellipsoid of the given {@code inverse} transform. - * @param target The target ellipsoid of the given {@code inverse} transform. + * @param inverse the transform for which to create the inverse. + * @param source the source ellipsoid of the given {@code inverse} transform. + * @param target the target ellipsoid of the given {@code inverse} transform. */ Inverse(final InterpolatedMolodenskyTransform inverse, final Ellipsoid source, final Ellipsoid target) { super(inverse, source, target); @@ -438,7 +438,7 @@ public class InterpolatedMolodenskyTrans * Most GIS applications will instead be interested in the {@linkplain #getContextualParameters() * contextual parameters}. * - * @return A description of the internal parameters. + * @return a description of the internal parameters. */ @Debug @Override Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform2D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform2D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform2D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedMolodenskyTransform2D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -97,9 +97,9 @@ final class InterpolatedMolodenskyTransf /** * Constructs the inverse of an interpolated Molodensky transform. * - * @param inverse The transform for which to create the inverse. - * @param source The source ellipsoid of the given {@code inverse} transform. - * @param target The target ellipsoid of the given {@code inverse} transform. + * @param inverse the transform for which to create the inverse. + * @param source the source ellipsoid of the given {@code inverse} transform. + * @param target the target ellipsoid of the given {@code inverse} transform. */ Inverse(final InterpolatedMolodenskyTransform inverse, final Ellipsoid source, final Ellipsoid target) { super(inverse, source, target); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/IterationStrategy.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -139,12 +139,12 @@ public enum IterationStrategy { * (x,y,z) tuple. * * - * @param srcOff The offset in the source coordinate array. - * @param srcDim The dimension of input points. - * @param dstOff The offset in the destination coordinate array. - * @param dstDim The dimension of output points. - * @param numPts The number of points to transform. - * @return A strategy for iterating over the points during the transformation process. + * @param srcOff the offset in the source coordinate array. + * @param srcDim the dimension of input points. + * @param dstOff the offset in the destination coordinate array. + * @param dstDim the dimension of output points. + * @param numPts the number of points to transform. + * @return a strategy for iterating over the points during the transformation process. */ public static IterationStrategy suggest(final int srcOff, final int srcDim, final int dstOff, final int dstDim, final int numPts) @@ -176,7 +176,7 @@ public enum IterationStrategy { * * Rearanging gives: (srcOff - dstOff) >= (1-numPts)*(srcDim - dstDim) */ - d = srcDim - dstDim; // Must be computed in the same way than below. + d = srcDim - dstDim; // Must be computed in the same way than below. if (d >= 0 || delta >= (1-numPts)*d) { return ASCENDING; } Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -75,8 +75,8 @@ final class LinearInterpolator1D extends *

This constructor assumes that the {@code values} array have already be clones, * so it will not clone it again.

* - * @param values the y values in y=f(x) where x = {0, 1, … , {@code values.length-1}}. - * @param slope the value to use for extrapolation. + * @param values the y values in y=f(x) where x = {0, 1, … , {@code values.length-1}}. + * @param slope the value to use for extrapolation. */ private LinearInterpolator1D(final double[] values, final double slope) { this.values = values; // Cloning this array is caller's responsibility. @@ -95,7 +95,7 @@ final class LinearInterpolator1D extends * Creates a transform for the given values. This method returns an affine transform instead than an * interpolator if the given values form a series with a constant increment. * - * @param values a copy of the user-provided values. This array may be modified. + * @param values a copy of the user-provided values. This array may be modified. */ private static MathTransform1D create(final double[] values) { final int n = values.length - 1; Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -90,7 +90,7 @@ public interface LinearTransform extends * returned matrix by a vector containing the ordinate values with an additional 1 in the last row. * See {@link LinearTransform} class Javadoc for more details. * - * @return The coefficients of this linear transform as a matrix. + * @return the coefficients of this linear transform as a matrix. * * @see MathTransforms#getMatrix(MathTransform) */ @@ -106,11 +106,11 @@ public interface LinearTransform extends * Δx₁,Δy₁,Δz₁ …). * * - * @param srcPts The array containing the source vectors. - * @param srcOff The offset to the first vector to be transformed in the source array. - * @param dstPts The array into which the transformed vectors are returned. Can be the same than {@code srcPts}. - * @param dstOff The offset to the location of the first transformed vector that is stored in the destination array. - * @param numPts The number of vector objects to be transformed. + * @param srcPts the array containing the source vectors. + * @param srcOff the offset to the first vector to be transformed in the source array. + * @param dstPts the array into which the transformed vectors are returned. Can be the same than {@code srcPts}. + * @param dstOff the offset to the location of the first transformed vector that is stored in the destination array. + * @param numPts the number of vector objects to be transformed. * @throws TransformException if a vector can not be transformed. * * @see java.awt.geom.AffineTransform#deltaTransform(double[], int, double[], int, int) @@ -124,7 +124,7 @@ public interface LinearTransform extends * The target of the inverse transform is the source of the original. * The source of the inverse transform is the target of the original. * - * @return The inverse transform. + * @return the inverse transform. * @throws NoninvertibleTransformException if the transform can not be inverted. * * @see java.awt.geom.AffineTransform#createInverse() Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearTransform1D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -30,9 +30,10 @@ import org.apache.sis.referencing.operat import org.apache.sis.internal.referencing.provider.Affine; import org.apache.sis.internal.util.Numerics; import org.apache.sis.util.ComparisonMode; - -// We really want to use doubleToRawLongBits, not doubleToLongBits, because the -// coverage module needs the raw bits for differentiating various NaN values. +/* + * We really want to use doubleToRawLongBits, not doubleToLongBits, because the + * coverage module needs the raw bits for differentiating various NaN values. + */ import static java.lang.Double.doubleToRawLongBits; @@ -84,8 +85,8 @@ class LinearTransform1D extends Abstract * Instances should be created using the {@linkplain #create(double, double) factory method}, * which may returns optimized implementations for some particular argument values. * - * @param scale The {@code scale} term in the linear equation. - * @param offset The {@code offset} term in the linear equation. + * @param scale the {@code scale} term in the linear equation. + * @param offset the {@code offset} term in the linear equation. * * @see #create(double, double) */ @@ -97,9 +98,9 @@ class LinearTransform1D extends Abstract /** * Constructs a new linear transform. * - * @param scale The {@code scale} term in the linear equation. - * @param offset The {@code offset} term in the linear equation. - * @return The linear transform for the given scale and offset. + * @param scale the {@code scale} term in the linear equation. + * @param offset the {@code offset} term in the linear equation. + * @return the linear transform for the given scale and offset. * * @see MathTransforms#linear(double, double) */ @@ -142,7 +143,7 @@ class LinearTransform1D extends Abstract * depends on the matrix size. Only matrix elements different from their default value * will be included in this group. * - * @return The parameter values for this math transform. + * @return the parameter values for this math transform. */ @Override public ParameterValueGroup getParameterValues() { @@ -177,7 +178,7 @@ class LinearTransform1D extends Abstract inverse.inverse = this; this.inverse = inverse; } else { - inverse = super.inverse(); // Throws NoninvertibleTransformException + inverse = super.inverse(); // Throws NoninvertibleTransformException } } return (LinearTransform1D) inverse; @@ -207,8 +208,8 @@ class LinearTransform1D extends Abstract /** * Gets the derivative of this transform at a point. * - * @param point Ignored for a linear transform. Can be null. - * @return The derivative at the given point. + * @param point ignored for a linear transform. Can be null. + * @return the derivative at the given point. */ @Override public Matrix derivative(final DirectPosition point) throws TransformException { @@ -218,8 +219,8 @@ class LinearTransform1D extends Abstract /** * Gets the derivative of this function at a value. * - * @param value Ignored for a linear transform. Can be {@link Double#NaN NaN}. - * @return The derivative at the given point. + * @param value ignored for a linear transform. Can be {@link Double#NaN NaN}. + * @return the derivative at the given point. */ @Override public double derivative(final double value) { @@ -356,7 +357,7 @@ class LinearTransform1D extends Abstract */ @Override public boolean equals(final Object object, final ComparisonMode mode) { - if (object == this) { // Slight optimization + if (object == this) { // Slight optimization return true; } if (mode != ComparisonMode.STRICT) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LogarithmicTransform1D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -75,9 +75,9 @@ class LogarithmicTransform1D extends Abs /** * Constructs a new logarithmic transform which add the given offset after the logarithm. * - * @param base The base of the logarithm (typically 10). - * @param offset The offset to add to the logarithm. - * @return The math transform. + * @param base the base of the logarithm (typically 10). + * @param offset the offset to add to the logarithm. + * @return the math transform. */ public static MathTransform1D create(final double base, final double offset) { ArgumentChecks.ensureStrictlyPositive("base", base); @@ -113,11 +113,11 @@ class LogarithmicTransform1D extends Abs * {@code MathTransform}. This implementation can optimize some concatenation with * {@link LinearTransform1D} and {@link ExponentialTransform1D}. * - * @param other The math transform to apply. - * @param applyOtherFirst {@code true} if the transformation order is {@code other} followed by {@code this}, - * or {@code false} if the transformation order is {@code this} followed by {@code other}. - * @param factory The factory which is (indirectly) invoking this method, or {@code null} if none. - * @return The combined math transform, or {@code null} if no optimized combined transform is available. + * @param other the math transform to apply. + * @param applyOtherFirst {@code true} if the transformation order is {@code other} followed by {@code this}, or + * {@code false} if the transformation order is {@code this} followed by {@code other}. + * @param factory the factory which is (indirectly) invoking this method, or {@code null} if none. + * @return the combined math transform, or {@code null} if no optimized combined transform is available. */ @Override final MathTransform concatenate(final MathTransform other, final boolean applyOtherFirst, @@ -186,8 +186,8 @@ class LogarithmicTransform1D extends Abs /** * Returns the base of this logarithmic transform raised to the given power. * - * @param value The power to raise the base. - * @return The base of this transform raised to the given power. + * @param value the power to raise the base. + * @return the base of this transform raised to the given power. */ double pow(final double value) { return Math.exp(value); @@ -197,8 +197,8 @@ class LogarithmicTransform1D extends Abs * Returns the logarithm of the given value in the base of this logarithmic transform. * This method is similar to {@link #transform(double)} except that the offset is not added. * - * @param value The value for which to compute the log. - * @return The log of the given value in the base used by this transform. + * @param value the value for which to compute the log. + * @return the log of the given value in the base used by this transform. */ double log(final double value) { return Math.log(value); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransformProvider.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -109,9 +109,9 @@ public interface MathTransformProvider { * with other kind of transforms. In such cases, implementors should use the given factory for creating * the steps. * - * @param factory The factory to use if this constructor needs to create other math transforms. - * @param parameters The parameter values that define the transform to create. - * @return The math transform created from the given parameters. + * @param factory the factory to use if this constructor needs to create other math transforms. + * @param parameters the parameter values that define the transform to create. + * @return the math transform created from the given parameters. * @throws InvalidParameterNameException if the given parameter group contains an unknown parameter. * @throws ParameterNotFoundException if a required parameter was not found. * @throws InvalidParameterValueException if a parameter has an invalid value. Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MathTransforms.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -73,8 +73,8 @@ public final class MathTransforms extend *
  • If {@code dimension == 2}, then the returned transform implements {@link MathTransform2D}.
    • * * - * @param dimension The dimension of the transform to be returned. - * @return An identity transform of the specified dimension. + * @param dimension the dimension of the transform to be returned. + * @return an identity transform of the specified dimension. */ public static LinearTransform identity(final int dimension) { ArgumentChecks.ensureStrictlyPositive("dimension", dimension); @@ -87,9 +87,9 @@ public final class MathTransforms extend * *
    y  =  x ⋅ {@code scale} + {@code offset}
    * - * @param scale The {@code scale} term in the linear equation. - * @param offset The {@code offset} term in the linear equation. - * @return The linear transform for the given scale and offset. + * @param scale the {@code scale} term in the linear equation. + * @param offset the {@code offset} term in the linear equation. + * @return the linear transform for the given scale and offset. */ public static LinearTransform linear(final double scale, final double offset) { return LinearTransform1D.create(scale, offset); @@ -105,8 +105,8 @@ public final class MathTransforms extend * The +1 in the matrix dimensions allows the matrix to do a shift, as well as a rotation. * The {@code [M][j]} element of the matrix will be the j'th ordinate of the moved origin.

    * - * @param matrix The matrix used to define the linear transform. - * @return The linear (usually affine) transform. + * @param matrix the matrix used to define the linear transform. + * @return the linear (usually affine) transform. * * @see #getMatrix(MathTransform) * @see DefaultMathTransformFactory#createAffineTransform(Matrix) @@ -165,8 +165,8 @@ public final class MathTransforms extend * *

    The current implementation uses linear interpolation. This may be changed in a future SIS version.

    * - * @param preimage the input values (x) in the function domain, or {@code null}. - * @param values the output values (y) in the function range, or {@code null}. + * @param preimage the input values (x) in the function domain, or {@code null}. + * @param values the output values (y) in the function range, or {@code null}. * @return the y=f(x) function. * * @see org.opengis.coverage.InterpolationMethod @@ -191,8 +191,8 @@ public final class MathTransforms extend * is equals to the sum of the target dimensions of all given transforms. * * - * @param transforms The transforms to aggregate in a single transform, in the given order. - * @return The aggregation of all given transforms, or {@code null} if the given {@code transforms} array was empty. + * @param transforms the transforms to aggregate in a single transform, in the given order. + * @return the aggregation of all given transforms, or {@code null} if the given {@code transforms} array was empty. * * @see PassThroughTransform * @see org.apache.sis.referencing.crs.DefaultCompoundCRS @@ -228,9 +228,9 @@ public final class MathTransforms extend * {@link MathTransform1D} or {@link MathTransform2D} if the dimensions of the * concatenated transform are equal to 1 or 2 respectively. * - * @param tr1 The first math transform. - * @param tr2 The second math transform. - * @return The concatenated transform. + * @param tr1 the first math transform. + * @param tr2 the second math transform. + * @return the concatenated transform. * @throws MismatchedDimensionException if the output dimension of the first transform * does not match the input dimension of the second transform. * @@ -245,7 +245,7 @@ public final class MathTransforms extend try { tr = ConcatenatedTransform.create(tr1, tr2, null); } catch (FactoryException e) { - throw new IllegalArgumentException(e); // Should never happen actually. + throw new IllegalArgumentException(e); // Should never happen actually. } assert isValid(getSteps(tr)) : tr; return tr; @@ -256,9 +256,9 @@ public final class MathTransforms extend * delegating to {@link #concatenate(MathTransform, MathTransform)} and casting the * result to a {@link MathTransform1D} instance. * - * @param tr1 The first math transform. - * @param tr2 The second math transform. - * @return The concatenated transform. + * @param tr1 the first math transform. + * @param tr2 the second math transform. + * @return the concatenated transform. * @throws MismatchedDimensionException if the output dimension of the first transform * does not match the input dimension of the second transform. */ @@ -273,9 +273,9 @@ public final class MathTransforms extend * delegating to {@link #concatenate(MathTransform, MathTransform)} and casting the * result to a {@link MathTransform2D} instance. * - * @param tr1 The first math transform. - * @param tr2 The second math transform. - * @return The concatenated transform. + * @param tr1 the first math transform. + * @param tr2 the second math transform. + * @return the concatenated transform. * @throws MismatchedDimensionException if the output dimension of the first transform * does not match the input dimension of the second transform. */ @@ -289,10 +289,10 @@ public final class MathTransforms extend * Concatenates the three given transforms. This is a convenience methods doing its job * as two consecutive concatenations. * - * @param tr1 The first math transform. - * @param tr2 The second math transform. - * @param tr3 The third math transform. - * @return The concatenated transform. + * @param tr1 the first math transform. + * @param tr2 the second math transform. + * @param tr3 the third math transform. + * @return the concatenated transform. * @throws MismatchedDimensionException if the output dimension of a transform * does not match the input dimension of next transform. */ @@ -310,10 +310,10 @@ public final class MathTransforms extend * delegating to {@link #concatenate(MathTransform, MathTransform, MathTransform)} and * casting the result to a {@link MathTransform1D} instance. * - * @param tr1 The first math transform. - * @param tr2 The second math transform. - * @param tr3 The third math transform. - * @return The concatenated transform. + * @param tr1 the first math transform. + * @param tr2 the second math transform. + * @param tr3 the third math transform. + * @return the concatenated transform. * @throws MismatchedDimensionException if the output dimension of a transform * does not match the input dimension of next transform. */ @@ -328,10 +328,10 @@ public final class MathTransforms extend * delegating to {@link #concatenate(MathTransform, MathTransform, MathTransform)} and * casting the result to a {@link MathTransform2D} instance. * - * @param tr1 The first math transform. - * @param tr2 The second math transform. - * @param tr3 The third math transform. - * @return The concatenated transform. + * @param tr1 the first math transform. + * @param tr2 the second math transform. + * @param tr3 the third math transform. + * @return the concatenated transform. * @throws MismatchedDimensionException if the output dimension of a transform * does not match the input dimension of next transform. */ @@ -370,8 +370,8 @@ public final class MathTransforms extend *
  • Otherwise returns the given transform in a list of size 1.
    • * * - * @param transform The transform for which to get the components, or {@code null}. - * @return All single math transforms performed by this concatenated transform. + * @param transform the transform for which to get the components, or {@code null}. + * @return all single math transforms performed by this concatenated transform. */ public static List getSteps(final MathTransform transform) { if (transform != null) { @@ -397,8 +397,8 @@ public final class MathTransforms extend *
  • Otherwise returns {@code null}.
    • * * - * @param transform The transform for which to get the matrix, or {@code null}. - * @return The matrix of the given transform, or {@code null} if none. + * @param transform the transform for which to get the matrix, or {@code null}. + * @return the matrix of the given transform, or {@code null} if none. * * @see #linear(Matrix) * @see LinearTransform#getMatrix() @@ -426,13 +426,13 @@ public final class MathTransforms extend * ptDst = transform(ptSrc, ptDst); * } * - * @param transform The transform to use. - * @param srcPts The array containing the source coordinate. - * @param srcOff The offset to the point to be transformed in the source array. - * @param dstPts the array into which the transformed coordinate is returned. - * @param dstOff The offset to the location of the transformed point that is stored in the destination array. - * @return The matrix of the transform derivative at the given source position. - * @throws TransformException If the point can't be transformed or if a problem occurred + * @param transform the transform to use. + * @param srcPts the array containing the source coordinate. + * @param srcOff the offset to the point to be transformed in the source array. + * @param dstPts the array into which the transformed coordinate is returned. + * @param dstOff the offset to the location of the transformed point that is stored in the destination array. + * @return the matrix of the transform derivative at the given source position. + * @throws TransformException if the point can't be transformed or if a problem occurred * while calculating the derivative. */ public static Matrix derivativeAndTransform(final MathTransform transform, Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyFormula.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -140,10 +140,10 @@ abstract class MolodenskyFormula extends /** * Constructs the inverse of a Molodensky transform. * - * @param inverse The transform for which to create the inverse. - * @param source The source ellipsoid of the given {@code inverse} transform. - * @param target The target ellipsoid of the given {@code inverse} transform. - * @param descriptor The contextual parameter descriptor. + * @param inverse the transform for which to create the inverse. + * @param source the source ellipsoid of the given {@code inverse} transform. + * @param target the target ellipsoid of the given {@code inverse} transform. + * @param descriptor the contextual parameter descriptor. */ MolodenskyFormula(final MolodenskyFormula inverse, final Ellipsoid source, final Ellipsoid target, final ParameterDescriptorGroup descriptor) @@ -157,16 +157,16 @@ abstract class MolodenskyFormula extends * Creates a Molodensky transform from the specified parameters. * If a non-null {@code grid} is specified, it is caller's responsibility to verify its validity. * - * @param source The source ellipsoid. + * @param source the source ellipsoid. * @param isSource3D {@code true} if the source coordinates have a height. - * @param target The target ellipsoid. + * @param target the target ellipsoid. * @param isTarget3D {@code true} if the target coordinates have a height. - * @param tX The geocentric X translation in same units than the source ellipsoid axes. - * @param tY The geocentric Y translation in same units than the source ellipsoid axes. - * @param tZ The geocentric Z translation in same units than the source ellipsoid axes. - * @param grid Interpolation grid in geocentric coordinates, or {@code null} if none. + * @param tX the geocentric X translation in same units than the source ellipsoid axes. + * @param tY the geocentric Y translation in same units than the source ellipsoid axes. + * @param tZ the geocentric Z translation in same units than the source ellipsoid axes. + * @param grid interpolation grid in geocentric coordinates, or {@code null} if none. * @param isAbridged {@code true} for the abridged formula, or {@code false} for the complete one. - * @param descriptor The contextual parameter descriptor. + * @param descriptor the contextual parameter descriptor. */ @SuppressWarnings("OverridableMethodCallDuringObjectConstruction") MolodenskyFormula(final Ellipsoid source, final boolean isSource3D, @@ -221,7 +221,7 @@ abstract class MolodenskyFormula extends * Most GIS applications will instead be interested in the {@linkplain #getContextualParameters() * contextual parameters}. * - * @return A copy of the internal parameter values for this transform. + * @return a copy of the internal parameter values for this transform. */ @Debug @Override @@ -260,10 +260,10 @@ abstract class MolodenskyFormula extends *
  • "Flattening difference" (Always for Molodensky, internal WKT only for geocentric interpolations)
    • * * - * @param pg Where to set the parameters. - * @param semiMinor The semi minor axis length, in unit of {@code unit}. - * @param unit The unit of measurement to declare. - * @param Δf The flattening difference to set, or NaN if this method should fetch that value itself. + * @param pg where to set the parameters. + * @param semiMinor the semi minor axis length, in unit of {@code unit}. + * @param unit the unit of measurement to declare. + * @param Δf the flattening difference to set, or NaN if this method should fetch that value itself. */ void completeParameters(final Parameters pg, final double semiMinor, final Unit unit, final double Δf) { /* @@ -278,7 +278,7 @@ abstract class MolodenskyFormula extends /** * Gets the dimension of input points. * - * @return The input dimension, which is 2 or 3. + * @return the input dimension, which is 2 or 3. */ @Override public final int getSourceDimensions() { @@ -288,7 +288,7 @@ abstract class MolodenskyFormula extends /** * Gets the dimension of output points. * - * @return The output dimension, which is 2 or 3. + * @return the output dimension, which is 2 or 3. */ @Override public final int getTargetDimensions() { @@ -306,16 +306,16 @@ abstract class MolodenskyFormula extends * may be slightly different when this method is invoked by {@link InterpolatedMolodenskyTransform}. * * - * @param λ Longitude (radians). - * @param φ Latitude (radians). - * @param h Height above the ellipsoid in unit of semi-major axis. - * @param dstPts The array into which the transformed coordinate is returned, or {@code null}. - * @param dstOff The offset to the location of the transformed point that is stored in the destination array. - * @param tX The {@link #tX} field value (or a slightly different value during geocentric interpolation). - * @param tY The {@link #tY} field value (or a slightly different value during geocentric interpolation). - * @param tZ The {@link #tZ} field value (or a slightly different value during geocentric interpolation). - * @param offset An array of length 3 if this method should use the interpolation grid, or {@code null} otherwise. - * @param derivate {@code true} for computing the derivative, or {@code false} if not needed. + * @param λ longitude (radians). + * @param φ latitude (radians). + * @param h height above the ellipsoid in unit of semi-major axis. + * @param dstPts the array into which the transformed coordinate is returned, or {@code null}. + * @param dstOff the offset to the location of the transformed point that is stored in the destination array. + * @param tX the {@link #tX} field value (or a slightly different value during geocentric interpolation). + * @param tY the {@link #tY} field value (or a slightly different value during geocentric interpolation). + * @param tZ the {@link #tZ} field value (or a slightly different value during geocentric interpolation). + * @param offset an array of length 3 if this method should use the interpolation grid, or {@code null} otherwise. + * @param derivate {@code true} for computing the derivative, or {@code false} if not needed. * @throws TransformException if a point can not be transformed. */ final Matrix transform(final double λ, final double φ, final double h, final double[] dstPts, int dstOff, @@ -364,8 +364,9 @@ abstract class MolodenskyFormula extends λt = λ + (cmsλ * scaleX); φt = φ + (cmsφ * scaleY); if (offset == null) break; - - // Following is executed only in InterpolatedMolodenskyTransform case. + /* + * Following is executed only in InterpolatedMolodenskyTransform case. + */ grid.interpolateInCell(grid.normalizedToGridX(λt), grid.normalizedToGridY(φt), offset); tX = -offset[0]; tY = -offset[1]; Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/MolodenskyTransform.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -134,14 +134,14 @@ public class MolodenskyTransform extends * {@linkplain #getContextualParameters()}.{@linkplain ContextualParameters#completeTransform * completeTransform}(factory, this)}. * - * @param source The source ellipsoid. - * @param isSource3D {@code true} if the source coordinates have a height. - * @param target The target ellipsoid. - * @param isTarget3D {@code true} if the target coordinates have a height. - * @param tX The geocentric X translation in same units than the source ellipsoid axes. - * @param tY The geocentric Y translation in same units than the source ellipsoid axes. - * @param tZ The geocentric Z translation in same units than the source ellipsoid axes. - * @param isAbridged {@code true} for the abridged formula, or {@code false} for the complete one. + * @param source the source ellipsoid. + * @param isSource3D {@code true} if the source coordinates have a height. + * @param target the target ellipsoid. + * @param isTarget3D {@code true} if the target coordinates have a height. + * @param tX the geocentric X translation in same units than the source ellipsoid axes. + * @param tY the geocentric Y translation in same units than the source ellipsoid axes. + * @param tZ the geocentric Z translation in same units than the source ellipsoid axes. + * @param isAbridged {@code true} for the abridged formula, or {@code false} for the complete one. * * @see #createGeodeticTransformation(MathTransformFactory, Ellipsoid, boolean, Ellipsoid, boolean, double, double, double, boolean) */ @@ -162,9 +162,9 @@ public class MolodenskyTransform extends /** * Constructs the inverse of a Molodensky transform. * - * @param inverse The transform for which to create the inverse. - * @param source The source ellipsoid of the given {@code inverse} transform. - * @param target The target ellipsoid of the given {@code inverse} transform. + * @param inverse the transform for which to create the inverse. + * @param source the source ellipsoid of the given {@code inverse} transform. + * @param target the target ellipsoid of the given {@code inverse} transform. */ MolodenskyTransform(final MolodenskyTransform inverse, final Ellipsoid source, final Ellipsoid target) { super(inverse, source, target, inverse.context.getDescriptor()); @@ -174,10 +174,10 @@ public class MolodenskyTransform extends /** * Invoked by constructor and by {@link #getParameterValues()} for setting all parameters other than axis lengths. * - * @param pg Where to set the parameters. - * @param semiMinor Ignored. - * @param unit The unit of measurement to declare. - * @param Δf The flattening difference to set, or NaN if this method should fetch that value itself. + * @param pg where to set the parameters. + * @param semiMinor ignored. + * @param unit the unit of measurement to declare. + * @param Δf the flattening difference to set, or NaN if this method should fetch that value itself. */ @Override final void completeParameters(final Parameters pg, final double semiMinor, final Unit unit, double Δf) { @@ -206,16 +206,16 @@ public class MolodenskyTransform extends *
  • optionally heights above the ellipsoid, in same units than the source ellipsoids axes.
    • * * - * @param factory The factory to use for creating the transform. - * @param source The source ellipsoid. - * @param isSource3D {@code true} if the source coordinates have a height. - * @param target The target ellipsoid. - * @param isTarget3D {@code true} if the target coordinates have a height. - * @param tX The geocentric X translation in same units than the source ellipsoid axes. - * @param tY The geocentric Y translation in same units than the source ellipsoid axes. - * @param tZ The geocentric Z translation in same units than the source ellipsoid axes. - * @param isAbridged {@code true} for the abridged formula, or {@code false} for the complete one. - * @return The transformation between geographic coordinates in degrees. + * @param factory the factory to use for creating the transform. + * @param source the source ellipsoid. + * @param isSource3D {@code true} if the source coordinates have a height. + * @param target the target ellipsoid. + * @param isTarget3D {@code true} if the target coordinates have a height. + * @param tX the geocentric X translation in same units than the source ellipsoid axes. + * @param tY the geocentric Y translation in same units than the source ellipsoid axes. + * @param tZ the geocentric Z translation in same units than the source ellipsoid axes. + * @param isAbridged {@code true} for the abridged formula, or {@code false} for the complete one. + * @return the transformation between geographic coordinates in degrees. * @throws FactoryException if an error occurred while creating a transform. */ public static MathTransform createGeodeticTransformation(final MathTransformFactory factory, @@ -372,7 +372,7 @@ public class MolodenskyTransform extends * Returns the inverse of this Molodensky transform. The source ellipsoid of the returned transform will * be the target ellipsoid of this transform, and conversely. * - * @return A Molodensky transform from the target ellipsoid to the source ellipsoid of this transform. + * @return a Molodensky transform from the target ellipsoid to the source ellipsoid of this transform. */ @Override public MathTransform inverse() { @@ -389,7 +389,7 @@ public class MolodenskyTransform extends * Most GIS applications will instead be interested in the {@linkplain #getContextualParameters() * contextual parameters}. * - * @return A description of the internal parameters. + * @return a description of the internal parameters. */ @Debug @Override Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -102,9 +102,9 @@ public class PassThroughTransform extend * since the most optimal pass-through transform for the given {@code subTransform} is not necessarily * a {@code PassThroughTransform} instance. * - * @param firstAffectedOrdinate Index of the first affected ordinate. - * @param subTransform The sub-transform to apply on modified coordinates. - * @param numTrailingOrdinates Number of trailing ordinates to pass through. + * @param firstAffectedOrdinate index of the first affected ordinate. + * @param subTransform the sub-transform to apply on modified coordinates. + * @param numTrailingOrdinates number of trailing ordinates to pass through. * * @see #create(int, MathTransform, int) */ @@ -138,10 +138,10 @@ public class PassThroughTransform extend * Affected ordinates will range from {@code firstAffectedOrdinate} inclusive to * {@code dimTarget - numTrailingOrdinates} exclusive. * - * @param firstAffectedOrdinate Index of the first affected ordinate. - * @param subTransform The sub-transform to apply on modified coordinates. - * @param numTrailingOrdinates Number of trailing ordinates to pass through. - * @return A pass-through transform, not necessarily a {@code PassThroughTransform} instance. + * @param firstAffectedOrdinate index of the first affected ordinate. + * @param subTransform the sub-transform to apply on modified coordinates. + * @param numTrailingOrdinates number of trailing ordinates to pass through. + * @return a pass-through transform, not necessarily a {@code PassThroughTransform} instance. */ public static MathTransform create(final int firstAffectedOrdinate, final MathTransform subTransform, @@ -214,10 +214,10 @@ public class PassThroughTransform extend if (sj >= 0 && sj < subDim) { final int si; final boolean pass; - if (i == numCol-1) { // Translation term (last column) + if (i == numCol-1) { // Translation term (last column) si = subDim; pass = true; - } else { // Any term other than translation. + } else { // Any term other than translation. si = i - firstAffectedOrdinate; pass = (si >= 0 && si < subDim); } @@ -284,7 +284,7 @@ public class PassThroughTransform extend * Returns the sub-transform to apply on the {@linkplain #getModifiedCoordinates() modified coordinates}. * This is often the sub-transform specified at construction time, but not necessarily. * - * @return The sub-transform. + * @return the sub-transform. * * @see org.apache.sis.referencing.operation.DefaultPassThroughOperation#getOperation() */ @@ -308,7 +308,7 @@ public class PassThroughTransform extend * computes the transform derivative if requested. * * @return {@inheritDoc} - * @throws TransformException If the {@linkplain #subTransform sub-transform} failed. + * @throws TransformException if the {@linkplain #subTransform sub-transform} failed. */ @Override public Matrix transform(final double[] srcPts, final int srcOff, @@ -328,7 +328,7 @@ public class PassThroughTransform extend /** * Transforms many coordinates in a list of ordinal values. * - * @throws TransformException If the {@linkplain #subTransform sub-transform} failed. + * @throws TransformException if the {@linkplain #subTransform sub-transform} failed. */ @Override public void transform(double[] srcPts, int srcOff, final double[] dstPts, int dstOff, int numPts) @@ -374,7 +374,7 @@ public class PassThroughTransform extend /** * Transforms many coordinates in a list of ordinal values. * - * @throws TransformException If the {@linkplain #subTransform sub-transform} failed. + * @throws TransformException if the {@linkplain #subTransform sub-transform} failed. */ @Override public void transform(float[] srcPts, int srcOff, final float[] dstPts, int dstOff, int numPts) @@ -420,7 +420,7 @@ public class PassThroughTransform extend /** * Transforms many coordinates in a list of ordinal values. * - * @throws TransformException If the {@linkplain #subTransform sub-transform} failed. + * @throws TransformException if the {@linkplain #subTransform sub-transform} failed. */ @Override public void transform(final double[] srcPts, int srcOff, final float[] dstPts, int dstOff, int numPts) @@ -429,13 +429,13 @@ public class PassThroughTransform extend final int subDimSource = subTransform.getSourceDimensions(); final int subDimTarget = subTransform.getTargetDimensions(); while (--numPts >= 0) { - for (int i=0; i= 0) { - for (int i=0; i * - * @param formatter The formatter to use. - * @return The WKT element name, which is {@code "PassThrough_MT"}. + * @param formatter the formatter to use. + * @return the WKT element name, which is {@code "PassThrough_MT"}. */ @Override protected String formatTo(final Formatter formatter) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform2D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform2D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform2D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PassThroughTransform2D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -44,9 +44,9 @@ final class PassThroughTransform2D exten /** * Creates a pass through transform. * - * @param firstAffectedOrdinate Index of the first affected ordinate. - * @param subTransform The sub transform. - * @param numTrailingOrdinates Number of trailing ordinates to pass through. + * @param firstAffectedOrdinate index of the first affected ordinate. + * @param subTransform the sub transform. + * @param numTrailingOrdinates number of trailing ordinates to pass through. */ PassThroughTransform2D(final int firstAffectedOrdinate, final MathTransform subTransform, @@ -84,7 +84,7 @@ final class PassThroughTransform2D exten * Gets the derivative of this transform at a point. * * @return {@inheritDoc} - * @throws TransformException If the {@linkplain #getSubTransform() sub-transform} failed. + * @throws TransformException if the {@linkplain #getSubTransform() sub-transform} failed. */ @Override public Matrix derivative(final Point2D point) throws TransformException { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/PowerTransform1D.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -66,7 +66,7 @@ final class PowerTransform1D extends Abs * Instances should be created using the {@linkplain #create(double) factory method}, which * may returns optimized implementations for some particular argument values. * - * @param power The power at which to raise the values. + * @param power the power at which to raise the values. */ protected PowerTransform1D(final double power) { this.power = power; @@ -75,8 +75,8 @@ final class PowerTransform1D extends Abs /** * Constructs a new power transform. * - * @param power The power at which to raise the values. - * @return The math transform. + * @param power the power at which to raise the values. + * @return the math transform. */ public static MathTransform1D create(final double power) { if (power == 1) return IdentityTransform1D.INSTANCE; @@ -171,11 +171,11 @@ final class PowerTransform1D extends Abs /** * Concatenates in an optimized way a {@link MathTransform} {@code other} to this {@code MathTransform}. * - * @param other The math transform to apply. - * @param applyOtherFirst {@code true} if the transformation order is {@code other} followed by {@code this}, - * or {@code false} if the transformation order is {@code this} followed by {@code other}. - * @param factory The factory which is (indirectly) invoking this method, or {@code null} if none. - * @return The combined math transform, or {@code null} if no optimized combined transform is available. + * @param other the math transform to apply. + * @param applyOtherFirst {@code true} if the transformation order is {@code other} followed by {@code this}, + * or {@code false} if the transformation order is {@code this} followed by {@code other}. + * @param factory the factory which is (indirectly) invoking this method, or {@code null} if none. + * @return the combined math transform, or {@code null} if no optimized combined transform is available. */ @Override final MathTransform concatenate(final MathTransform other, final boolean applyOtherFirst, @@ -202,7 +202,7 @@ final class PowerTransform1D extends Abs @Override public boolean equals(final Object object, final ComparisonMode mode) { if (object == this) { - return true; // Optimization for a common case. + return true; // Optimization for a common case. } if (super.equals(object, mode)) { return Numerics.equals(power, ((PowerTransform1D) object).power);