Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultDerivedCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultDerivedCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultDerivedCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultDerivedCRS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -164,12 +164,12 @@ public class DefaultDerivedCRS extends A
* for performing {@linkplain org.apache.sis.referencing.cs.CoordinateSystems#swapAndScaleAxes unit
* conversions and change of axis order} since those operations will be inferred by this constructor.
*
- * @param properties The properties to be given to the new derived CRS object.
- * @param baseCRS Coordinate reference system to base the derived CRS on.
- * @param conversion The defining conversion from a {@linkplain AxesConvention#NORMALIZED normalized} base
- * to a normalized derived CRS.
- * @param derivedCS The coordinate system for the derived CRS. The number of axes
- * must match the target dimension of the {@code baseToDerived} transform.
+ * @param properties the properties to be given to the new derived CRS object.
+ * @param baseCRS coordinate reference system to base the derived CRS on.
+ * @param conversion the defining conversion from a {@linkplain AxesConvention#NORMALIZED normalized}
+ * base to a normalized derived CRS.
+ * @param derivedCS the coordinate system for the derived CRS. The number of axes must match
+ * the target dimension of the {@code baseToDerived} transform.
* @throws MismatchedDimensionException if the source and target dimensions of {@code baseToDerived}
* do not match the dimensions of {@code base} and {@code derivedCS} respectively.
*
@@ -229,13 +229,13 @@ public class DefaultDerivedCRS extends A
* </tr>
* </table>
*
- * @param properties The properties to be given to the {@link DefaultConversion} object
- * (with keys prefixed by {@code "conversion."}) and to the new derived CRS object.
- * @param baseCRS Coordinate reference system to base the derived CRS on.
- * @param interpolationCRS The CRS of additional coordinates needed for the operation, or {@code null} if none.
- * @param method The coordinate operation method (mandatory in all cases).
- * @param baseToDerived Transform from positions in the base CRS to positions in this target CRS.
- * @param derivedCS The coordinate system for the derived CRS.
+ * @param properties the properties to be given to the {@link DefaultConversion} object
+ * (with keys prefixed by {@code "conversion."}) and to the new derived CRS object.
+ * @param baseCRS coordinate reference system to base the derived CRS on.
+ * @param interpolationCRS the CRS of additional coordinates needed for the operation, or {@code null} if none.
+ * @param method the coordinate operation method (mandatory in all cases).
+ * @param baseToDerived transform from positions in the base CRS to positions in this target CRS.
+ * @param derivedCS the coordinate system for the derived CRS.
* @throws IllegalArgumentException if at least one argument has an incompatible number of dimensions.
*
* @see #create(Map, SingleCRS, CoordinateReferenceSystem, OperationMethod, MathTransform, CoordinateSystem)
@@ -257,7 +257,7 @@ public class DefaultDerivedCRS extends A
*
* <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(DerivedCRS)
*/
@@ -274,12 +274,12 @@ public class DefaultDerivedCRS extends A
* {@link EngineeringCRS} interface.
* See the class javadoc for more information.
*
- * @param properties The properties to be given to the new derived CRS object.
- * @param baseCRS Coordinate reference system to base the derived CRS on.
- * @param conversion The defining conversion from a normalized base to a normalized derived CRS.
- * @param derivedCS The coordinate system for the derived CRS. The number of axes
- * must match the target dimension of the {@code baseToDerived} transform.
- * @return The newly created derived CRS, potentially implementing an additional CRS interface.
+ * @param properties the properties to be given to the new derived CRS object.
+ * @param baseCRS coordinate reference system to base the derived CRS on.
+ * @param conversion the defining conversion from a normalized base to a normalized derived CRS.
+ * @param derivedCS the coordinate system for the derived CRS. The number of axes
+ * must match the target dimension of the {@code baseToDerived} transform.
+ * @return the newly created derived CRS, potentially implementing an additional CRS interface.
* @throws MismatchedDimensionException if the source and target dimensions of {@code baseToDerived}
* do not match the dimensions of {@code base} and {@code derivedCS} respectively.
*
@@ -328,14 +328,14 @@ public class DefaultDerivedCRS extends A
* {@link EngineeringCRS} interface.
* See the class javadoc for more information.
*
- * @param properties The properties to be given to the {@link DefaultConversion} object
- * (with keys prefixed by {@code "conversion."}) and to the new derived CRS object.
- * @param baseCRS Coordinate reference system to base the derived CRS on.
- * @param interpolationCRS The CRS of additional coordinates needed for the operation, or {@code null} if none.
- * @param method The coordinate operation method (mandatory in all cases).
- * @param baseToDerived Transform from positions in the base CRS to positions in this target CRS.
- * @param derivedCS The coordinate system for the derived CRS.
- * @return The newly created derived CRS, potentially implementing an additional CRS interface.
+ * @param properties the properties to be given to the {@link DefaultConversion} object
+ * (with keys prefixed by {@code "conversion."}) and to the new derived CRS object.
+ * @param baseCRS coordinate reference system to base the derived CRS on.
+ * @param interpolationCRS the CRS of additional coordinates needed for the operation, or {@code null} if none.
+ * @param method the coordinate operation method (mandatory in all cases).
+ * @param baseToDerived transform from positions in the base CRS to positions in this target CRS.
+ * @param derivedCS the coordinate system for the derived CRS.
+ * @return the newly created derived CRS, potentially implementing an additional CRS interface.
* @throws IllegalArgumentException if at least one argument has an incompatible number of dimensions.
*
* @see #DefaultDerivedCRS(Map, SingleCRS, CoordinateReferenceSystem, OperationMethod, MathTransform, CoordinateSystem)
@@ -372,8 +372,8 @@ public class DefaultDerivedCRS 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 DefaultDerivedCRS castOrCopy(final DerivedCRS object) {
@@ -420,7 +420,7 @@ public class DefaultDerivedCRS extends A
/**
* Returns the datum of the {@linkplain #getBaseCRS() base CRS}.
*
- * @return The datum of the base CRS.
+ * @return the datum of the base CRS.
*/
@Override
public Datum getDatum() {
@@ -433,7 +433,7 @@ public class DefaultDerivedCRS extends A
* the {@linkplain DefaultConversion#getSourceCRS() source} of
* the {@linkplain #getConversionFromBase() conversion from base}.
*
- * @return The base coordinate reference system.
+ * @return the base coordinate reference system.
*/
@Override
@XmlElement(name = "baseCRS", required = true)
@@ -455,7 +455,7 @@ public class DefaultDerivedCRS extends A
* <div class="note"><b>Note:</b>
* This is different than ISO 19111, which allows source and target CRS to be {@code null}.</div>
*
- * @return The conversion to this CRS.
+ * @return the conversion to this CRS.
*/
@Override
public Conversion getConversionFromBase() {
@@ -465,7 +465,7 @@ public class DefaultDerivedCRS extends A
/**
* Returns the coordinate system.
*
- * @return The coordinate system.
+ * @return the coordinate system.
*/
@Override
@XmlElement(name = "coordinateSystem", required = true)
@@ -502,10 +502,10 @@ public class DefaultDerivedCRS extends A
* then axis order of the base CRS are ignored
* (but <strong>not</strong> axis order of <strong>this</strong> derived CRS).
*
- * @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
@@ -615,8 +615,10 @@ public class DefaultDerivedCRS extends A
static String getType(final SingleCRS baseCRS, final CoordinateSystem derivedCS) {
final Class<?> type;
if (baseCRS instanceof AbstractIdentifiedObject) {
- // For avoiding ambiguity if a user chooses to implement more
- // than 1 CRS interface (not recommended, but may happen).
+ /*
+ * For avoiding ambiguity if a user chooses to implement more
+ * than 1 CRS interface (not recommended, but may happen).
+ */
type = ((AbstractIdentifiedObject) baseCRS).getInterface();
} else if (baseCRS != null) {
type = baseCRS.getClass();
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultEngineeringCRS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -133,9 +133,9 @@ public class DefaultEngineeringCRS exten
* </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#createEngineeringCRS(Map, EngineeringDatum, CoordinateSystem)
*/
@@ -155,7 +155,7 @@ public class DefaultEngineeringCRS exten
*
* <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(EngineeringCRS)
*/
@@ -170,8 +170,8 @@ public class DefaultEngineeringCRS exten
* 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 DefaultEngineeringCRS castOrCopy(final EngineeringCRS object) {
@@ -198,7 +198,7 @@ public class DefaultEngineeringCRS exten
/**
* Returns the datum.
*
- * @return The datum.
+ * @return the datum.
*/
@Override
@XmlElement(name = "engineeringDatum", required = true)
@@ -209,7 +209,7 @@ public class DefaultEngineeringCRS exten
/**
* Returns the coordinate system.
*
- * @return The coordinate system.
+ * @return the coordinate system.
*/
@Override
@XmlElements({
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeocentricCRS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -138,9 +138,9 @@ public class DefaultGeocentricCRS extend
* </tr>
* </table>
*
- * @param properties The properties to be given to the coordinate reference system.
- * @param datum The datum.
- * @param cs The coordinate system, which must be three-dimensional.
+ * @param properties the properties to be given to the coordinate reference system.
+ * @param datum the datum.
+ * @param cs the coordinate system, which must be three-dimensional.
*
* @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createGeocentricCRS(Map, GeodeticDatum, CartesianCS)
*/
@@ -156,9 +156,9 @@ public class DefaultGeocentricCRS extend
* The properties given in argument are the same than for the
* {@linkplain #DefaultGeocentricCRS(Map, GeodeticDatum, CartesianCS) above constructor}.
*
- * @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#createGeocentricCRS(Map, GeodeticDatum, SphericalCS)
*/
@@ -176,7 +176,7 @@ public class DefaultGeocentricCRS extend
*
* <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(GeocentricCRS)
*/
@@ -190,8 +190,8 @@ public class DefaultGeocentricCRS 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 DefaultGeocentricCRS castOrCopy(final GeocentricCRS object) {
@@ -219,7 +219,7 @@ public class DefaultGeocentricCRS extend
* Returns the geodetic datum associated to this geocentric CRS.
* This is the datum given at construction time.
*
- * @return The geodetic datum associated to this geocentric CRS.
+ * @return the geodetic datum associated to this geocentric CRS.
*/
@Override
public final GeodeticDatum getDatum() {
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeodeticCRS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -94,9 +94,9 @@ class DefaultGeodeticCRS extends Abstrac
*
* <p>This constructor is not public because it does not verify the {@code cs} type.</p>
*
- * @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.
*/
DefaultGeodeticCRS(final Map<String,?> properties,
final GeodeticDatum datum,
@@ -114,7 +114,7 @@ class DefaultGeodeticCRS extends Abstrac
*
* <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.
*/
protected DefaultGeodeticCRS(final GeodeticCRS crs) {
super(crs);
@@ -126,7 +126,7 @@ class DefaultGeodeticCRS extends Abstrac
* The SIS implementation returns {@code GeodeticCRS.class}.
* Subclasses implementing a more specific GeoAPI interface shall override this method.
*
- * @return The coordinate reference system interface implemented by this class.
+ * @return the coordinate reference system interface implemented by this class.
*/
@Override
public Class<? extends GeodeticCRS> getInterface() {
@@ -141,7 +141,7 @@ class DefaultGeodeticCRS extends Abstrac
* If {@code DefaultGeodeticCRS} is made public in a future SIS version, then we could remove
* the overridden methods.
*
- * @return The datum.
+ * @return the datum.
*/
@Override
@XmlElement(name = "geodeticDatum", required = true)
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultGeographicCRS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -152,9 +152,9 @@ public class DefaultGeographicCRS extend
* </tr>
* </table>
*
- * @param properties The properties to be given to the coordinate reference system.
- * @param datum The datum.
- * @param cs The two- or three-dimensional coordinate system.
+ * @param properties the properties to be given to the coordinate reference system.
+ * @param datum the datum.
+ * @param cs the two- or three-dimensional coordinate system.
*
* @see org.apache.sis.referencing.factory.GeodeticObjectFactory#createGeographicCRS(Map, GeodeticDatum, EllipsoidalCS)
*/
@@ -172,7 +172,7 @@ public class DefaultGeographicCRS extend
*
* <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(GeographicCRS)
*/
@@ -186,8 +186,8 @@ public class DefaultGeographicCRS 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 DefaultGeographicCRS castOrCopy(final GeographicCRS object) {
@@ -215,7 +215,7 @@ public class DefaultGeographicCRS extend
* Returns the geodetic datum associated to this geographic CRS.
* This is the datum given at construction time.
*
- * @return The geodetic datum associated to this geographic CRS.
+ * @return the geodetic datum associated to this geographic CRS.
*/
@Override
public final GeodeticDatum getDatum() {
@@ -225,7 +225,7 @@ public class DefaultGeographicCRS extend
/**
* Returns the coordinate system.
*
- * @return The coordinate system.
+ * @return the coordinate system.
*/
@Override
public EllipsoidalCS getCoordinateSystem() {
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultImageCRS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -126,9 +126,9 @@ public class DefaultImageCRS extends Abs
* </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#createImageCRS(Map, ImageDatum, AffineCS)
*/
@@ -148,7 +148,7 @@ public class DefaultImageCRS extends Abs
*
* <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(ImageCRS)
*/
@@ -163,8 +163,8 @@ public class DefaultImageCRS 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 DefaultImageCRS castOrCopy(final ImageCRS object) {
@@ -191,7 +191,7 @@ public class DefaultImageCRS extends Abs
/**
* Returns the datum.
*
- * @return The datum.
+ * @return the datum.
*/
@Override
@XmlElement(name = "imageDatum", required = true)
@@ -202,7 +202,7 @@ public class DefaultImageCRS extends Abs
/**
* Returns the coordinate system.
*
- * @return The coordinate system.
+ * @return the coordinate system.
*/
@Override
public AffineCS getCoordinateSystem() {
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultParametricCRS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -126,9 +126,9 @@ public class DefaultParametricCRS extend
* </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#createParametricCRS(Map, ParametricDatum, ParametricCS)
*/
@@ -148,7 +148,7 @@ public class DefaultParametricCRS extend
*
* <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(ParametricCRS)
*/
@@ -163,8 +163,8 @@ public class DefaultParametricCRS 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 DefaultParametricCRS castOrCopy(final ParametricCRS object) {
@@ -191,7 +191,7 @@ public class DefaultParametricCRS extend
/**
* Returns the datum.
*
- * @return The datum.
+ * @return the datum.
*/
@Override
@XmlElement(name = "parametricDatum", required = true)
@@ -202,7 +202,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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultProjectedCRS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultTemporalCRS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/DefaultVerticalCRS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SC_GeographicCRS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/crs/SubTypes.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AbstractCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/AxisFilter.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCartesianCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCompoundCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCoordinateSystemAxis.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultCylindricalCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultEllipsoidalCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultLinearCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultParametricCS.java [UTF-8] Sat Jan 21 09:00:40 2017
@@ -105,8 +105,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
*
* <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(ParametricCS)
*/
@@ -135,8 +135,8 @@ public class DefaultParametricCS 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 DefaultParametricCS castOrCopy(final ParametricCS object) {
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultPolarCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultSphericalCS.java [UTF-8] Sat Jan 21 09:00:40 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/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java?rev=1779706&r1=1779705&r2=1779706&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/cs/DefaultTimeCS.java [UTF-8] Sat Jan 21 09:00:40 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) {
|