Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -218,9 +218,9 @@ public class BursaWolfParameters extends * <p>Alternatively, numerical fields can also be initialized by a call to * {@link #setPositionVectorTransformation(Matrix, double)}.</p> * - * @param targetDatum The target datum (usually WGS 84) for this set of parameters, or {@code null} if unknown. - * @param domainOfValidity Area or region in which a coordinate transformation based on those Bursa-Wolf parameters - * is valid, or {@code null} is unspecified. + * @param targetDatum the target datum (usually WGS 84) for this set of parameters, or {@code null} if unknown. + * @param domainOfValidity area or region in which a coordinate transformation based on those Bursa-Wolf parameters + * is valid, or {@code null} is unspecified. */ public BursaWolfParameters(final GeodeticDatum targetDatum, final Extent domainOfValidity) { this.targetDatum = targetDatum; @@ -243,7 +243,7 @@ public class BursaWolfParameters extends * revisited. See especially the methods creating a transformation between a pair of {@code GeocentricCRS} or * between a pair of {@code GeographicCRS} (tip: search for {@code DefaultGeodeticDatum}).</p> * - * @param pm The prime meridian of the enclosing {@code GeodeticDatum}. + * @param pm the prime meridian of the enclosing {@code GeodeticDatum}. */ void verify(final PrimeMeridian pm) throws IllegalArgumentException { if (targetDatum != null) { @@ -269,7 +269,7 @@ public class BursaWolfParameters extends * <p>The source datum is the {@link DefaultGeodeticDatum} that contain this {@code BursaWolfParameters} * instance.</p> * - * @return The target datum for this set of parameters, or {@code null} if unknown. + * @return the target datum for this set of parameters, or {@code null} if unknown. */ public GeodeticDatum getTargetDatum() { return targetDatum; @@ -293,7 +293,7 @@ public class BursaWolfParameters extends * the rules about the arrays of length 3, 6 or 7 are derived from the <cite>Well Known Text</cite> (WKT) * version 1 specification. The rule about the array of length 14 is an extension.</div> * - * @return The parameter values as an array of length 3, 6, 7 or 14. + * @return the parameter values as an array of length 3, 6, 7 or 14. * * @since 0.6 */ @@ -325,7 +325,7 @@ public class BursaWolfParameters extends * class. Note however that those extra elements may be used by subclasses like {@link TimeDependentBWP}.</li> * </ul> * - * @param elements The new parameter values, as an array of any length. + * @param elements the new parameter values, as an array of any length. * * @since 0.6 */ @@ -414,8 +414,8 @@ public class BursaWolfParameters extends * Returns the parameter at the given index. If this {@code BursaWolfParameters} is time-dependent, * then the returned value shall be corrected for the given period. * - * @param index 0 for {@code tX}, 1 for {@code tY}, <i>etc.</i> in {@code TOWGS84[…]} order. - * @param period The value computed by {@link #period(Date)}, or {@code null}. + * @param index 0 for {@code tX}, 1 for {@code tY}, <i>etc.</i> in {@code TOWGS84[…]} order. + * @param period the value computed by {@link #period(Date)}, or {@code null}. */ DoubleDouble param(final int index, final DoubleDouble period) { final double p; @@ -470,8 +470,8 @@ public class BursaWolfParameters extends * that concatenation of transformations <var>A</var> → <var>B</var> followed by <var>B</var> → <var>A</var> * gives back the identity transform. * - * @param time Date for which the transformation is desired, or {@code null} for the transformation's reference time. - * @return An affine transform in geocentric space created from this Bursa-Wolf parameters and the given time. + * @param time date for which the transformation is desired, or {@code null} for the transformation's reference time. + * @return an affine transform in geocentric space created from this Bursa-Wolf parameters and the given time. * * @see DefaultGeodeticDatum#getPositionVectorTransformation(GeodeticDatum, Extent) */ @@ -491,15 +491,15 @@ public class BursaWolfParameters extends final DoubleDouble RS = DoubleDouble.createSecondsToRadians(); final DoubleDouble S = param(6, period); S.divide(PPM, 0); - S.add(1, 0); // S = 1 + dS / PPM; - RS.multiply(S); // RS = toRadians(1″) * S; + S.add(1, 0); // S = 1 + dS / PPM; + RS.multiply(S); // RS = toRadians(1″) * S; final DoubleDouble X = param(3, period); X.multiply(RS); final DoubleDouble Y = param(4, period); Y.multiply(RS); final DoubleDouble Z = param(5, period); Z.multiply(RS); final DoubleDouble mX = new DoubleDouble(X); mX.negate(); final DoubleDouble mY = new DoubleDouble(Y); mY.negate(); final DoubleDouble mZ = new DoubleDouble(Z); mZ.negate(); - final Integer O = 0; // Fetch Integer instance only once. + final Integer O = 0; // Fetch Integer instance only once. return Matrices.create(4, 4, new Number[] { S, mZ, Y, param(0, period), Z, S, mX, param(1, period), @@ -517,8 +517,8 @@ public class BursaWolfParameters extends * <a href="http://en.wikipedia.org/wiki/Skew-symmetric_matrix";>skew-symmetric</a> (a.k.a. antisymmetric).</li> * </ul> * - * @param matrix The matrix from which to get Bursa-Wolf parameters. - * @param tolerance The tolerance error for the skew-symmetric matrix test, in units of PPM or arc-seconds (e.g. 1E-8). + * @param matrix the matrix from which to get Bursa-Wolf parameters. + * @param tolerance the tolerance error for the skew-symmetric matrix test, in units of PPM or arc-seconds (e.g. 1E-8). * @throws IllegalArgumentException if the specified matrix does not meet the conditions. * * @see #getPositionVectorTransformation(Date) @@ -540,7 +540,7 @@ public class BursaWolfParameters extends tX = matrix.getElement(0,3); tY = matrix.getElement(1,3); tZ = matrix.getElement(2,3); - if (Matrices.isTranslation(matrix)) { // Optimization for a common case. + if (Matrices.isTranslation(matrix)) { // Optimization for a common case. return; } /* @@ -596,10 +596,10 @@ public class BursaWolfParameters extends * Retrieves the value at the specified row and column of the given matrix, wrapped in a {@code Number}. * The {@code Number} type depends on the matrix accuracy. * - * @param matrix The matrix from which to get the number. - * @param row The row index, from 0 inclusive to {@link Matrix#getNumRow()} exclusive. - * @param column The column index, from 0 inclusive to {@link Matrix#getNumCol()} exclusive. - * @return The current value at the given row and column. + * @param matrix the matrix from which to get the number. + * @param row the row index, from 0 inclusive to {@link Matrix#getNumRow()} exclusive. + * @param column the column index, from 0 inclusive to {@link Matrix#getNumCol()} exclusive. + * @return the current value at the given row and column. */ private static Number getNumber(final Matrix matrix, final int row, final int column) { if (matrix instanceof MatrixSIS) { @@ -614,7 +614,7 @@ public class BursaWolfParameters extends * valid, or {@code null} if unspecified. If an extent was specified at construction time, then that extent is * returned. Otherwise the datum domain of validity (which may be {@code null}) is returned. * - * @return Area or region or timeframe in which the coordinate transformation is valid, or {@code null}. + * @return area or region or timeframe in which the coordinate transformation is valid, or {@code null}. * * @see org.apache.sis.metadata.iso.extent.DefaultExtent */ @@ -628,7 +628,7 @@ public class BursaWolfParameters extends /** * Returns a copy of this object. * - * @return A copy of all parameters. + * @return a copy of all parameters. */ @Override public BursaWolfParameters clone() { @@ -643,7 +643,7 @@ public class BursaWolfParameters extends /** * Compares the specified object with this object for equality. * - * @param object The object to compare with the parameters. + * @param object the object to compare with the parameters. * @return {@code true} if the given object is equal to this {@code BursaWolfParameters}. */ @Override @@ -660,7 +660,7 @@ public class BursaWolfParameters extends /** * Returns a hash value for this object. * - * @return The hash code value. This value does not need to be the same in past or future versions of this class. + * @return the hash code value. This value does not need to be the same in past or future versions of this class. */ @Override public int hashCode() {
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -399,7 +399,7 @@ public abstract class DatumShiftGrid<C e * of the "{@linkplain #getCoordinateToGrid() coordinate to grid}" transform. * The number of translation dimensions is usually 2 or 3, but other values are allowed. * - * @return Number of dimensions of translation vectors. + * @return number of dimensions of translation vectors. */ public abstract int getTranslationDimensions(); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -108,7 +108,7 @@ public class DefaultEngineeringDatum ext * </tr> * </table> * - * @param properties The properties to be given to the identified object. + * @param properties the properties to be given to the identified object. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createEngineeringDatum(Map) */ @@ -123,7 +123,7 @@ public class DefaultEngineeringDatum ext * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param datum The datum to copy. + * @param datum the datum to copy. * * @see #castOrCopy(EngineeringDatum) */ @@ -137,8 +137,8 @@ public class DefaultEngineeringDatum ext * Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged. * Otherwise a new SIS implementation is created and initialized to the attribute values of the given object. * - * @param object The object to get as a SIS implementation, or {@code null} if none. - * @return A SIS implementation containing the values of the given object (may be the + * @param object the object to get as a SIS implementation, or {@code null} if none. + * @return a SIS implementation containing the values of the given object (may be the * given object itself), or {@code null} if the argument was null. */ public static DefaultEngineeringDatum castOrCopy(final EngineeringDatum object) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -19,6 +19,7 @@ package org.apache.sis.referencing.datum import java.util.Map; import java.util.Arrays; import java.util.Date; +import java.util.Objects; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -51,9 +52,6 @@ import static org.apache.sis.util.Argume import static org.apache.sis.util.ArgumentChecks.ensureNonNullElement; import static org.apache.sis.internal.referencing.WKTUtilities.toFormattable; -// Branch-dependent imports -import java.util.Objects; - /** * Defines the location and orientation of an ellipsoid that approximates the shape of the earth. @@ -250,9 +248,9 @@ public class DefaultGeodeticDatum extend * If the target prime meridian is Greenwich, then the datum shift will be applied in a coordinate * system having Greenwich as the prime meridian. * - * @param properties The properties to be given to the identified object. - * @param ellipsoid The ellipsoid. - * @param primeMeridian The prime meridian. + * @param properties the properties to be given to the identified object. + * @param ellipsoid the ellipsoid. + * @param primeMeridian the prime meridian. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createGeodeticDatum(Map, Ellipsoid, PrimeMeridian) */ @@ -285,7 +283,7 @@ public class DefaultGeodeticDatum extend * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param datum The datum to copy. + * @param datum the datum to copy. * * @see #castOrCopy(GeodeticDatum) */ @@ -303,8 +301,8 @@ public class DefaultGeodeticDatum extend * Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged. * Otherwise a new SIS implementation is created and initialized to the attribute values of the given object. * - * @param object The object to get as a SIS implementation, or {@code null} if none. - * @return A SIS implementation containing the values of the given object (may be the + * @param object the object to get as a SIS implementation, or {@code null} if none. + * @return a SIS implementation containing the values of the given object (may be the * given object itself), or {@code null} if the argument was null. */ public static DefaultGeodeticDatum castOrCopy(final GeodeticDatum object) { @@ -331,7 +329,7 @@ public class DefaultGeodeticDatum extend /** * Returns the ellipsoid given at construction time. * - * @return The ellipsoid. + * @return the ellipsoid. */ @Override @XmlElement(name = "ellipsoid", required = true) @@ -342,7 +340,7 @@ public class DefaultGeodeticDatum extend /** * Returns the prime meridian given at construction time. * - * @return The prime meridian. + * @return the prime meridian. */ @Override @XmlElement(name = "primeMeridian", required = true) @@ -354,7 +352,7 @@ public class DefaultGeodeticDatum extend * Returns all Bursa-Wolf parameters specified in the {@code properties} map at construction time. * See class javadoc for a discussion about Bursa-Wolf parameters. * - * @return The Bursa-Wolf parameters, or an empty array if none. + * @return the Bursa-Wolf parameters, or an empty array if none. */ @SuppressWarnings("ReturnOfCollectionOrArrayField") public BursaWolfParameters[] getBursaWolfParameters() { @@ -410,9 +408,9 @@ public class DefaultGeodeticDatum extend * then the instant located midway between start and end time will be taken as the date where to evaluate the * Bursa-Wolf parameters. This is relevant only to {@linkplain TimeDependentBWP time-dependent parameters}. * - * @param targetDatum The target datum. - * @param areaOfInterest The geographic and temporal extent where the transformation should be valid, or {@code null}. - * @return An affine transform from {@code this} to {@code target} in geocentric space, or {@code null} if none. + * @param targetDatum the target datum. + * @param areaOfInterest the geographic and temporal extent where the transformation should be valid, or {@code null}. + * @return an affine transform from {@code this} to {@code target} in geocentric space, or {@code null} if none. * * @see BursaWolfParameters#getPositionVectorTransformation(Date) */ @@ -502,7 +500,7 @@ public class DefaultGeodeticDatum extend * with different data producers. Those rules may be adjusted in any future SIS version according experience * gained while working with more data producers. * - * @param name The name to compare. + * @param name the name to compare. * @return {@code true} if the primary name or at least one alias matches the specified {@code name}. * * @since 0.7 @@ -537,10 +535,10 @@ public class DefaultGeodeticDatum extend /** * Compare this datum with the specified object for equality. * - * @param object The object to compare to {@code this}. - * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or - * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only properties - * relevant to coordinate transformations. + * @param object the object to compare to {@code this}. + * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or + * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only + * properties relevant to coordinate transformations. * @return {@code true} if both objects are equal. */ @Override @@ -577,7 +575,7 @@ public class DefaultGeodeticDatum extend * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()} * for more information. * - * @return The hash code value. This value may change in any future Apache SIS version. + * @return the hash code value. This value may change in any future Apache SIS version. */ @Override protected long computeHashCode() { @@ -632,9 +630,10 @@ public class DefaultGeodeticDatum extend } } } - // For the WKT 2 case, the ANCHOR[…] element is added by Formatter itself. - - formatter.newLine(); // For writing the ID[…] element on its own line. + /* + * For the WKT 2 case, the ANCHOR[…] element is added by Formatter itself. + */ + formatter.newLine(); // For writing the ID[…] element on its own line. if (!isWKT1) { /* * In WKT 2, both "Datum" and "GeodeticDatum" keywords are permitted. The standard recommends Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -17,6 +17,7 @@ package org.apache.sis.referencing.datum; import java.util.Map; +import java.util.Objects; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -33,9 +34,6 @@ import org.apache.sis.util.ComparisonMod import static org.apache.sis.util.ArgumentChecks.ensureNonNull; -// Branch-dependent imports -import java.util.Objects; - /** * Defines the origin of an image coordinate reference system. An image datum is used in a local @@ -127,8 +125,8 @@ public class DefaultImageDatum extends A * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param pixelInCell The way the image grid is associated with the image data attributes. + * @param properties the properties to be given to the identified object. + * @param pixelInCell the way the image grid is associated with the image data attributes. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createImageDatum(Map, PixelInCell) */ @@ -145,7 +143,7 @@ public class DefaultImageDatum extends A * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param datum The datum to copy. + * @param datum the datum to copy. * * @see #castOrCopy(ImageDatum) */ @@ -160,8 +158,8 @@ public class DefaultImageDatum extends A * Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged. * Otherwise a new SIS implementation is created and initialized to the attribute values of the given object. * - * @param object The object to get as a SIS implementation, or {@code null} if none. - * @return A SIS implementation containing the values of the given object (may be the + * @param object the object to get as a SIS implementation, or {@code null} if none. + * @return a SIS implementation containing the values of the given object (may be the * given object itself), or {@code null} if the argument was null. */ public static DefaultImageDatum castOrCopy(final ImageDatum object) { @@ -188,7 +186,7 @@ public class DefaultImageDatum extends A /** * Specification of the way the image grid is associated with the image data attributes. * - * @return The way image grid is associated with image data attributes. + * @return the way image grid is associated with image data attributes. */ @Override @XmlElement(required = true) @@ -199,7 +197,7 @@ public class DefaultImageDatum extends A /** * Compares this datum with the specified object for equality. * - * @param object The object to compare to {@code this}. + * @param object the object to compare to {@code this}. * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only properties * relevant to coordinate transformations. @@ -208,7 +206,7 @@ public class DefaultImageDatum extends A @Override public boolean equals(final Object object, final ComparisonMode mode) { if (object == this) { - return true; // Slight optimization. + return true; // Slight optimization. } if (!super.equals(object, mode)) { return false; @@ -228,7 +226,7 @@ public class DefaultImageDatum extends A * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()} * for more information. * - * @return The hash code value. This value may change in any future Apache SIS version. + * @return the hash code value. This value may change in any future Apache SIS version. */ @Override protected long computeHashCode() { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -116,7 +116,7 @@ public class DefaultParametricDatum exte * </tr> * </table> * - * @param properties The properties to be given to the identified object. + * @param properties the properties to be given to the identified object. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createParametricDatum(Map) */ @@ -134,7 +134,7 @@ public class DefaultParametricDatum exte * <div class="warning"><b>Warning:</b> in a future SIS version, the parameter type may be changed * to {@code org.opengis.referencing.datum.ParametricDatum}. This change is pending GeoAPI revision.</div> * - * @param datum The datum to copy. + * @param datum the datum to copy. */ protected DefaultParametricDatum(final DefaultParametricDatum datum) { super(datum); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -18,6 +18,7 @@ package org.apache.sis.referencing.datum import java.util.Date; import java.util.Map; +import java.util.Objects; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.bind.annotation.XmlElement; @@ -36,9 +37,6 @@ import org.apache.sis.io.wkt.Formattable import static org.apache.sis.util.ArgumentChecks.ensureNonNull; -// Branch-dependent imports -import java.util.Objects; - /** * Defines the origin of a temporal coordinate reference system. @@ -153,8 +151,8 @@ public class DefaultTemporalDatum extend * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param origin The date and time origin of this temporal datum. + * @param properties the properties to be given to the identified object. + * @param origin the date and time origin of this temporal datum. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createTemporalDatum(Map, Date) */ @@ -171,7 +169,7 @@ public class DefaultTemporalDatum extend * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param datum The datum to copy. + * @param datum the datum to copy. * * @see #castOrCopy(TemporalDatum) */ @@ -186,8 +184,8 @@ public class DefaultTemporalDatum extend * Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged. * Otherwise a new SIS implementation is created and initialized to the attribute values of the given object. * - * @param object The object to get as a SIS implementation, or {@code null} if none. - * @return A SIS implementation containing the values of the given object (may be the + * @param object the object to get as a SIS implementation, or {@code null} if none. + * @return a SIS implementation containing the values of the given object (may be the * given object itself), or {@code null} if the argument was null. */ public static DefaultTemporalDatum castOrCopy(final TemporalDatum object) { @@ -214,7 +212,7 @@ public class DefaultTemporalDatum extend /** * Returns the date and time origin of this temporal datum. * - * @return The date and time origin of this temporal datum. + * @return the date and time origin of this temporal datum. */ @Override @XmlSchemaType(name = "dateTime") @@ -227,16 +225,16 @@ public class DefaultTemporalDatum extend /** * Compares this temporal datum with the specified object for equality. * - * @param object The object to compare to {@code this}. - * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or - * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only properties - * relevant to coordinate transformations. + * @param object the object to compare to {@code this}. + * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or + * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only + * properties relevant to coordinate transformations. * @return {@code true} if both objects are equal. */ @Override public boolean equals(final Object object, final ComparisonMode mode) { if (object == this) { - return true; // Slight optimization. + return true; // Slight optimization. } if (!super.equals(object, mode)) { return false; @@ -256,7 +254,7 @@ public class DefaultTemporalDatum extend * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()} * for more information. * - * @return The hash code value. This value may change in any future Apache SIS version. + * @return the hash code value. This value may change in any future Apache SIS version. */ @Override protected long computeHashCode() { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -17,6 +17,7 @@ package org.apache.sis.referencing.datum; import java.util.Map; +import java.util.Objects; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -35,9 +36,6 @@ import org.apache.sis.internal.metadata. import static org.apache.sis.util.ArgumentChecks.ensureNonNull; -// Branch-dependent imports -import java.util.Objects; - /** * Identifies a particular reference level surface used as a zero-height surface. @@ -154,8 +152,8 @@ public class DefaultVerticalDatum extend * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param type The type of this vertical datum. + * @param properties the properties to be given to the identified object. + * @param type the type of this vertical datum. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createVerticalDatum(Map, VerticalDatumType) */ @@ -172,7 +170,7 @@ public class DefaultVerticalDatum extend * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param datum The datum to copy. + * @param datum the datum to copy. * * @see #castOrCopy(VerticalDatum) */ @@ -187,8 +185,8 @@ public class DefaultVerticalDatum extend * Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged. * Otherwise a new SIS implementation is created and initialized to the attribute values of the given object. * - * @param object The object to get as a SIS implementation, or {@code null} if none. - * @return A SIS implementation containing the values of the given object (may be the + * @param object the object to get as a SIS implementation, or {@code null} if none. + * @return a SIS implementation containing the values of the given object (may be the * given object itself), or {@code null} if the argument was null. */ public static DefaultVerticalDatum castOrCopy(final VerticalDatum object) { @@ -244,7 +242,7 @@ public class DefaultVerticalDatum extend * This property provides an information similar to the {@linkplain #getAnchorPoint() anchor definition}, * but in a programmatic way more suitable to coordinate transformation engines.</div> * - * @return The type of this vertical datum. + * @return the type of this vertical datum. */ @Override public VerticalDatumType getVerticalDatumType() { @@ -254,10 +252,10 @@ public class DefaultVerticalDatum extend /** * Compare this vertical datum with the specified object for equality. * - * @param object The object to compare to {@code this}. - * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or - * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only properties - * relevant to coordinate transformations. + * @param object the object to compare to {@code this}. + * @param mode {@link ComparisonMode#STRICT STRICT} for performing a strict comparison, or + * {@link ComparisonMode#IGNORE_METADATA IGNORE_METADATA} for comparing only + * properties relevant to coordinate transformations. * @return {@code true} if both objects are equal. */ @Override @@ -292,7 +290,7 @@ public class DefaultVerticalDatum extend * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()} * for more information. * - * @return The hash code value. This value may change in any future Apache SIS version. + * @return the hash code value. This value may change in any future Apache SIS version. */ @Override protected long computeHashCode() { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -49,10 +49,10 @@ final class Sphere extends DefaultEllips /** * Creates a new sphere using the specified radius. * - * @param properties The properties to be given to the identified object. - * @param radius The equatorial and polar radius. - * @param ivfDefinitive {@code true} if the inverse flattening is definitive. - * @param unit The units of the radius value. + * @param properties the properties to be given to the identified object. + * @param radius the equatorial and polar radius. + * @param ivfDefinitive {@code true} if the inverse flattening is definitive. + * @param unit the units of the radius value. */ protected Sphere(Map<String,?> properties, double radius, boolean ivfDefinitive, Unit<Length> unit) { super(properties, radius, radius, Double.POSITIVE_INFINITY, ivfDefinitive, unit); @@ -103,11 +103,11 @@ final class Sphere extends DefaultEllips * The orthodromic distance is the shortest distance between two points * on a sphere's surface. The orthodromic path is always on a great circle. * - * @param λ1 Longitude of first point (in decimal degrees). - * @param φ1 Latitude of first point (in decimal degrees). - * @param λ2 Longitude of second point (in decimal degrees). - * @param φ2 Latitude of second point (in decimal degrees). - * @return The orthodromic distance (in the units of this ellipsoid's axis). + * @param λ1 longitude of first point (in decimal degrees). + * @param φ1 latitude of first point (in decimal degrees). + * @param λ2 longitude of second point (in decimal degrees). + * @param φ2 latitude of second point (in decimal degrees). + * @return the orthodromic distance (in the units of this ellipsoid's axis). */ @Override public double orthodromicDistance(double λ1, double φ1, double λ2, double φ2) { @@ -116,8 +116,8 @@ final class Sphere extends DefaultEllips final double dx = toRadians(abs(λ2-λ1) % 360); double rho = sin(φ1)*sin(φ2) + cos(φ1)*cos(φ2)*cos(dx); assert abs(rho) < 1.0000001 : rho; - if (rho > +1) rho = +1; // Catch rounding error. - if (rho < -1) rho = -1; // Catch rounding error. + if (rho > +1) rho = +1; // Catch rounding error. + if (rho < -1) rho = -1; // Catch rounding error. return acos(rho) * getSemiMajorAxis(); } } Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -64,6 +64,7 @@ import static org.apache.sis.internal.re * @version 0.6 * @module */ +@SuppressWarnings("CloneableClassWithoutClone") // Fields in this class do not need cloning. public class TimeDependentBWP extends BursaWolfParameters { /** * Serial number for inter-operability with different versions. @@ -118,10 +119,10 @@ public class TimeDependentBWP extends Bu * All numerical parameters are initialized to 0, which correspond to an identity transform. * Callers can assign numerical values to the public fields of interest after construction. * - * @param targetDatum The target datum (usually WGS 84) for this set of parameters. - * @param domainOfValidity Area or region in which a coordinate transformation based on those Bursa-Wolf parameters - * is valid, or {@code null} is unspecified. - * @param timeReference The reference epoch for time-dependent parameters. + * @param targetDatum the target datum (usually WGS 84) for this set of parameters. + * @param domainOfValidity area or region in which a coordinate transformation based on those Bursa-Wolf parameters + * is valid, or {@code null} is unspecified. + * @param timeReference the reference epoch for time-dependent parameters. */ public TimeDependentBWP(final GeodeticDatum targetDatum, final Extent domainOfValidity, final Date timeReference) { super(targetDatum, domainOfValidity); @@ -146,7 +147,7 @@ public class TimeDependentBWP extends Bu /** * Returns the reference epoch for time-dependent parameters. * - * @return The reference epoch for time-dependent parameters. + * @return the reference epoch for time-dependent parameters. */ public Date getTimeReference() { return new Date(timeReference); @@ -173,8 +174,8 @@ public class TimeDependentBWP extends Bu * Returns the parameter at the given index. If this {@code BursaWolfParameters} is time-dependent, * then the returned value shall be corrected for the given period. * - * @param index 0 for {@code tX}, 1 for {@code tY}, <i>etc.</i> in {@code TOWGS84[…]} order. - * @param period The value computed by {@link #period(Date)}, or {@code null}. + * @param index 0 for {@code tX}, 1 for {@code tY}, <i>etc.</i> in {@code TOWGS84[…]} order. + * @param period the value computed by {@link #period(Date)}, or {@code null}. */ @Override final DoubleDouble param(final int index, final DoubleDouble period) { @@ -206,7 +207,7 @@ public class TimeDependentBWP extends Bu * {@link #rX rX}, {@link #rY rY}, {@link #rZ rZ}, {@link #dS dS}, {@link #dtX}, {@link #dtY}, {@link #dtZ}, * {@link #drX}, {@link #drY}, {@link #drZ} and {@link #ddS} in that order. * - * @return The parameter values as an array of length 14. + * @return the parameter values as an array of length 14. * * @since 0.6 */ @@ -221,7 +222,7 @@ public class TimeDependentBWP extends Bu * {@link #dS dS}, {@link #dtX}, {@link #dtY}, {@link #dtZ}, {@link #drX}, {@link #drY}, {@link #drZ} and * {@link #ddS} fields in that order. * - * @param elements The new parameter values, as an array of any length. + * @param elements the new parameter values, as an array of any length. * * @since 0.6 */ @@ -289,7 +290,7 @@ public class TimeDependentBWP extends Bu /** * {@inheritDoc} * - * @return The hash code value. This value does not need to be the same in past or future versions of this class. + * @return the hash code value. This value does not need to be the same in past or future versions of this class. */ @Override public int hashCode() { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -17,6 +17,7 @@ package org.apache.sis.referencing.factory; import java.util.Locale; +import java.util.Objects; import java.util.logging.Level; import java.util.logging.LogRecord; import org.opengis.metadata.citation.Citation; @@ -34,9 +35,6 @@ import org.apache.sis.internal.system.Lo import org.apache.sis.internal.metadata.NameMeaning; import org.apache.sis.internal.referencing.Resources; -// Branch-dependent imports -import java.util.Objects; - /** * Identification of an authority factory by its type, namespace and version. @@ -282,10 +280,11 @@ final class AuthorityFactoryIdentifier { /** * Do the logging of the warning prepared by the above methods. + * This method declares {@code MultiAuthoritiesFactory.getAuthorityFactory(…)} + * as the source of the log since it is the nearest public API. */ private void log(final LogRecord record) { record.setLoggerName(Loggers.CRS_FACTORY); - // MultiAuthoritiesFactory.getAuthorityFactory(…) is the nearest public API. Logging.log(MultiAuthoritiesFactory.class, "getAuthorityFactory", record); } Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -154,10 +154,10 @@ abstract class AuthorityFactoryProxy<T> /** * Creates the object for the given code. * - * @param factory The factory to use for creating the object. - * @param code The code for which to create an object. - * @return The object created from the given code. - * @throws FactoryException If an error occurred while creating the object. + * @param factory the factory to use for creating the object. + * @param code the code for which to create an object. + * @return the object created from the given code. + * @throws FactoryException if an error occurred while creating the object. */ T create(GeodeticAuthorityFactory factory, String code) throws FactoryException { return createFromAPI(factory, code); @@ -167,10 +167,10 @@ abstract class AuthorityFactoryProxy<T> * Creates the object for the given code using only GeoAPI interfaces. * This method is slightly less efficient than the above {@link #create} method. * - * @param factory The factory to use for creating the object. - * @param code The code for which to create an object. - * @return The object created from the given code. - * @throws FactoryException If an error occurred while creating the object. + * @param factory the factory to use for creating the object. + * @param code the code for which to create an object. + * @return the object created from the given code. + * @throws FactoryException if an error occurred while creating the object. */ abstract T createFromAPI(AuthorityFactory factory, String code) throws FactoryException; @@ -589,8 +589,8 @@ abstract class AuthorityFactoryProxy<T> * or some implementation class like {@link org.apache.sis.referencing.crs.DefaultProjectedCRS}. * This method returns the most specific proxy for the given type. * - * @param type The GeoAPI or implementation class. - * @return The most specific proxy for the given {@code type}. + * @param type the GeoAPI or implementation class. + * @return the most specific proxy for the given {@code type}. * @throws IllegalArgumentException if the type does not implement a valid interface. */ @SuppressWarnings("unchecked") @@ -610,8 +610,8 @@ abstract class AuthorityFactoryProxy<T> * The proxy to use for a given type declared in a URN. * For example in the {@code "urn:ogc:def:crs:EPSG::4326"} URN, the proxy to use is {@link #CRS}. * - * @param typeName The URN type. - * @return The proxy for the given type, or {@code null} if the given type is illegal. + * @param typeName the URN type. + * @return the proxy for the given type, or {@code null} if the given type is illegal. */ @SuppressWarnings("unchecked") AuthorityFactoryProxy<? extends T> specialize(final String typeName) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -97,8 +97,8 @@ final class CacheRecord implements Compa /** * Implementation of the public {@link ConcurrentAuthorityFactory#printCacheContent()} method. * - * @param cache The cache. - * @param out The output writer, or {@code null} for the standard output stream. + * @param cache the cache. + * @param out the output writer, or {@code null} for the standard output stream. */ @SuppressWarnings("UseOfSystemOutOrSystemErr") static void printCacheContent(final Map<?,?> cache, PrintWriter out) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -94,7 +94,7 @@ import org.apache.sis.internal.jdk8.JDK8 * {@link CRSAuthorityFactory} and {@link CoordinateOperationAuthorityFactory} interfaces. * Subclasses should select the interfaces that they choose to implement. * - * @param <DAO> the type of factory used as Data Access Object (DAO) + * @param <DAO> the type of factory used as Data Access Object (DAO) * * @author Martin Desruisseaux (IRD, Geomatys) * @since 0.7 @@ -264,9 +264,9 @@ public abstract class ConcurrentAuthorit * If a number of object greater than {@code maxStrongReferences} are created, then the strong references * for the eldest objects will be replaced by weak references. * - * @param dataAccessClass The class of Data Access Object (DAO) created by {@link #newDataAccess()}. - * @param maxStrongReferences The maximum number of objects to keep by strong reference. - * @param maxConcurrentQueries The maximal amount of Data Access Objects to use concurrently. + * @param dataAccessClass the class of Data Access Object (DAO) created by {@link #newDataAccess()}. + * @param maxStrongReferences the maximum number of objects to keep by strong reference. + * @param maxConcurrentQueries the maximal amount of Data Access Objects to use concurrently. * If more than this amount of threads are querying this {@code ConcurrentAuthorityFactory} concurrently, * additional threads will be blocked until a Data Access Object become available. */ @@ -378,7 +378,7 @@ public abstract class ConcurrentAuthorit * creates a new one. We do not add it to the queue now; it will be done by the release(…) method. */ usage = availableDAOs.pollLast(); - remainingDAOs--; // Should be done last when we are sure to not fail. + remainingDAOs--; // Should be done last when we are sure to not fail. } /* * If there is a need to create a new factory, do that outside the synchronized block because this @@ -639,7 +639,7 @@ public abstract class ConcurrentAuthorit * * <p>The default implementation always returns {@code true}.</p> * - * @param factory The Data Access Object which is about to be closed. + * @param factory the Data Access Object which is about to be closed. * @return {@code true} if the given Data Access Object can be closed. */ protected boolean canClose(DAO factory) { @@ -650,7 +650,7 @@ public abstract class ConcurrentAuthorit * Returns the amount of time that {@code ConcurrentAuthorityFactory} will wait before to close a Data Access Object. * This delay is measured from the last time the Data Access Object has been used by a {@code createFoo(String)} method. * - * @param unit The desired unit of measurement for the timeout. + * @param unit the desired unit of measurement for the timeout. * @return the current timeout in the given unit of measurement. */ public long getTimeout(final TimeUnit unit) { @@ -701,8 +701,10 @@ public abstract class ConcurrentAuthorit if (c == null) try { final DAO factory = getDataAccess(); try { - // Cache only in case of success. If we failed, we - // will try again next time this method is invoked. + /* + * Cache only in case of success. If we failed, we + * will try again next time this method is invoked. + */ authority = c = factory.getAuthority(); } finally { release("getAuthority", Citation.class, null); @@ -1613,7 +1615,7 @@ public abstract class ConcurrentAuthorit final StringBuilder buffer = new StringBuilder(); if (type instanceof Class<?>) { buffer.append("Code[“").append(code); - if (buffer.length() > 15) { // Arbitrary limit in string length. + if (buffer.length() > 15) { // Arbitrary limit in string length. buffer.setLength(15); buffer.append('…'); } @@ -1635,7 +1637,7 @@ public abstract class ConcurrentAuthorit * @param proxy The proxy to use for creating the object. * @param code The code of the object to create. * @return the object extracted from the cache or created. - * @throws FactoryException If an error occurred while creating the object. + * @throws FactoryException if an error occurred while creating the object. */ private <T> T create(final AuthorityFactoryProxy<T> proxy, final String code) throws FactoryException { ArgumentChecks.ensureNonNull("code", code); @@ -1654,7 +1656,7 @@ public abstract class ConcurrentAuthorit } finally { release(null, type, code); } - value = result; // For the finally block below. + value = result; // For the finally block below. return result; } } finally { @@ -1852,7 +1854,7 @@ public abstract class ConcurrentAuthorit synchronized (findPool) { final FindEntry c = JDK8.putIfAbsent(findPool, object, entry); if (c != null) { - entry = c; // May happen if the same set has been computed in another thread. + entry = c; // May happen if the same set has been computed in another thread. } // 'finder' should never be null since this method is not invoked directly by this Finder. result = entry.set(finder.isIgnoringAxes(), result, object == searching); @@ -1938,7 +1940,7 @@ public abstract class ConcurrentAuthorit * Keys are sorted by numerical order if possible, or alphabetical order otherwise. * This method is used for debugging purpose only. * - * @param out The output printer, or {@code null} for the {@linkplain System#out standard output stream}. + * @param out the output printer, or {@code null} for the {@linkplain System#out standard output stream}. */ @Debug public void printCacheContent(final PrintWriter out) { @@ -2005,7 +2007,7 @@ public abstract class ConcurrentAuthorit * Clears the given queue and returns all DAO instances that it contained. * The given queue shall be the {@link ConcurrentAuthorityFactory#availableDAOs} queue. * - * @param availableDAOs The queue of factories to close. + * @param availableDAOs the queue of factories to close. */ static <DAO extends GeodeticAuthorityFactory> List<DAO> clear(final Deque<DataAccessRef<DAO>> availableDAOs) { assert Thread.holdsLock(availableDAOs); @@ -2021,8 +2023,8 @@ public abstract class ConcurrentAuthorit * Invokes {@link AutoCloseable#close()} on all the given factories. * Exceptions will be collected and rethrown only after all factories have been closed. * - * @param factories The factories to close. - * @param count Number of valid elements in the {@code factories} array. + * @param factories the factories to close. + * @param count number of valid elements in the {@code factories} array. * @throws Exception the exception thrown by the first factory that failed to close. */ static <DAO extends GeodeticAuthorityFactory> void close(final List<DAO> factories) throws Exception { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -45,8 +45,7 @@ public class FactoryDataException extend /** * Construct an exception with the specified detail message. * - * @param message The detail message. The detail message is saved - * for later retrieval by the {@link #getMessage()} method. + * @param message the detail message, saved for later retrieval by the {@link #getMessage()} method. */ public FactoryDataException(String message) { super(message); @@ -55,10 +54,8 @@ public class FactoryDataException extend /** * Construct an exception with the specified detail message and cause. * - * @param message The detail message. The detail message is saved - * for later retrieval by the {@link #getMessage()} method. - * @param cause The cause for this exception. The cause is saved - * for later retrieval by the {@link #getCause()} method. + * @param message the detail message, saved for later retrieval by the {@link #getMessage()} method. + * @param cause the cause for this exception, saved for later retrieval by the {@link #getCause()} method. */ public FactoryDataException(String message, Throwable cause) { super(message, cause); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -1317,7 +1317,7 @@ public abstract class GeodeticAuthorityF * Returns a string representation of this factory for debugging purpose only. * The string returned by this method may change in any future SIS version. * - * @return A string representation for debugging purpose. + * @return a string representation for debugging purpose. */ @Debug @Override Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.AbstractSet; import java.util.LinkedHashMap; import java.util.NoSuchElementException; +import java.util.Objects; import java.util.Locale; import java.util.logging.Level; import java.util.logging.LogRecord; @@ -43,11 +44,8 @@ import org.apache.sis.util.ArgumentCheck import org.apache.sis.util.Localized; import org.apache.sis.util.Classes; -// Branch-dependent imports -import java.util.Objects; import org.apache.sis.internal.jdk8.JDK8; - /** * A lazy set of {@code IdentifiedObject} instances created from their authority codes only when first needed. * This set delegates {@link IdentifiedObject} creation to the most appropriate {@code createFoo(String)} method Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -49,8 +49,7 @@ public class InvalidGeodeticParameterExc /** * Construct an exception with the specified detail message. * - * @param message the detail message. The detail message is saved - * for later retrieval by the {@link #getMessage()} method. + * @param message the detail message, saved for later retrieval by the {@link #getMessage()} method. */ public InvalidGeodeticParameterException(String message) { super(message); @@ -62,8 +61,7 @@ public class InvalidGeodeticParameterExc * <p>This constructor is not public because its behavior is slightly different than the default JDK behavior: * the message is set to the throwable message instead than to {@code throwable.toString()}.</p> * - * @param cause the cause for this exception. The cause is saved - * for later retrieval by the {@link #getCause()} method. + * @param cause the cause for this exception, saved for later retrieval by the {@link #getCause()} method. */ InvalidGeodeticParameterException(Throwable cause) { super(cause.getLocalizedMessage(), cause); @@ -72,10 +70,8 @@ public class InvalidGeodeticParameterExc /** * Construct an exception with the specified detail message and cause. * - * @param message the detail message. The detail message is saved - * for later retrieval by the {@link #getMessage()} method. - * @param cause the cause for this exception. The cause is saved - * for later retrieval by the {@link #getCause()} method. + * @param message the detail message, saved for later retrieval by the {@link #getMessage()} method. + * @param cause the cause for this exception, saved for later retrieval by the {@link #getCause()} method. */ public InvalidGeodeticParameterException(String message, Throwable cause) { super(message, cause); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -54,8 +54,7 @@ public class MissingFactoryResourceExcep /** * Construct an exception with the specified detail message. * - * @param message The detail message. The detail message is saved - * for later retrieval by the {@link #getMessage()} method. + * @param message the detail message, saved for later retrieval by the {@link #getMessage()} method. */ public MissingFactoryResourceException(String message) { super(message); @@ -66,10 +65,8 @@ public class MissingFactoryResourceExcep * The cause is the exception thrown in the underlying database * (e.g. {@link java.io.IOException} or {@link java.sql.SQLException}). * - * @param message The detail message. The detail message is saved - * for later retrieval by the {@link #getMessage()} method. - * @param cause The cause for this exception. The cause is saved - * for later retrieval by the {@link #getCause()} method. + * @param message the detail message, saved for later retrieval by the {@link #getMessage()} method. + * @param cause the cause for this exception, saved for later retrieval by the {@link #getCause()} method. */ public MissingFactoryResourceException(String message, Throwable cause) { super(message, cause); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -728,7 +728,7 @@ public class MultiAuthoritiesFactory ext * @param proxy the proxy to use for creating the object. * @param code the code of the object to create. * @return the object from one of the authority factory specified at construction time. - * @throws FactoryException If an error occurred while creating the object. + * @throws FactoryException if an error occurred while creating the object. */ final <T> T create(AuthorityFactoryProxy<? extends T> proxy, String code) throws FactoryException { ArgumentChecks.ensureNonNull("code", code); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -38,8 +38,8 @@ public class NoSuchAuthorityFactoryExcep /** * Constructs an exception with the specified detail message and authority name. * - * @param message The detail message, saved for later retrieval by the {@link #getMessage()} method. - * @param authority The authority, saved for retrieval by the {@link #getAuthority()} method. + * @param message the detail message, saved for later retrieval by the {@link #getMessage()} method. + * @param authority the authority, saved for retrieval by the {@link #getAuthority()} method. */ public NoSuchAuthorityFactoryException(final String message, final String authority) { super(message, authority, null, authority); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -78,11 +78,11 @@ final class BursaWolfInfo { * This method does not recognize the time-dependent parameters (EPSG:1040 to 1046) because * they are not used in WKT 1 {@code TOWGS84} elements. * - * @param parameters The Bursa-Wolf parameters to modify. - * @param code The EPSG code for a parameter from the [PARAMETER_CODE] column. - * @param value The value of the parameter from the [PARAMETER_VALUE] column. - * @param unit The unit of the parameter value from the [UOM_CODE] column. - * @param locale The locale, used only if an error message need to be formatted. + * @param parameters the Bursa-Wolf parameters to modify. + * @param code the EPSG code for a parameter from the [PARAMETER_CODE] column. + * @param value the value of the parameter from the [PARAMETER_VALUE] column. + * @param unit the unit of the parameter value from the [UOM_CODE] column. + * @param locale the locale, used only if an error message need to be formatted. * @throws FactoryDataException if the code is unrecognized. */ static void setBursaWolfParameter(final BursaWolfParameters parameters, final int code, @@ -175,7 +175,7 @@ final class BursaWolfInfo { /** * Gets the domain of validity. The result is cached. * - * @param factory The factory to use for creating {@code Extent} instances. + * @param factory the factory to use for creating {@code Extent} instances. */ Extent getDomainOfValidity(final GeodeticAuthorityFactory factory) throws FactoryException { if (extent == null && domainOfValidity != 0) { @@ -190,9 +190,9 @@ final class BursaWolfInfo { * first one is retained. This presume that the instances have already been sorted for preference order * before to invoke this method. * - * @param factory The factory to use for creating {@code Extent} instances. - * @param candidates The Bursa-Wolf parameters candidates. - * @param addTo Where to add the instances retained by this method. + * @param factory the factory to use for creating {@code Extent} instances. + * @param candidates the Bursa-Wolf parameters candidates. + * @param addTo where to add the instances retained by this method. */ static void filter(final GeodeticAuthorityFactory factory, final BursaWolfInfo[] candidates, final List<BursaWolfInfo> addTo) throws FactoryException Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -55,8 +55,8 @@ final class CoordinateOperationSet exten /** * Adds the specified authority code. * - * @param code The code for the {@link CoordinateOperation} to add. - * @param crs The code for the CRS to create instead of the operation, or {@code null} if none. + * @param code the code for the {@link CoordinateOperation} to add. + * @param crs the code for the CRS to create instead of the operation, or {@code null} if none. */ final void addAuthorityCode(final String code, final Integer crs) { if (crs != null) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -2217,9 +2217,9 @@ addURIs: for (int i=0; ; i++) { * <p><strong>WARNING:</strong> The EPSG database uses "{@code ORDER}" as a column name. * This is tolerated by Access, but MySQL does not accept that name.</p> * - * @param cs the EPSG code for the coordinate system. - * @param dimension of the coordinate system, which is also the size of the returned array. - * @return An array of coordinate system axis. + * @param cs the EPSG code for the coordinate system. + * @param dimension of the coordinate system, which is also the size of the returned array. + * @return an array of coordinate system axis. * @throws SQLException if an error occurred during database access. * @throws FactoryException if the code has not been found. */ @@ -2734,8 +2734,8 @@ next: while (r.next()) { * <tr><td>6326</td> <td>NAD83(2011) to NAVD88 height (1)</td></tr> * </table></div> * - * @param code Value allocated by EPSG. - * @return The operation for the given code. + * @param code value allocated by EPSG. + * @return the operation for the given code. * @throws NoSuchAuthorityCodeException if the specified {@code code} was not found. * @throws FactoryException if the object creation failed for some other reason. */ Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -19,6 +19,7 @@ package org.apache.sis.referencing.opera import java.util.Map; import java.util.List; import java.util.IdentityHashMap; +import java.util.Objects; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlSeeAlso; @@ -57,9 +58,6 @@ import org.apache.sis.util.ComparisonMod import static org.apache.sis.util.Utilities.deepEquals; -// Branch-dependent imports -import java.util.Objects; - /** * Shared implementation for {@link DefaultConversion} and {@link DefaultTransformation}. Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -16,6 +16,7 @@ */ package org.apache.sis.referencing.operation; +import java.util.Objects; import org.opengis.referencing.cs.EllipsoidalCS; import org.opengis.referencing.cs.CoordinateSystem; import org.opengis.referencing.crs.CoordinateReferenceSystem; @@ -25,9 +26,6 @@ import org.apache.sis.referencing.Identi import org.apache.sis.util.CharSequences; import org.apache.sis.util.Classes; -// Branch-dependent imports -import java.util.Objects; - /** * A pair of source-destination {@link CoordinateReferenceSystem} objects. Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -84,8 +84,8 @@ public class CoordinateOperationContext /** * Creates a new context with the given area of interest and desired accuracy. * - * @param area The area of interest, or {@code null} if none. - * @param accuracy The desired accuracy in metres, or 0 for the best accuracy available. + * @param area the area of interest, or {@code null} if none. + * @param accuracy the desired accuracy in metres, or 0 for the best accuracy available. * See {@link #getDesiredAccuracy()} for more details about what we mean by <cite>"best accuracy"</cite>. */ public CoordinateOperationContext(final Extent area, final double accuracy) { @@ -97,7 +97,7 @@ public class CoordinateOperationContext /** * Returns the spatio-temporal area of interest, or {@code null} if none. * - * @return The spatio-temporal area of interest, or {@code null} if none. + * @return the spatio-temporal area of interest, or {@code null} if none. * * @see Extents#getGeographicBoundingBox(Extent) */ @@ -108,7 +108,7 @@ public class CoordinateOperationContext /** * Sets the spatio-temporal area of interest, or {@code null} if none. * - * @param area The spatio-temporal area of interest, or {@code null} if none. + * @param area the spatio-temporal area of interest, or {@code null} if none. */ public void setAreaOfInterest(Extent area) { if (area != null) { @@ -124,7 +124,7 @@ public class CoordinateOperationContext * <p>The reverse operation can be done with <code>{@linkplain Extents#getGeographicBoundingBox(Extent) * Extents.getGeographicBoundingBox}({@linkplain #getAreaOfInterest()})</code>.</p> * - * @param area The geographic area of interest, or {@code null} if none. + * @param area the geographic area of interest, or {@code null} if none. */ public void setAreaOfInterest(final GeographicBoundingBox area) { areaOfInterest = setGeographicBoundingBox(areaOfInterest, area); @@ -153,7 +153,7 @@ public class CoordinateOperationContext * But if all coordinate operations defined by the authority use the Abridged Molodensky method, then SIS will ignore * the Molodensky one.</p> * - * @return The desired accuracy in metres. + * @return the desired accuracy in metres. */ public double getDesiredAccuracy() { return desiredAccuracy; @@ -164,7 +164,7 @@ public class CoordinateOperationContext * A value of 0 means to search for the most accurate operation. * See {@link #getDesiredAccuracy()} for more details about what we mean by <cite>"most accurate"</cite>. * - * @param accuracy The desired accuracy in metres. + * @param accuracy the desired accuracy in metres. */ public void setDesiredAccuracy(final double accuracy) { ArgumentChecks.ensurePositive("accuracy", accuracy); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -735,10 +735,10 @@ public class CoordinateOperationFinder e * various combinations of source and target components. A preference is given for components of the same * type (e.g. source {@link GeodeticCRS} with target {@code GeodeticCRS}, <i>etc.</i>). * - * @param sourceCRS input coordinate reference system. - * @param sourceComponents components of the source CRS. - * @param targetCRS output coordinate reference system. - * @param targetComponents components of the target CRS. + * @param sourceCRS input coordinate reference system. + * @param sourceComponents components of the source CRS. + * @param targetCRS output coordinate reference system. + * @param targetComponents components of the target CRS. * @return a coordinate operation from {@code sourceCRS} to {@code targetCRS}. * @throws FactoryException if the operation can not be constructed. */ @@ -883,11 +883,11 @@ public class CoordinateOperationFinder e * where the {@code name} identifier is {@link #DATUM_SHIFT} or {@link #ELLIPSOID_CHANGE}, * the operation will be a {@link Transformation} instance instead of {@link Conversion}. * - * @param name The identifier for the operation to be created. - * @param sourceCRS The source coordinate reference system. - * @param targetCRS The target coordinate reference system. - * @param matrix The matrix which describe an affine transform operation. - * @return The conversion or transformation. + * @param name the identifier for the operation to be created. + * @param sourceCRS the source coordinate reference system. + * @param targetCRS the target coordinate reference system. + * @param matrix the matrix which describe an affine transform operation. + * @return the conversion or transformation. * @throws FactoryException if the operation can not be created. */ private CoordinateOperation createFromAffineTransform(final Identifier name, @@ -908,9 +908,9 @@ public class CoordinateOperationFinder e * If one of the given operation steps performs a change of axis order or units, * then that change will be merged with the other operation instead of creating an {@link ConcatenatedOperation}. * - * @param step1 The first step, or {@code null} for the identity operation. - * @param step2 The second step, or {@code null} for the identity operation. - * @return A concatenated operation, or {@code null} if all arguments were null. + * @param step1 the first step, or {@code null} for the identity operation. + * @param step2 the second step, or {@code null} for the identity operation. + * @return a concatenated operation, or {@code null} if all arguments were null. * @throws FactoryException if the operation can't be constructed. */ private CoordinateOperation concatenate(final CoordinateOperation step1, @@ -972,10 +972,10 @@ public class CoordinateOperationFinder e * then it will be included as part of the second operation instead of creating a {@link ConcatenatedOperation}. * If a concatenated operation is created, it will get an automatically generated name. * - * @param step1 The first step, or {@code null} for the identity operation. - * @param step2 The second step, or {@code null} for the identity operation. - * @param step3 The third step, or {@code null} for the identity operation. - * @return A concatenated operation, or {@code null} if all arguments were null. + * @param step1 the first step, or {@code null} for the identity operation. + * @param step2 the second step, or {@code null} for the identity operation. + * @param step3 the third step, or {@code null} for the identity operation. + * @return a concatenated operation, or {@code null} if all arguments were null. * @throws FactoryException if the operation can not be constructed. */ private CoordinateOperation concatenate(final CoordinateOperation step1, @@ -1057,9 +1057,9 @@ public class CoordinateOperationFinder e * Returns an error message for "No path found from sourceCRS to targetCRS". * This is used for the construction of {@link OperationNotFoundException}. * - * @param source the source CRS. - * @param target the target CRS. - * @return A default error message. + * @param source the source CRS. + * @param target the target CRS. + * @return a default error message. */ private static String notFoundMessage(final IdentifiedObject source, final IdentifiedObject target) { return Resources.format(Resources.Keys.CoordinateOperationNotFound_2, CRSPair.label(source), CRSPair.label(target)); @@ -1070,7 +1070,7 @@ public class CoordinateOperationFinder e * This is used for the construction of {@link OperationNotFoundException}. * * @param crs the CRS having a conversion that can not be inverted. - * @return A default error message. + * @return a default error message. */ private static String canNotInvert(final GeneralDerivedCRS crs) { return Resources.format(Resources.Keys.NonInvertibleOperation_1, crs.getConversionFromBase().getName().getCode());
