From commits-return-8723-apmail-sis-commits-archive=sis.apache.org@sis.apache.org Sat Jan 21 08:49:59 2017
Return-Path: This constructor performs a shallow copy, i.e. the properties are not cloned. This constructor performs a shallow copy, i.e. the properties are not cloned.
This constructor performs a shallow copy, i.e. the properties are not cloned.
* - * @param datum The datum to copy. + * @param datum the datum to copy. */ protected AbstractDatum(final Datum datum) { super(datum); @@ -247,8 +247,8 @@ public class AbstractDatum extends Abstr * properties contained in the given object are not recursively copied. * * - * @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 AbstractDatum castOrCopy(final Datum object) { @@ -260,7 +260,7 @@ public class AbstractDatum extends Abstr * The default implementation returns {@code Datum.class}. * Subclasses implementing a more specific GeoAPI interface shall override this method. * - * @return The datum interface implemented by this class. + * @return the datum interface implemented by this class. */ @Override public Class extends Datum> getInterface() { @@ -285,7 +285,7 @@ public class AbstractDatum extends Abstr * {@linkplain DefaultTemporalDatum#getOrigin() origin} instead. * * - * @return Description, possibly including coordinates, of the point or points used to anchor the datum to the Earth. + * @return description, possibly including coordinates, of the point or points used to anchor the datum to the Earth. */ @Override @XmlElement(name = "anchorDefinition") @@ -300,7 +300,7 @@ public class AbstractDatum extends Abstr *If an old datum is superseded by a new datum, then the realization epoch for the new datum * defines the upper limit for the validity of the old datum.
* - * @return The time after which this datum definition is valid, or {@code null} if none. + * @return the time after which this datum definition is valid, or {@code null} if none. */ @Override @XmlSchemaType(name = "date") @@ -312,7 +312,7 @@ public class AbstractDatum extends Abstr /** * Returns the region or timeframe in which this datum is valid, or {@code null} if unspecified. * - * @return Area or region or timeframe in which this datum is valid, or {@code null}. + * @return area or region or timeframe in which this datum is valid, or {@code null}. * * @see org.apache.sis.metadata.iso.extent.DefaultExtent */ @@ -325,7 +325,7 @@ public class AbstractDatum extends Abstr /** * Returns the domain or limitations of usage, or {@code null} if unspecified. * - * @return Description of domain of usage, or limitations of usage, for which this datum object is valid. + * @return description of domain of usage, or limitations of usage, for which this datum object is valid. */ @Override @XmlElement(name = "scope", required = true) @@ -352,7 +352,7 @@ public class AbstractDatum extends Abstr * 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}. */ @Override @@ -389,10 +389,10 @@ public class AbstractDatum extends Abstr * {@linkplain #getAnchorPoint() anchor point}, {@linkplain #getRealizationEpoch() realization epoch}, * {@linkplain #getDomainOfValidity() domain of validity} and the {@linkplain #getScope() scope}. * - * @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 @@ -441,7 +441,7 @@ public class AbstractDatum extends Abstr * 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() { @@ -452,8 +452,8 @@ public class AbstractDatum extends Abstr * Formats the inner part of the Well Known Text (WKT) representation for this datum. * See {@link AbstractIdentifiedObject#formatTo(Formatter)} for more information. * - * @param formatter The formatter where to format the inner content of this WKT element. - * @return The {@linkplain org.apache.sis.io.wkt.KeywordCase#CAMEL_CASE CamelCase} keyword + * @param formatter the formatter where to format the inner content of this WKT element. + * @return the {@linkplain org.apache.sis.io.wkt.KeywordCase#CAMEL_CASE CamelCase} keyword * for the WKT element, or {@code null} if unknown. */ @Override Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Sat Jan 21 08:49:49 2017 @@ -218,9 +218,9 @@ public class BursaWolfParameters extends *Alternatively, numerical fields can also be initialized by a call to * {@link #setPositionVectorTransformation(Matrix, double)}.
* - * @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}). * - * @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 *The source datum is the {@link DefaultGeodeticDatum} that contain this {@code BursaWolfParameters} * instance.
* - * @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 Well Known Text (WKT) * version 1 specification. The rule about the array of length 14 is an extension. * - * @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}. * * - * @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}, etc. 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}, etc. 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 A → B followed by B → A * 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 * skew-symmetric (a.k.a. antisymmetric). * * - * @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/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] Sat Jan 21 08:49:49 2017 @@ -399,7 +399,7 @@ public abstract class DatumShiftGridThis constructor performs a shallow copy, i.e. the properties are not cloned.
* - * @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/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Sat Jan 21 08:49:49 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 * *This constructor performs a shallow copy, i.e. the properties are not cloned.
* - * @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/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] Sat Jan 21 08:49:49 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 * * * - * @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 * *This constructor performs a shallow copy, i.e. the properties are not cloned.
* - * @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/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java [UTF-8] Sat Jan 21 08:49:49 2017 @@ -119,7 +119,7 @@ public class DefaultParametricDatum exte * * * - * @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 * *This constructor performs a shallow copy, i.e. the properties are not cloned.
* - * @param datum The datum to copy. + * @param datum the datum to copy. * * @see #castOrCopy(ParametricDatum) */ @@ -148,8 +148,8 @@ public class DefaultParametricDatum exte * 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 DefaultParametricDatum castOrCopy(final ParametricDatum object) { Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] Sat Jan 21 08:49:49 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 * * * - * @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 * *This constructor performs a shallow copy, i.e. the properties are not cloned.
* - * @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/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] Sat Jan 21 08:49:49 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 * * * - * @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 * *This constructor performs a shallow copy, i.e. the properties are not cloned.
* - * @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. * - * @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/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java?rev=1779702&r1=1779701&r2=1779702&view=diff ============================================================================== --- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] (original) +++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] Sat Jan 21 08:49:49 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(MapThe default implementation always returns {@code true}.
* - * @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) { @@ -647,7 +647,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) { @@ -698,8 +698,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); @@ -1610,7 +1612,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('…'); } @@ -1632,7 +1634,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. */ privateThis 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()}.
* - * @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);