Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -99,9 +99,9 @@ public class DefaultUserDefinedCS extend
* </tr>
* </table>
*
- * @param properties The properties to be given to the identified object.
- * @param axis0 The first axis.
- * @param axis1 The second axis.
+ * @param properties the properties to be given to the identified object.
+ * @param axis0 the first axis.
+ * @param axis1 the second axis.
*
* @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createUserDefinedCS(Map, CoordinateSystemAxis, CoordinateSystemAxis)
*/
@@ -117,10 +117,10 @@ public class DefaultUserDefinedCS extend
* The properties map is given unchanged to the
* {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}.
*
- * @param properties Set of properties. Should contains at least {@code "name"}.
- * @param axis0 The first axis.
- * @param axis1 The second axis.
- * @param axis2 The third axis.
+ * @param properties the properties to be given to the identified object.
+ * @param axis0 the first axis.
+ * @param axis1 the second axis.
+ * @param axis2 the third axis.
*
* @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createUserDefinedCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis)
*/
@@ -139,7 +139,7 @@ public class DefaultUserDefinedCS extend
*
* <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
*
- * @param cs The coordinate system to copy.
+ * @param cs the coordinate system to copy.
*
* @see #castOrCopy(UserDefinedCS)
*/
@@ -153,8 +153,8 @@ public class DefaultUserDefinedCS 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 DefaultUserDefinedCS castOrCopy(final UserDefinedCS object) {
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -118,8 +118,8 @@ public class DefaultVerticalCS extends A
* </tr>
* </table>
*
- * @param properties The properties to be given to the identified object.
- * @param axis The single axis (e.g. “height” or “depth”).
+ * @param properties the properties to be given to the identified object.
+ * @param axis the single axis (e.g. “height” or “depth”).
*
* @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createVerticalCS(Map, CoordinateSystemAxis)
*/
@@ -134,7 +134,7 @@ public class DefaultVerticalCS extends A
*
* <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
*
- * @param cs The coordinate system to copy.
+ * @param cs the coordinate system to copy.
*
* @see #castOrCopy(VerticalCS)
*/
@@ -148,8 +148,8 @@ public class DefaultVerticalCS 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 DefaultVerticalCS castOrCopy(final VerticalCS object) {
@@ -169,10 +169,10 @@ public class DefaultVerticalCS extends A
return INVALID_DIRECTION;
}
unit = unit.getSystemUnit();
- if (unit.equals(Units.METRE) || // Most usual case.
- unit.equals(Units.PASCAL) || // Height or depth estimated by the atmospheric or ocean pressure.
- unit.equals(Units.SECOND) || // Depth estimated by the time needed for an echo to travel.
- unit.equals(Units.UNITY)) // Sigma-level (percentage from sea surface to ocean floor).
+ if (unit.equals(Units.METRE) || // Most usual case.
+ unit.equals(Units.PASCAL) || // Height or depth estimated by the atmospheric or ocean pressure.
+ unit.equals(Units.SECOND) || // Depth estimated by the time needed for an echo to travel.
+ unit.equals(Units.UNITY)) // Sigma-level (percentage from sea surface to ocean floor).
{
return VALID;
}
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -92,8 +92,8 @@ final class DirectionAlongMeridian exten
/**
* Creates a direction.
*
- * @param baseDirection The base direction, which must be {@link AxisDirection#NORTH} or {@link AxisDirection#SOUTH}.
- * @param meridian The meridian in degrees, relative to a unspecified (usually Greenwich) prime meridian.
+ * @param baseDirection the base direction, which must be {@link AxisDirection#NORTH} or {@link AxisDirection#SOUTH}.
+ * @param meridian the meridian in degrees, relative to a unspecified (usually Greenwich) prime meridian.
* Meridians in the East hemisphere are positive and meridians in the West hemisphere are negative.
*/
DirectionAlongMeridian(final AxisDirection baseDirection, final double meridian) {
@@ -131,8 +131,8 @@ final class DirectionAlongMeridian exten
* If the specified name is a direction along some specific meridian,
* returns information about that. Otherwise returns {@code null}.
*
- * @param name The name to parse.
- * @return The parsed name, or {@code null} if it is not a direction along a meridian.
+ * @param name the name to parse.
+ * @return the parsed name, or {@code null} if it is not a direction along a meridian.
* @throws IllegalArgumentException if the given name looks like a direction along a meridian,
* but an error occurred during parsing.
*/
@@ -143,14 +143,14 @@ final class DirectionAlongMeridian exten
return null;
}
final AxisDirection baseDirection = AxisDirections.find(m.group(1), NORTH_SOUTH);
- if (baseDirection == null) { // We require "North" or "South" direction.
+ if (baseDirection == null) { // We require "North" or "South" direction.
return null;
}
double meridian = Double.parseDouble(m.group(2));
final String group = m.group(3);
if (group != null) {
final AxisDirection sgn = AxisDirections.find(group, EAST_WEST);
- if (sgn == null) { // We require "East" or "West" direction.
+ if (sgn == null) { // We require "East" or "West" direction.
return null;
}
if (sgn != AxisDirections.absolute(sgn)) {
@@ -224,8 +224,8 @@ final class DirectionAlongMeridian exten
return c;
}
final double angle = angle(that);
- if (angle < 0) return +1; // Really the opposite sign.
- if (angle > 0) return -1; // Really the opposite sign.
+ if (angle < 0) return +1; // Really the opposite sign.
+ if (angle > 0) return -1; // Really the opposite sign.
return 0;
}
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -192,8 +192,8 @@ final class Normalizer implements Compar
* The sorting is performed in place. This method returns {@code true} if
* at least one axis moved as result of this method call.
*
- * @param axes The axes to sort.
- * @param angularUnitOrder -1 for sorting angular units first, +1 for sorting them last, or 0 if neutral.
+ * @param axes the axes to sort.
+ * @param angularUnitOrder -1 for sorting angular units first, +1 for sorting them last, or 0 if neutral.
*/
static boolean sort(final CoordinateSystemAxis[] axes, final int angularUnitOrder) {
final Normalizer[] wrappers = new Normalizer[axes.length];
@@ -214,9 +214,9 @@ final class Normalizer implements Compar
* Returns a new axis with the same properties (except identifiers) than given axis,
* but with normalized axis direction and unit of measurement.
*
- * @param axis The axis to normalize.
- * @param changes The change to apply on axis direction and units.
- * @return An axis using normalized direction and units, or {@code axis} if there is no change.
+ * @param axis the axis to normalize.
+ * @param changes the change to apply on axis direction and units.
+ * @return an axis using normalized direction and units, or {@code axis} if there is no change.
*/
static CoordinateSystemAxis normalize(final CoordinateSystemAxis axis, final AxisFilter changes) {
final Unit<?> unit = axis.getUnit();
@@ -274,10 +274,10 @@ final class Normalizer implements Compar
* Optionally normalizes and reorders the axes in an attempt to get a right-handed system.
* If no axis change is needed, then this method returns {@code null}.
*
- * @param cs The coordinate system to normalize.
- * @param changes The change to apply on axis direction and units.
- * @param reorder {@code true} for reordering the axis for a right-handed coordinate system.
- * @return The normalized coordinate system, or {@code null} if no normalization is needed.
+ * @param cs the coordinate system to normalize.
+ * @param changes the change to apply on axis direction and units.
+ * @param reorder {@code true} for reordering the axis for a right-handed coordinate system.
+ * @return the normalized coordinate system, or {@code null} if no normalization is needed.
*/
static AbstractCS normalize(final CoordinateSystem cs, final AxisFilter changes, final boolean reorder) {
boolean changed = false;
@@ -352,7 +352,7 @@ final class Normalizer implements Compar
* of -60° still locate the same point in the old and the new coordinate system. But the preferred way
* to locate that point become the 300° value if the longitude range has been shifted to positive values.</p>
*
- * @return A coordinate system using the given kind of longitude range, or {@code null} if no change is needed.
+ * @return a coordinate system using the given kind of longitude range, or {@code null} if no change is needed.
*/
private static AbstractCS shiftAxisRange(final CoordinateSystem cs) {
boolean changed = false;
@@ -402,8 +402,8 @@ final class Normalizer implements Compar
* Returns a coordinate system equivalent to the given one but with axes rearranged according the given convention.
* If the given coordinate system is already compatible with the given convention, then returns {@code null}.
*
- * @param convention The axes convention for which a coordinate system is desired.
- * @return A coordinate system compatible with the given convention, or {@code null} if no change is needed.
+ * @param convention the axes convention for which a coordinate system is desired.
+ * @return a coordinate system compatible with the given convention, or {@code null} if no change is needed.
*
* @see AbstractCS#forConvention(AxesConvention)
*/
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -197,7 +197,7 @@ public class AbstractDatum extends Abstr
* </tr>
* </table>
*
- * @param properties The properties to be given to the identified object.
+ * @param properties the properties to be given to the identified object.
*/
public AbstractDatum(final Map<String,?> properties) {
super(properties);
@@ -214,7 +214,7 @@ public class AbstractDatum extends Abstr
*
* <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.
*/
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.</li>
* </ul>
*
- * @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.</li>
* </ul>
*
- * @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
* <p>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.</p>
*
- * @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 <cite>Well Known Text</cite> (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/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/BursaWolfParameters.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DatumShiftGrid.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultEngineeringDatum.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultGeodeticDatum.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultImageDatum.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultParametricDatum.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -119,7 +119,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
*
* <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(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/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultTemporalDatum.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/DefaultVerticalDatum.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/Sphere.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/TimeDependentBWP.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryIdentifier.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/AuthorityFactoryProxy.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/CacheRecord.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/ConcurrentAuthorityFactory.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/FactoryDataException.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticAuthorityFactory.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -1303,7 +1303,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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/IdentifiedObjectSet.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/InvalidGeodeticParameterException.java [UTF-8] Sat Jan 21 09:00:40 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);
|