Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -129,9 +129,9 @@ public class DefaultParametricCRS extend * {@code org.opengis.referencing.datum.ParametricDatum} and {@code org.opengis.referencing.cs.ParametricCS} * Those change are pending GeoAPI revision.</div> * - * @param properties The properties to be given to the coordinate reference system. - * @param datum The datum. - * @param cs The coordinate system. + * @param properties the properties to be given to the coordinate reference system. + * @param datum the datum. + * @param cs the coordinate system. */ public DefaultParametricCRS(final Map<String,?> properties, final DefaultParametricDatum datum, @@ -152,7 +152,7 @@ public class DefaultParametricCRS extend * <div class="warning"><b>Warning:</b> in a future SIS version, the parameter type may be changed * to {@code org.opengis.referencing.crs.ParametricCRS}. This change is pending GeoAPI revision.</div> * - * @param crs The coordinate reference system to copy. + * @param crs the coordinate reference system to copy. */ protected DefaultParametricCRS(final DefaultParametricCRS crs) { super(crs); @@ -162,7 +162,7 @@ public class DefaultParametricCRS extend /** * Returns the datum. * - * @return The datum. + * @return the datum. */ @Override @XmlElement(name = "parametricDatum", required = true) @@ -173,7 +173,7 @@ public class DefaultParametricCRS extend /** * Returns the coordinate system. * - * @return The coordinate system. + * @return the coordinate system. */ @Override @XmlElement(name = "parametricCS", required = true)
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -77,7 +77,7 @@ import static org.apache.sis.internal.re * * @see org.apache.sis.referencing.factory.GeodeticAuthorityFactory#createProjectedCRS(String) */ -@XmlType(name="ProjectedCRSType", propOrder = { +@XmlType(name = "ProjectedCRSType", propOrder = { "baseCRS", "coordinateSystem" }) Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -145,9 +145,9 @@ public class DefaultTemporalCRS extends * </tr> * </table> * - * @param properties The properties to be given to the coordinate reference system. - * @param datum The datum. - * @param cs The coordinate system. + * @param properties the properties to be given to the coordinate reference system. + * @param datum the datum. + * @param cs the coordinate system. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createTemporalCRS(Map, TemporalDatum, TimeCS) */ @@ -167,7 +167,7 @@ public class DefaultTemporalCRS extends * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param crs The coordinate reference system to copy. + * @param crs the coordinate reference system to copy. * * @see #castOrCopy(TemporalCRS) */ @@ -182,8 +182,8 @@ public class DefaultTemporalCRS extends * 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 DefaultTemporalCRS castOrCopy(final TemporalCRS object) { @@ -218,7 +218,7 @@ public class DefaultTemporalCRS extends /** * Returns the datum. * - * @return The datum. + * @return the datum. */ @Override @XmlElement(name = "temporalDatum", required = true) @@ -229,7 +229,7 @@ public class DefaultTemporalCRS extends /** * Returns the coordinate system. * - * @return The coordinate system. + * @return the coordinate system. */ @Override @XmlElement(name = "timeCS", required = true) @@ -261,8 +261,8 @@ public class DefaultTemporalCRS extends * * <p>This method is the converse of {@link #toValue(Date)}.</p> * - * @param value A value in this axis unit. - * @return The value as a {@linkplain Date date}, or {@code null} if the given value is NaN or infinite. + * @param value a value in this axis unit. + * @return the value as a {@linkplain Date date}, or {@code null} if the given value is NaN or infinite. */ public Date toDate(final double value) { if (Double.isNaN(value) || Double.isInfinite(value)) { @@ -280,8 +280,8 @@ public class DefaultTemporalCRS extends * * <p>This method is the converse of {@link #toDate(double)}.</p> * - * @param time The value as a {@linkplain Date date}, or {@code null}. - * @return value A value in this axis unit, or {@link Double#NaN NaN} if the given time is {@code null}. + * @param time the value as a {@linkplain Date date}, or {@code null}. + * @return the value in this axis unit, or {@link Double#NaN NaN} if the given time is {@code null}. */ public double toValue(final Date time) { if (time == null) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -124,9 +124,9 @@ public class DefaultVerticalCRS extends * </tr> * </table> * - * @param properties The properties to be given to the coordinate reference system. - * @param datum The datum. - * @param cs The coordinate system. + * @param properties the properties to be given to the coordinate reference system. + * @param datum the datum. + * @param cs the coordinate system. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createVerticalCRS(Map, VerticalDatum, VerticalCS) */ @@ -146,7 +146,7 @@ public class DefaultVerticalCRS extends * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param crs The coordinate reference system to copy. + * @param crs the coordinate reference system to copy. * * @see #castOrCopy(VerticalCRS) */ @@ -161,8 +161,8 @@ public class DefaultVerticalCRS extends * 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 DefaultVerticalCRS castOrCopy(final VerticalCRS object) { @@ -189,7 +189,7 @@ public class DefaultVerticalCRS extends /** * Returns the datum. * - * @return The datum. + * @return the datum. */ @Override @XmlElement(name = "verticalDatum", required = true) @@ -200,7 +200,7 @@ public class DefaultVerticalCRS extends /** * Returns the coordinate system. * - * @return The coordinate system. + * @return the coordinate system. */ @Override @XmlElement(name = "verticalCS", required = true) Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -64,8 +64,8 @@ final class SC_GeographicCRS extends Pro * Invoked by {@link PropertyType} at marshalling time for wrapping the given value * in a {@code <gml:GeodeticCRS>} XML element. * - * @param cs The element to marshall. - * @return A {@code PropertyType} wrapping the given the element. + * @param cs the element to marshall. + * @return a {@code PropertyType} wrapping the given the element. */ @Override protected SC_GeographicCRS wrap(final GeographicCRS cs) { @@ -77,7 +77,7 @@ final class SC_GeographicCRS extends Pro * inside the {@code <gml:GeodeticCRS>} XML element. * This is the value or a copy of the value given in argument to the {@code wrap} method. * - * @return The element to be marshalled. + * @return the element to be marshalled. */ @XmlElement(name = "GeodeticCRS") public DefaultGeodeticCRS getElement() { @@ -92,7 +92,7 @@ final class SC_GeographicCRS extends Pro /** * Invoked by JAXB at unmarshalling time for storing the result temporarily. * - * @param cs The unmarshalled element. + * @param cs the unmarshalled element. */ public void setElement(final DefaultGeodeticCRS cs) { if (cs == null || cs instanceof GeographicCRS) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -127,9 +127,11 @@ final class SubTypes implements Comparat * if we need to create a new object anyway (see below for rational). */ if (object instanceof DefaultGeodeticCRS) { - // Result of XML unmarshalling — keep as-is. We avoid creating a new object because it - // would break object identities specified in GML document by the xlink:href attribute. - // However we may revisit this policy in the future. See SC_CRS.setElement(AbstractCRS). + /* + * Result of XML unmarshalling — keep as-is. We avoid creating a new object because it + * would break object identities specified in GML document by the xlink:href attribute. + * However we may revisit this policy in the future. See SC_CRS.setElement(AbstractCRS). + */ return (DefaultGeodeticCRS) object; } final Map<String,?> properties = IdentifiedObjects.getProperties(object); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -75,7 +75,7 @@ import static org.apache.sis.util.Utilit @XmlRootElement(name = "AbstractCoordinateSystem") @XmlSeeAlso({ DefaultAffineCS.class, - DefaultCartesianCS.class, // Not an AffineCS subclass in GML schema. + DefaultCartesianCS.class, // Not an AffineCS subclass in GML schema. DefaultSphericalCS.class, DefaultEllipsoidalCS.class, DefaultCylindricalCS.class, @@ -150,8 +150,8 @@ public class AbstractCS extends Abstract * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param axes The sequence of axes. + * @param properties the properties to be given to the identified object. + * @param axes the sequence of axes. */ @SuppressWarnings("OverridableMethodCallDuringObjectConstruction") public AbstractCS(final Map<String,?> properties, CoordinateSystemAxis... axes) { @@ -208,7 +208,7 @@ public class AbstractCS extends Abstract * * <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(CoordinateSystem) */ @@ -256,8 +256,8 @@ public class AbstractCS extends Abstract * 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 AbstractCS castOrCopy(final CoordinateSystem object) { @@ -274,8 +274,8 @@ public class AbstractCS extends Abstract * <p><b>Note for implementors:</b> since this method is invoked at construction time, it shall not depend * on this object's state. This method is not in public API for that reason.</p> * - * @param direction The direction to test for compatibility (never {@code null}). - * @param unit The unit to test for compatibility (never {@code null}). + * @param direction the direction to test for compatibility (never {@code null}). + * @param unit the unit to test for compatibility (never {@code null}). * @return {@link #VALID} if the given direction and unit are compatible with this coordinate system, * {@link #INVALID_DIRECTION} if the direction is invalid or {@link #INVALID_UNIT} if the unit * is invalid. @@ -289,7 +289,7 @@ public class AbstractCS extends Abstract * The default implementation returns {@code CoordinateSystem.class}. * Subclasses implementing a more specific GeoAPI interface shall override this method. * - * @return The coordinate system interface implemented by this class. + * @return the coordinate system interface implemented by this class. */ @Override public Class<? extends CoordinateSystem> getInterface() { @@ -300,7 +300,7 @@ public class AbstractCS extends Abstract * Returns the number of dimensions of this coordinate system. * This is the number of axes given at construction time. * - * @return The number of dimensions of this coordinate system. + * @return the number of dimensions of this coordinate system. */ @Override public final int getDimension() { @@ -310,8 +310,8 @@ public class AbstractCS extends Abstract /** * Returns the axis for this coordinate system at the specified dimension. * - * @param dimension The zero based index of axis. - * @return The axis at the specified dimension. + * @param dimension the zero based index of axis. + * @return the axis at the specified dimension. * @throws IndexOutOfBoundsException if {@code dimension} is out of bounds. */ @Override @@ -323,8 +323,8 @@ public class AbstractCS extends Abstract * Returns a coordinate system equivalent to this one but with axes rearranged according the given convention. * If this coordinate system is already compatible with the given convention, then this method returns {@code this}. * - * @param convention The axes convention for which a coordinate system is desired. - * @return A coordinate system compatible with the given convention (may be {@code this}). + * @param convention the axes convention for which a coordinate system is desired. + * @return a coordinate system compatible with the given convention (may be {@code this}). * * @see org.apache.sis.referencing.crs.AbstractCRS#forConvention(AxesConvention) */ @@ -358,8 +358,8 @@ public class AbstractCS extends Abstract * But if the given {@code axes} array has less elements than this coordinate system dimension, then * this method may return an other kind of coordinate system. See {@link AxisFilter} for an example.</p> * - * @param axes The set of axes to give to the new coordinate system. - * @return A new coordinate system of the same type than {@code this}, but using the given axes. + * @param axes the set of axes to give to the new coordinate system. + * @return a new coordinate system of the same type than {@code this}, but using the given axes. */ AbstractCS createForAxes(final Map<String,?> properties, final CoordinateSystemAxis[] axes) { return new AbstractCS(properties, axes); @@ -369,9 +369,9 @@ public class AbstractCS extends Abstract * Convenience method for implementations of {@link #createForAxes(Map, CoordinateSystemAxis[])} * when the resulting coordinate system would have an unexpected number of dimensions. * - * @param properties The properties which was supposed to be given to the constructor. - * @param axes The axes which was supposed to be given to the constructor. - * @param expected The minimal expected number of dimensions (may be less than {@link #getDimension()}). + * @param properties the properties which was supposed to be given to the constructor. + * @param axes the axes which was supposed to be given to the constructor. + * @param expected the minimal expected number of dimensions (may be less than {@link #getDimension()}). */ static IllegalArgumentException unexpectedDimension(final Map<String,?> properties, final CoordinateSystemAxis[] axes, final int expected) @@ -383,10 +383,10 @@ public class AbstractCS extends Abstract /** * Compares the specified object with this coordinate system 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 @@ -434,7 +434,7 @@ public class AbstractCS extends Abstract * 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() { @@ -515,7 +515,7 @@ public class AbstractCS extends Abstract */ @XmlElement(name = "axis") private CoordinateSystemAxis[] getAxis() { - return getAxes(this); // Give a chance to users to override getAxis(int). + return getAxes(this); // Give a chance to users to override getAxis(int). } /** Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -51,7 +51,7 @@ public interface AxisFilter { /** * Returns {@code true} if the given axis shall be included in the new coordinate system. * - * @param axis The axis to test. + * @param axis the axis to test. * @return {@code true} if the given axis shall be included in the new coordinate system. */ boolean accept(CoordinateSystemAxis axis); @@ -74,9 +74,9 @@ public interface AxisFilter { * } * </div> * - * @param axis The axis for which to change axis direction, if desired. - * @param direction The original axis direction. - * @return The new axis direction, or {@code direction} if there is no change. + * @param axis the axis for which to change axis direction, if desired. + * @param direction the original axis direction. + * @return the new axis direction, or {@code direction} if there is no change. * * @since 0.7 */ @@ -100,9 +100,9 @@ public interface AxisFilter { * } * </div> * - * @param axis The axis for which to change unit, if desired. - * @param unit The original axis unit. - * @return The new axis unit, or {@code unit} if there is no change. + * @param axis the axis for which to change unit, if desired. + * @param unit the original axis unit. + * @return the new axis unit, or {@code unit} if there is no change. * * @since 0.7 */ Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -114,9 +114,9 @@ public class DefaultCartesianCS extends * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param axis0 The first axis (e.g. “Easting”). - * @param axis1 The second axis (e.g. “Northing”). + * @param properties the properties to be given to the identified object. + * @param axis0 the first axis (e.g. “Easting”). + * @param axis1 the second axis (e.g. “Northing”). * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createCartesianCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) */ @@ -133,10 +133,10 @@ public class DefaultCartesianCS extends * The properties map is given unchanged to the * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}. * - * @param properties The properties to be given to the identified object. - * @param axis0 The first axis (e.g. “Geocentric X”). - * @param axis1 The second axis (e.g. “Geocentric Y”). - * @param axis2 The third axis (e.g. “Geocentric Z”). + * @param properties the properties to be given to the identified object. + * @param axis0 the first axis (e.g. “Geocentric X”). + * @param axis1 the second axis (e.g. “Geocentric Y”). + * @param axis2 the third axis (e.g. “Geocentric Z”). * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createCartesianCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ @@ -156,7 +156,7 @@ public class DefaultCartesianCS extends * * <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(CartesianCS) */ @@ -171,8 +171,8 @@ public class DefaultCartesianCS extends * 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 DefaultCartesianCS castOrCopy(final CartesianCS object) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -102,8 +102,8 @@ public class DefaultCompoundCS extends A * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param components The set of coordinate system. + * @param properties the properties to be given to the identified object. + * @param components the set of coordinate system. */ public DefaultCompoundCS(final Map<String,?> properties, CoordinateSystem... components) { super(properties, getAxes(components = clone(components))); @@ -114,7 +114,7 @@ public class DefaultCompoundCS extends A * Constructs a compound coordinate system from a sequence of coordinate systems. * A default name for this CS will be inferred from the names of all specified CS. * - * @param components The set of coordinate system. + * @param components the set of coordinate system. */ public DefaultCompoundCS(CoordinateSystem... components) { this(components = clone(components), getAxes(components)); @@ -124,7 +124,7 @@ public class DefaultCompoundCS extends A * This is a work around for RFE #4093999 in Sun's bug database * ("Relax constraint on placement of this()/super() call in constructors"). * - * @param components The coordinate systems. + * @param components the coordinate systems. */ @Workaround(library="JDK", version="1.7") private DefaultCompoundCS(final CoordinateSystem[] components, final CoordinateSystemAxis[] axes) { @@ -168,7 +168,7 @@ public class DefaultCompoundCS extends A /** * Returns all coordinate systems in this compound CS. * - * @return All coordinate systems in this compound CS. + * @return all coordinate systems in this compound CS. */ @SuppressWarnings("ReturnOfCollectionOrArrayField") public List<CoordinateSystem> getComponents() { @@ -188,10 +188,10 @@ public class DefaultCompoundCS extends A /** * Compares this coordinate system 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 Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -287,10 +287,10 @@ public class DefaultCoordinateSystemAxis * <p>If no minimum, maximum and range meaning are specified, then this constructor will infer them * from the axis unit and direction.</p> * - * @param properties The properties to be given to the identified object. - * @param abbreviation The {@linkplain #getAbbreviation() abbreviation} used for this coordinate system axis. - * @param direction The {@linkplain #getDirection() direction} of this coordinate system axis. - * @param unit The {@linkplain #getUnit() unit of measure} used for this coordinate system axis. + * @param properties the properties to be given to the identified object. + * @param abbreviation the {@linkplain #getAbbreviation() abbreviation} used for this coordinate system axis. + * @param direction the {@linkplain #getDirection() direction} of this coordinate system axis. + * @param unit the {@linkplain #getUnit() unit of measure} used for this coordinate system axis. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createCoordinateSystemAxis(Map, String, AxisDirection, Unit) */ @@ -355,7 +355,7 @@ public class DefaultCoordinateSystemAxis * * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p> * - * @param axis The coordinate system axis to copy. + * @param axis the coordinate system axis to copy. * * @see #castOrCopy(CoordinateSystemAxis) */ @@ -375,8 +375,8 @@ public class DefaultCoordinateSystemAxis * 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 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 DefaultCoordinateSystemAxis castOrCopy(final CoordinateSystemAxis object) { @@ -411,7 +411,7 @@ public class DefaultCoordinateSystemAxis * {@linkplain AxisDirection#EAST east} or {@linkplain AxisDirection#WEST west}, * {@linkplain AxisDirection#UP up} or {@linkplain AxisDirection#DOWN down}.</p> * - * @return The direction of this coordinate system axis. + * @return the direction of this coordinate system axis. */ @Override @XmlElement(name = "axisDirection", required = true) @@ -423,7 +423,7 @@ public class DefaultCoordinateSystemAxis * Returns the abbreviation used for this coordinate system axes. * Examples are <cite>"X"</cite> and <cite>"Y"</cite>. * - * @return The coordinate system axis abbreviation. + * @return the coordinate system axis abbreviation. */ @Override @XmlElement(name = "axisAbbrev", required = true) @@ -436,7 +436,7 @@ public class DefaultCoordinateSystemAxis * was given by <code>{@link AbstractCS#getAxis(int) CoordinateSystem.getAxis}(i)</code>, then all ordinate * values at dimension <var>i</var> in a coordinate tuple shall be recorded using this unit of measure. * - * @return The unit of measure used for ordinate values along this coordinate system axis. + * @return the unit of measure used for ordinate values along this coordinate system axis. */ @Override @XmlAttribute(name= "uom", required = true) @@ -449,7 +449,7 @@ public class DefaultCoordinateSystemAxis * unit of measure for the axis}. If there is no minimum value, then this method returns * {@linkplain Double#NEGATIVE_INFINITY negative infinity}. * - * @return The minimum value normally allowed for this axis. + * @return the minimum value normally allowed for this axis. */ @Override public double getMinimumValue() { @@ -461,7 +461,7 @@ public class DefaultCoordinateSystemAxis * unit of measure for the axis}. If there is no maximum value, then this method returns * {@linkplain Double#POSITIVE_INFINITY negative infinity}. * - * @return The maximum value normally allowed for this axis. + * @return the maximum value normally allowed for this axis. */ @Override public double getMaximumValue() { @@ -471,9 +471,9 @@ public class DefaultCoordinateSystemAxis /** * Invoked at unmarshalling time if a minimum or maximum value is out of range. * - * @param name The property name. Will also be used as "method" name for logging purpose, - * since the setter method "conceptually" do not exist (it is only for JAXB). - * @param value The invalid value. + * @param name the property name. Will also be used as "method" name for logging purpose, + * since the setter method "conceptually" do not exist (it is only for JAXB). + * @param value the invalid value. */ private static void outOfRange(final String name, final Double value) { Context.warningOccured(Context.current(), DefaultCoordinateSystemAxis.class, name, @@ -486,7 +486,7 @@ public class DefaultCoordinateSystemAxis * (i.e. if those values are {@linkplain Double#NEGATIVE_INFINITY negative infinity} and * {@linkplain Double#POSITIVE_INFINITY positive infinity} respectively), then this method returns {@code null}. * - * @return The meaning of axis value range, or {@code null} if unspecified. + * @return the meaning of axis value range, or {@code null} if unspecified. */ @Override @XmlElement(name = "rangeMeaning") @@ -517,7 +517,7 @@ public class DefaultCoordinateSystemAxis * 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 of at least one alias matches the specified {@code name}. */ @Override @@ -540,8 +540,8 @@ public class DefaultCoordinateSystemAxis * but the converse is not true. Note: by avoiding to put "x" in the {@link #ALIASES} map, we * avoid undesirable side effects like considering "Easting" as equivalent to "Westing". * - * @param xy The name which may be "x" or "y". - * @param name The second name to compare with. + * @param xy the name which may be "x" or "y". + * @param name the second name to compare with. * @return {@code true} if the second name is equivalent to "x" or "y" * (depending on the {@code xy} value), or {@code false} otherwise. */ @@ -566,8 +566,8 @@ public class DefaultCoordinateSystemAxis * The range minimum and maximum values are compared only if {@code cr} is {@code true}, * i.e. it is caller responsibility to determine if range shall be considered as metadata. * - * @param that The axis to compare with this axis. - * @param cr {@code true} for comparing also the range minimum and maximum values. + * @param that the axis to compare with this axis. + * @param cr {@code true} for comparing also the range minimum and maximum values. * @return {@code true} if unit, direction and optionally range extremum are equal. */ private boolean equalsIgnoreMetadata(final CoordinateSystemAxis that, final boolean cr) { @@ -592,16 +592,16 @@ public class DefaultCoordinateSystemAxis * and {@link #getMaximumValue()} are considered non-ignorable metadata and will be compared for every modes. * All other properties are compared only for modes stricter than {@link ComparisonMode#IGNORE_METADATA}. * - * @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; @@ -680,7 +680,7 @@ public class DefaultCoordinateSystemAxis * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()} * for more information. * - * @return The hash code value. This value may change in any future Apache SIS version. + * @return the hash code value. This value may change in any future Apache SIS version. */ @Override protected long computeHashCode() { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -107,10 +107,10 @@ public class DefaultCylindricalCS 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 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#createCylindricalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ @@ -129,7 +129,7 @@ public class DefaultCylindricalCS 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(CylindricalCS) */ @@ -143,8 +143,8 @@ public class DefaultCylindricalCS 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 DefaultCylindricalCS castOrCopy(final CylindricalCS object) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -107,9 +107,9 @@ public class DefaultEllipsoidalCS extend * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param axis0 The first axis (e.g. “Geodetic latitude”). - * @param axis1 The second axis (e.g. “Geodetic longitude”). + * @param properties the properties to be given to the identified object. + * @param axis0 the first axis (e.g. “Geodetic latitude”). + * @param axis1 the second axis (e.g. “Geodetic longitude”). * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createEllipsoidalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) */ @@ -126,10 +126,10 @@ public class DefaultEllipsoidalCS extend * The properties map is given unchanged to the * {@linkplain AbstractCS#AbstractCS(Map,CoordinateSystemAxis[]) super-class constructor}. * - * @param properties The properties to be given to the identified object. - * @param axis0 The first axis (e.g. “Geodetic latitude”). - * @param axis1 The second axis (e.g. “Geodetic longitude”). - * @param axis2 The third axis (e.g. “Ellipsoidal height”). + * @param properties the properties to be given to the identified object. + * @param axis0 the first axis (e.g. “Geodetic latitude”). + * @param axis1 the second axis (e.g. “Geodetic longitude”). + * @param axis2 the third axis (e.g. “Ellipsoidal height”). * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createEllipsoidalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ @@ -149,7 +149,7 @@ public class DefaultEllipsoidalCS 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(EllipsoidalCS) */ @@ -163,8 +163,8 @@ public class DefaultEllipsoidalCS 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 DefaultEllipsoidalCS castOrCopy(final EllipsoidalCS object) { @@ -198,7 +198,7 @@ public class DefaultEllipsoidalCS extend /** * Validates the set of axes after the validation of each individual axis. * - * @param properties The properties given at construction time. + * @param properties the properties given at construction time. */ private void validateAxes(final Map<String,?> properties) { int i = super.getDimension(); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -105,8 +105,8 @@ public class DefaultLinearCS extends Abs * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param axis The axis. + * @param properties the properties to be given to the identified object. + * @param axis the axis. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createLinearCS(Map, CoordinateSystemAxis) */ @@ -121,7 +121,7 @@ public class DefaultLinearCS extends Abs * * <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(LinearCS) */ @@ -135,8 +135,8 @@ public class DefaultLinearCS extends Abs * 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 DefaultLinearCS castOrCopy(final LinearCS object) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -102,8 +102,8 @@ public class DefaultParametricCS extends * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param axis The axis. + * @param properties the properties to be given to the identified object. + * @param axis the axis. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createParametricCS(Map, CoordinateSystemAxis) */ @@ -121,7 +121,7 @@ public class DefaultParametricCS extends * <div class="warning"><b>Warning:</b> in a future SIS version, the parameter type may be changed * to {@code org.opengis.referencing.cs.ParametricCS}. This change is pending GeoAPI revision.</div> * - * @param cs The coordinate system to copy. + * @param cs the coordinate system to copy. */ protected DefaultParametricCS(final DefaultParametricCS cs) { super(cs); Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -107,9 +107,9 @@ public class DefaultPolarCS extends Abst * </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#createPolarCS(Map, CoordinateSystemAxis, CoordinateSystemAxis) */ @@ -127,7 +127,7 @@ public class DefaultPolarCS extends Abst * * <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(PolarCS) */ @@ -141,8 +141,8 @@ public class DefaultPolarCS extends Abst * 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 DefaultPolarCS castOrCopy(final PolarCS object) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -110,10 +110,10 @@ public class DefaultSphericalCS extends * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param axis0 The first axis (e.g. “Spherical latitude”). - * @param axis1 The second axis (e.g. “Spherical longitude”). - * @param axis2 The third axis (e.g. “Geocentric radius”). + * @param properties the properties to be given to the identified object. + * @param axis0 the first axis (e.g. “Spherical latitude”). + * @param axis1 the second axis (e.g. “Spherical longitude”). + * @param axis2 the third axis (e.g. “Geocentric radius”). * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createSphericalCS(Map, CoordinateSystemAxis, CoordinateSystemAxis, CoordinateSystemAxis) */ @@ -132,7 +132,7 @@ public class DefaultSphericalCS extends * * <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(SphericalCS) */ @@ -146,8 +146,8 @@ public class DefaultSphericalCS extends * 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 DefaultSphericalCS castOrCopy(final SphericalCS object) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] Sat Jan 21 09:14:56 2017 @@ -107,8 +107,8 @@ public class DefaultTimeCS extends Abstr * </tr> * </table> * - * @param properties The properties to be given to the identified object. - * @param axis The axis. + * @param properties the properties to be given to the identified object. + * @param axis the axis. * * @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createTimeCS(Map, CoordinateSystemAxis) */ @@ -123,7 +123,7 @@ public class DefaultTimeCS extends Abstr * * <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(TimeCS) */ @@ -137,8 +137,8 @@ public class DefaultTimeCS extends Abstr * 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 DefaultTimeCS castOrCopy(final TimeCS object) { Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultUserDefinedCS.java [UTF-8] Sat Jan 21 09:14:56 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/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultVerticalCS.java [UTF-8] Sat Jan 21 09:14:56 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/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DirectionAlongMeridian.java [UTF-8] Sat Jan 21 09:14:56 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/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/Normalizer.java [UTF-8] Sat Jan 21 09:14:56 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/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java?rev=1779709&r1=1779708&r2=1779709&view=diff ============================================================================== --- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] (original) +++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/datum/AbstractDatum.java [UTF-8] Sat Jan 21 09:14:56 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
