sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1779702 [4/15] - in /sis/branches/JDK8/core: sis-metadata/src/main/java/org/apache/sis/metadata/iso/maintenance/ sis-referencing/src/main/java/org/apache/sis/geometry/ sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/...
Date Sat, 21 Jan 2017 08:49:54 GMT
Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ParameterizedAffine.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -69,10 +69,10 @@ public final class ParameterizedAffine e
     /**
      * Creates a new transform from the given affine and parameters.
      *
-     * @param transform    The affine transform to copy.
-     * @param parameters   The parameters to remember. It is caller's responsibility to provide an immutable instance.
-     * @param isDefinitive {@code true} if {@code parameters} provides an accurate description of {@code transform}, or
-     *                     {@code false} if the transform may be different than the one described by {@code parameters}.
+     * @param transform     the affine transform to copy.
+     * @param parameters    the parameters to remember. It is caller's responsibility to provide an immutable instance.
+     * @param isDefinitive  {@code true} if {@code parameters} provides an accurate description of {@code transform}, or
+     *                      {@code false} if the transform may be different than the one described by {@code parameters}.
      */
     public ParameterizedAffine(final AffineTransform transform, final ParameterValueGroup parameters, final boolean isDefinitive) {
         super(transform);
@@ -84,8 +84,8 @@ public final class ParameterizedAffine e
      * Returns the given transform associated to the same parameters than this {@code ParameterizedAffine},
      * if possible. If the given transform is not affine, then it is returned unchanged.
      *
-     * @param  transform The transform to be at least partially described by {@link #parameters}.
-     * @return A copy of the given affine transform associated to the parameter of this object,
+     * @param  transform  the transform to be at least partially described by {@link #parameters}.
+     * @return a copy of the given affine transform associated to the parameter of this object,
      *         or the given transform unchanged if it was not affine.
      */
     public MathTransform newTransform(final MathTransform transform) {
@@ -99,7 +99,7 @@ public final class ParameterizedAffine e
     /**
      * Returns the parameter descriptors for this map projection.
      *
-     * @return The map projection parameters if they are an accurate description of this transform,
+     * @return the map projection parameters if they are an accurate description of this transform,
      *         or the generic affine parameters in case of doubt.
      */
     @Override
@@ -135,7 +135,7 @@ public final class ParameterizedAffine e
      * The {@code Semaphores.ENCLOSED_IN_OPERATION} flag is SIS internal mechanism for distinguish the two above-cited
      * cases.
      *
-     * @return The map projection parameters if they are an accurate description of this transform,
+     * @return the map projection parameters if they are an accurate description of this transform,
      *         or the generic affine parameters in case of doubt.
      */
     @Override
@@ -149,7 +149,7 @@ public final class ParameterizedAffine e
      * Parameters are compared only if the other object is also an instance of {@code ParameterizedAffine}
      * in order to preserve the {@link AffineTransform#equals(Object)} <cite>symmetricity</cite> contract.
      *
-     * @param  object The object to compare with this transform for equality.
+     * @param  object  the object to compare with this transform for equality.
      * @return {@code true} if the given object is of appropriate class (as explained in the
      *         {@link AffineTransform2D#equals(Object)} documentation) and the coefficients are the same.
      */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ShapeUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ShapeUtilities.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ShapeUtilities.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/j2d/ShapeUtilities.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -53,15 +53,15 @@ public final class ShapeUtilities extend
      * if the intersection does not occur between the ending points {@linkplain Line2D#getP1() P1} and
      * {@linkplain Line2D#getP2() P2} of the two line segments, then this method returns {@code null}.
      *
-     * @param  ax1 <var>x</var> value of the first point on the first  line.
-     * @param  ay1 <var>y</var> value of the first point on the first  line.
-     * @param  ax2 <var>x</var> value of the last  point on the first  line.
-     * @param  ay2 <var>y</var> value of the last  point on the first  line.
-     * @param  bx1 <var>x</var> value of the first point on the second line.
-     * @param  by1 <var>y</var> value of the first point on the second line.
-     * @param  bx2 <var>x</var> value of the last  point on the second line.
-     * @param  by2 <var>y</var> value of the last  point on the second line.
-     * @return The intersection point, or {@code null} if none.
+     * @param  ax1  <var>x</var> value of the first point on the first  line.
+     * @param  ay1  <var>y</var> value of the first point on the first  line.
+     * @param  ax2  <var>x</var> value of the last  point on the first  line.
+     * @param  ay2  <var>y</var> value of the last  point on the first  line.
+     * @param  bx1  <var>x</var> value of the first point on the second line.
+     * @param  by1  <var>y</var> value of the first point on the second line.
+     * @param  bx2  <var>x</var> value of the last  point on the second line.
+     * @param  by2  <var>y</var> value of the last  point on the second line.
+     * @return the intersection point, or {@code null} if none.
      *
      * @see org.apache.sis.geometry.Shapes2D#intersectionPoint(Line2D, Line2D)
      */
@@ -106,13 +106,13 @@ public final class ShapeUtilities extend
      *       This distance can be obtained with {@code point.distance(result)}.</li>
      * </ul>
      *
-     * @param  x1 <var>x</var> value of the first point on the line.
-     * @param  y1 <var>y</var> value of the first point on the line.
-     * @param  x2 <var>x</var> value of the last  point on the line.
-     * @param  y2 <var>y</var> value of the last  point on the line.
-     * @param  x  <var>x</var> value of a point close to the given line.
-     * @param  y  <var>y</var> value of a point close to the given line.
-     * @return The nearest point on the given line.
+     * @param  x1  <var>x</var> value of the first point on the line.
+     * @param  y1  <var>y</var> value of the first point on the line.
+     * @param  x2  <var>x</var> value of the last  point on the line.
+     * @param  y2  <var>y</var> value of the last  point on the line.
+     * @param  x   <var>x</var> value of a point close to the given line.
+     * @param  y   <var>y</var> value of a point close to the given line.
+     * @return the nearest point on the given line.
      *
      * @see #colinearPoint(double,double , double,double , double,double , double)
      *
@@ -164,14 +164,14 @@ public final class ShapeUtilities extend
      * If two result points meet those conditions, then this method returns the point
      * which is the closest to {@code line.getP1()}.
      *
-     * @param  x1 <var>x</var> value of the first point on the line.
-     * @param  y1 <var>y</var> value of the first point on the line.
-     * @param  x2 <var>x</var> value of the last  point on the line.
-     * @param  y2 <var>y</var> value of the last  point on the line.
-     * @param  x  <var>x</var> value of a point close to the given line.
-     * @param  y  <var>y</var> value of a point close to the given line.
-     * @param  distance The distance between the given point and the point to be returned.
-     * @return A point on the given line located at the given distance from the given point.
+     * @param  x1  <var>x</var> value of the first point on the line.
+     * @param  y1  <var>y</var> value of the first point on the line.
+     * @param  x2  <var>x</var> value of the last  point on the line.
+     * @param  y2  <var>y</var> value of the last  point on the line.
+     * @param  x   <var>x</var> value of a point close to the given line.
+     * @param  y   <var>y</var> value of a point close to the given line.
+     * @param  distance  the distance between the given point and the point to be returned.
+     * @return a point on the given line located at the given distance from the given point.
      *
      * @see #nearestColinearPoint(double,double , double,double , double,double)
      *
@@ -251,16 +251,16 @@ public final class ShapeUtilities extend
      *
      * Note that if {@code P0.y == P2.y}, then both {@code horizontal} values produce the same result.
      *
-     * @param  x1 <var>x</var> value of the starting point.
-     * @param  y1 <var>y</var> value of the starting point.
-     * @param  px <var>x</var> value of a passing point.
-     * @param  py <var>y</var> value of a passing point.
-     * @param  x2 <var>x</var> value of the ending point.
-     * @param  y2 <var>y</var> value of the ending point.
-     * @param  horizontal If {@code true}, the <var>x</var> axis is considered horizontal while computing the
+     * @param  x1  <var>x</var> value of the starting point.
+     * @param  y1  <var>y</var> value of the starting point.
+     * @param  px  <var>x</var> value of a passing point.
+     * @param  py  <var>y</var> value of a passing point.
+     * @param  x2  <var>x</var> value of the ending point.
+     * @param  y2  <var>y</var> value of the ending point.
+     * @param  horizontal  if {@code true}, the <var>x</var> axis is considered horizontal while computing the
      *         {@code y=ax²+bx+c} equation terms. If {@code false}, it is considered parallel to the line
      *         joining the {@code P0} and {@code P2} points.
-     * @return A quadratic curve passing by the given points. The curve starts at {@code P0} and ends at {@code P2}.
+     * @return a quadratic curve passing by the given points. The curve starts at {@code P0} and ends at {@code P2}.
      *         If two points are too close or if the three points are colinear, then this method returns {@code null}.
      *
      * @todo This method is used by Geotk (a sandbox for code that may migrate to SIS), but not yet by SIS.
@@ -292,16 +292,16 @@ public final class ShapeUtilities extend
      *
      * Note that if {@code P0.y == P2.y}, then both {@code horizontal} values produce the same result.
      *
-     * @param  x1 <var>x</var> value of the starting point.
-     * @param  y1 <var>y</var> value of the starting point.
-     * @param  px <var>x</var> value of a passing point.
-     * @param  py <var>y</var> value of a passing point.
-     * @param  x2 <var>x</var> value of the ending point.
-     * @param  y2 <var>y</var> value of the ending point.
-     * @param  horizontal If {@code true}, the <var>x</var> axis is considered horizontal while computing the
+     * @param  x1  <var>x</var> value of the starting point.
+     * @param  y1  <var>y</var> value of the starting point.
+     * @param  px  <var>x</var> value of a passing point.
+     * @param  py  <var>y</var> value of a passing point.
+     * @param  x2  <var>x</var> value of the ending point.
+     * @param  y2  <var>y</var> value of the ending point.
+     * @param  horizontal  if {@code true}, the <var>x</var> axis is considered horizontal while computing the
      *         {@code y = ax²+bx+c} equation terms. If {@code false}, it is considered parallel to the line
      *         joining the {@code P0} and {@code P2} points.
-     * @return The control point of a quadratic curve passing by the given points. The curve starts at {@code (x0,y0)}
+     * @return the control point of a quadratic curve passing by the given points. The curve starts at {@code (x0,y0)}
      *         and ends at {@code (x2,y2)}. If two points are too close or if the three points are colinear, then this
      *         method returns {@code null}.
      */
@@ -359,13 +359,13 @@ public final class ShapeUtilities extend
      * Returns the center of a circle passing by the 3 given points. The distance between the returned
      * point and any of the given points will be constant; it is the circle radius.
      *
-     * @param  x1 <var>x</var> value of the first  point.
-     * @param  y1 <var>y</var> value of the first  point.
-     * @param  x2 <var>x</var> value of the second point.
-     * @param  y2 <var>y</var> value of the second point.
-     * @param  x3 <var>x</var> value of the third  point.
-     * @param  y3 <var>y</var> value of the third  point.
-     * @return The center of a circle passing by the given points.
+     * @param  x1  <var>x</var> value of the first  point.
+     * @param  y1  <var>y</var> value of the first  point.
+     * @param  x2  <var>x</var> value of the second point.
+     * @param  y2  <var>y</var> value of the second point.
+     * @param  x3  <var>x</var> value of the third  point.
+     * @param  y3  <var>y</var> value of the third  point.
+     * @return the center of a circle passing by the given points.
      *
      * @see org.apache.sis.geometry.Shapes2D#circle(Point2D, Point2D, Point2D)
      */
@@ -389,9 +389,9 @@ public final class ShapeUtilities extend
      * line or a quadratic curve, then this method replaces it by a {@link Line2D} or
      * {@link QuadCurve2D} object respectively.
      *
-     * @param  path The shape to replace by a simpler Java2D construct.
+     * @param  path  the shape to replace by a simpler Java2D construct.
      *         This is generally an instance of {@link Path2D}, but not necessarily.
-     * @return A simpler Java construct, or {@code path} if no better construct is proposed.
+     * @return a simpler Java construct, or {@code path} if no better construct is proposed.
      */
     public static Shape toPrimitive(final Shape path) {
         final PathIterator it = path.getPathIterator(null);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbridgedMolodensky.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -101,9 +101,9 @@ public final class AbridgedMolodensky ex
     /**
      * Creates an Abridged Molodensky transform from the specified group of parameter values.
      *
-     * @param  factory The factory to use for creating concatenated transforms.
-     * @param  values  The group of parameter values.
-     * @return The created Abridged Molodensky transform.
+     * @param  factory  the factory to use for creating concatenated transforms.
+     * @param  values   the group of parameter values.
+     * @return the created Abridged Molodensky transform.
      * @throws FactoryException if a transform can not be created.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractLambert.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -72,7 +72,7 @@ class AbstractLambert extends MapProject
     /**
      * {@inheritDoc}
      *
-     * @return The map projection created from the given parameter values.
+     * @return the map projection created from the given parameter values.
      */
     @Override
     protected final NormalizedProjection createProjection(final Parameters parameters) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractMercator.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractMercator.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractMercator.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -87,7 +87,7 @@ class AbstractMercator extends MapProjec
     /**
      * {@inheritDoc}
      *
-     * @return The map projection created from the given parameter values.
+     * @return the map projection created from the given parameter values.
      */
     @Override
     protected NormalizedProjection createProjection(final Parameters parameters) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractProvider.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -57,10 +57,10 @@ public abstract class AbstractProvider e
     /**
      * Constructs a math transform provider from the given properties and a set of parameters.
      *
-     * @param properties      Set of properties. Shall contain at least {@code "name"}.
-     * @param sourceDimension Number of dimensions in the source CRS of this operation method.
-     * @param targetDimension Number of dimensions in the target CRS of this operation method.
-     * @param parameters      The set of parameters (never {@code null}).
+     * @param properties       set of properties. Shall contain at least {@code "name"}.
+     * @param sourceDimension  number of dimensions in the source CRS of this operation method.
+     * @param targetDimension  number of dimensions in the target CRS of this operation method.
+     * @param parameters       the set of parameters (never {@code null}).
      */
     AbstractProvider(final Map<String,?> properties,
                      final int sourceDimension,
@@ -74,9 +74,9 @@ public abstract class AbstractProvider e
      * Constructs a math transform provider from a set of parameters. The provider name and
      * {@linkplain #getIdentifiers() identifiers} will be the same than the parameter ones.
      *
-     * @param sourceDimensions Number of dimensions in the source CRS of this operation method.
-     * @param targetDimensions Number of dimensions in the target CRS of this operation method.
-     * @param parameters       Description of parameters expected by this operation.
+     * @param sourceDimensions  number of dimensions in the source CRS of this operation method.
+     * @param targetDimensions  number of dimensions in the target CRS of this operation method.
+     * @param parameters        description of parameters expected by this operation.
      */
     AbstractProvider(final int sourceDimensions,
                      final int targetDimensions,

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractStereographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractStereographic.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractStereographic.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AbstractStereographic.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -76,7 +76,7 @@ abstract class AbstractStereographic ext
      * The default implementation creates a projection for the <cite>"Polar Stereographic"</cite> case only.
      * Subclasses need to override if they want to support other cases (oblique and equatorial).
      *
-     * @return The map projection created from the given parameter values.
+     * @return the map projection created from the given parameter values.
      */
     @Override
     protected NormalizedProjection createProjection(Parameters parameters) throws ParameterNotFoundException {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Affine.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -191,9 +191,9 @@ public final class Affine extends Abstra
     /**
      * Creates a projective transform from the specified group of parameter values.
      *
-     * @param  factory Ignored (can be null).
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  ignored (can be null).
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws ParameterNotFoundException if a required parameter was not found.
      */
     @Override
@@ -210,9 +210,9 @@ public final class Affine extends Abstra
     /**
      * Returns the same operation method, but for different dimensions.
      *
-     * @param  sourceDimensions The desired number of input dimensions.
-     * @param  targetDimensions The desired number of output dimensions.
-     * @return The redimensioned operation method, or {@code this} if no change is needed.
+     * @param  sourceDimensions  the desired number of input dimensions.
+     * @param  targetDimensions  the desired number of output dimensions.
+     * @return the redimensioned operation method, or {@code this} if no change is needed.
      */
     @Override
     public OperationMethod redimension(final int sourceDimensions, final int targetDimensions) {
@@ -287,8 +287,8 @@ public final class Affine extends Abstra
      * Returns the parameter values for the given matrix. This method is invoked by implementations of
      * {@link org.apache.sis.referencing.operation.transform.AbstractMathTransform#getParameterValues()}.
      *
-     * @param  matrix The matrix for which to get parameter values.
-     * @return The parameters of the given matrix.
+     * @param  matrix  the matrix for which to get parameter values.
+     * @return the parameters of the given matrix.
      */
     public static ParameterValueGroup parameters(final Matrix matrix) {
         final int sourceDimensions = matrix.getNumCol() - 1;

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/AlbersEqualArea.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -188,7 +188,7 @@ public final class AlbersEqualArea exten
     /**
      * {@inheritDoc}
      *
-     * @return The map projection created from the given parameter values.
+     * @return the map projection created from the given parameter values.
      */
     @Override
     protected final NormalizedProjection createProjection(final Parameters parameters) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridCompressed.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -81,10 +81,10 @@ final class DatumShiftGridCompressed<C e
      * Tries to compress the given grid. If this operation succeed, a new grid is returned.
      * Otherwise this method returns the given {@code grid} unchanged.
      *
-     * @param  grid      The grid to compress.
-     * @param  averages  An "average" value for the offset in each dimension, or {@code null} if unknown.
-     * @param  scale     The factor by which to multiply each compressed value before to add to the average value.
-     * @return The grid to use (may or may not be compressed).
+     * @param  grid      the grid to compress.
+     * @param  averages  an "average" value for the offset in each dimension, or {@code null} if unknown.
+     * @param  scale     the factor by which to multiply each compressed value before to add to the average value.
+     * @return the grid to use (may or may not be compressed).
      */
     static <C extends Quantity<C>, T extends Quantity<T>> DatumShiftGridFile<C,T> compress(
             final DatumShiftGridFile.Float<C,T> grid, double[] averages, final double scale)
@@ -130,7 +130,7 @@ final class DatumShiftGridCompressed<C e
     /**
      * Suggests a precision for the translation values in this grid.
      *
-     * @return A precision for the translation values in this grid.
+     * @return a precision for the translation values in this grid.
      */
     @Override
     public double getCellPrecision() {
@@ -159,8 +159,8 @@ final class DatumShiftGridCompressed<C e
     /**
      * Returns the average translation parameters from source to target.
      *
-     * @param dim The dimension for which to get an average value.
-     * @return A value close to the average for the given dimension.
+     * @param  dim  the dimension for which to get an average value.
+     * @return a value close to the average for the given dimension.
      */
     @Override
     public double getCellMean(final int dim) {
@@ -212,7 +212,7 @@ final class DatumShiftGridCompressed<C e
     /**
      * Returns {@code true} if the given object is a grid containing the same data than this grid.
      *
-     * @param  other The other object to compare with this datum shift grid.
+     * @param  other  the other object to compare with this datum shift grid.
      * @return {@code true} if the given object is non-null, an instance of {@code DatumShiftGridCompressed}
      *         and contains the same data.
      */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridFile.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -18,6 +18,7 @@ package org.apache.sis.internal.referenc
 
 import java.util.Arrays;
 import java.lang.reflect.Array;
+import java.nio.file.Path;
 import javax.measure.Unit;
 import javax.measure.Quantity;
 import org.opengis.parameter.ParameterDescriptor;
@@ -31,9 +32,6 @@ import org.apache.sis.parameter.Paramete
 import org.apache.sis.referencing.datum.DatumShiftGrid;
 import org.apache.sis.internal.referencing.j2d.AffineTransform2D;
 
-// Branch-specific imports
-import java.nio.file.Path;
-
 
 /**
  * A datum shift grid loaded from a file.
@@ -109,12 +107,12 @@ public abstract class DatumShiftGridFile
      * Creates a new datum shift grid for the given grid geometry.
      * The actual offset values need to be provided by subclasses.
      *
-     * @param x0  Longitude in degrees of the center of the cell at grid index (0,0).
-     * @param y0  Latitude in degrees of the center of the cell at grid index (0,0).
-     * @param Δx  Increment in <var>x</var> value between cells at index <var>gridX</var> and <var>gridX</var> + 1.
-     * @param Δy  Increment in <var>y</var> value between cells at index <var>gridY</var> and <var>gridY</var> + 1.
-     * @param nx  Number of cells along the <var>x</var> axis in the grid.
-     * @param ny  Number of cells along the <var>y</var> axis in the grid.
+     * @param x0  longitude in degrees of the center of the cell at grid index (0,0).
+     * @param y0  latitude in degrees of the center of the cell at grid index (0,0).
+     * @param Δx  increment in <var>x</var> value between cells at index <var>gridX</var> and <var>gridX</var> + 1.
+     * @param Δy  increment in <var>y</var> value between cells at index <var>gridY</var> and <var>gridY</var> + 1.
+     * @param nx  number of cells along the <var>x</var> axis in the grid.
+     * @param ny  number of cells along the <var>y</var> axis in the grid.
      */
     DatumShiftGridFile(final Unit<C> coordinateUnit,
                        final Unit<T> translationUnit,
@@ -139,7 +137,7 @@ public abstract class DatumShiftGridFile
     /**
      * Creates a new datum shift grid with the same grid geometry than the given grid.
      *
-     * @param other The other datum shift grid from which to copy the grid geometry.
+     * @param  other  the other datum shift grid from which to copy the grid geometry.
      */
     DatumShiftGridFile(final DatumShiftGridFile<C,T> other) {
         super(other);
@@ -153,7 +151,7 @@ public abstract class DatumShiftGridFile
      * Suggests a precision for the translation values in this grid.
      * The default implementation returns a value smaller than the accuracy.
      *
-     * @return A precision for the translation values in this grid.
+     * @return a precision for the translation values in this grid.
      */
     @Override
     public double getCellPrecision() {
@@ -192,7 +190,7 @@ public abstract class DatumShiftGridFile
     /**
      * Sets all parameters for a value of type {@link Path} to the values given to th constructor.
      *
-     * @param parameters The parameter group where to set the values.
+     * @param  parameters  the parameter group where to set the values.
      */
     public final void setFileParameters(final Parameters parameters) {
         int i = 0;  // The 'files' array should always contains at least one element.
@@ -222,13 +220,13 @@ public abstract class DatumShiftGridFile
     /**
      * Returns {@code true} if the given object is a grid containing the same data than this grid.
      *
-     * @param  other The other object to compare with this datum shift grid.
+     * @param  other  the other object to compare with this datum shift grid.
      * @return {@code true} if the given object is non-null, of the same class than this {@code DatumShiftGrid}
      *         and contains the same data.
      */
     @Override
     public boolean equals(final Object other) {
-        if (other == this) {    // Optimization for a common case.
+        if (other == this) {                        // Optimization for a common case.
             return true;
         }
         if (super.equals(other)) {
@@ -251,7 +249,7 @@ public abstract class DatumShiftGridFile
     /**
      * Returns a string representation of this grid.
      *
-     * @return A string representation for debugging purpose.
+     * @return a string representation for debugging purpose.
      */
     @Debug
     @Override
@@ -342,10 +340,10 @@ public abstract class DatumShiftGridFile
          * (not the <em>binary</em> digits) to 0. This is on the assumption that the {@code float} values were parsed
          * from an ASCII file, or any other medium that format numbers in base 10.
          *
-         * @param dim    The dimension for which to get an average value.
-         * @param gridX  The grid index along the <var>x</var> axis, from 0 inclusive to {@link #nx} exclusive.
-         * @param gridY  The grid index along the <var>y</var> axis, from 0 inclusive to {@link #ny} exclusive.
-         * @return The offset at the given dimension in the grid cell at the given index.
+         * @param  dim    the dimension for which to get an average value.
+         * @param  gridX  the grid index along the <var>x</var> axis, from 0 inclusive to {@link #nx} exclusive.
+         * @param  gridY  the grid index along the <var>y</var> axis, from 0 inclusive to {@link #ny} exclusive.
+         * @return the offset at the given dimension in the grid cell at the given index.
          */
         @Override
         public final double getCellValue(final int dim, final int gridX, final int gridY) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/DatumShiftGridLoader.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -21,6 +21,8 @@ import java.util.logging.LogRecord;
 import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteBuffer;
+import java.nio.file.Path;
+import java.nio.file.NoSuchFileException;
 import java.nio.channels.ReadableByteChannel;
 import org.opengis.util.FactoryException;
 import org.apache.sis.util.resources.Errors;
@@ -30,10 +32,6 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.referencing.factory.FactoryDataException;
 import org.apache.sis.referencing.factory.MissingFactoryResourceException;
 
-// Branch-dependent imports
-import java.nio.file.Path;
-import java.nio.file.NoSuchFileException;
-
 
 /**
  * Base class of datum shift grid loaders.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/EPSGName.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -72,8 +72,8 @@ public final class EPSGName {  // TODO:
     /**
      * Creates an EPSG name or alias.
      *
-     * @param code The EPSG name to be returned by {@link NamedIdentifier#getCode()}.
-     * @return An EPSG name or alias for the given string.
+     * @param  code  the EPSG name to be returned by {@link NamedIdentifier#getCode()}.
+     * @return an EPSG name or alias for the given string.
      */
     public static NamedIdentifier create(final String code) {
         return new NamedIdentifier(Citations.EPSG, Constants.EPSG, code, VERSION, REMARKS);
@@ -82,8 +82,8 @@ public final class EPSGName {  // TODO:
     /**
      * Creates an EPSG identifier.
      *
-     * @param  code The EPSG code.
-     * @return The EPSG identifier for the given numerical value.
+     * @param  code  the EPSG code.
+     * @return the EPSG identifier for the given numerical value.
      */
     public static Identifier identifier(final int code) {
         return new ImmutableIdentifier(Citations.EPSG, Constants.EPSG, String.valueOf(code).intern(), VERSION, REMARKS);
@@ -93,10 +93,10 @@ public final class EPSGName {  // TODO:
      * Creates a map of properties to be given to the construction of an operation method.
      * The returned map is modifiable - callers can add or remove entries after this method call.
      *
-     * @param  identifier The EPSG code.
-     * @param  name       The EPSG name.
-     * @param  nameOGC    The OGC name, or {@code null} if none.
-     * @return A map of properties for building the operation method.
+     * @param  identifier  the EPSG code.
+     * @param  name        the EPSG name.
+     * @param  nameOGC     the OGC name, or {@code null} if none.
+     * @return a map of properties for building the operation method.
      */
     public static Map<String,Object> properties(final int identifier, final String name, final String nameOGC) {
         return properties(identifier, name, (nameOGC == null) ? null :
@@ -108,10 +108,10 @@ public final class EPSGName {  // TODO:
      * Creates a map of properties to be given to the construction of an operation method.
      * The returned map is modifiable - callers can add or remove entries after this method call.
      *
-     * @param  identifier The EPSG code.
-     * @param  name       The EPSG name.
-     * @param  nameOGC    The OGC name, or {@code null} if none.
-     * @return A map of properties for building the operation method.
+     * @param  identifier  the EPSG code.
+     * @param  name        the EPSG name.
+     * @param  nameOGC     the OGC name, or {@code null} if none.
+     * @return a map of properties for building the operation method.
      */
     public static Map<String,Object> properties(final int identifier, final String name, final GenericName nameOGC) {
         final Map<String,Object> properties = new HashMap<>(4);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Equirectangular.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -232,10 +232,10 @@ public final class Equirectangular exten
      * This method performs the same work than {@code Initializer.getAndStore(ParameterDescriptor)} in the
      * {@link org.apache.sis.referencing.operation.projection} package.
      *
-     * @param  source     The parameters from which to read the value.
-     * @param  target     Where to store the parameter values.
-     * @param  descriptor The descriptor that specify the parameter names and desired units.
-     * @return The parameter value in the units given by the descriptor.
+     * @param  source      the parameters from which to read the value.
+     * @param  target      where to store the parameter values.
+     * @param  descriptor  the descriptor that specify the parameter names and desired units.
+     * @return the parameter value in the units given by the descriptor.
      * @throws IllegalArgumentException if the given value is out of bounds.
      */
     private static double getAndStore(final Parameters source, final ParameterValueGroup target,
@@ -255,9 +255,9 @@ public final class Equirectangular exten
      * reproduced in this method because we will create an affine transform instead than the usual projection
      * classes.
      *
-     * @param  factory The factory to use if this constructor needs to create other math transforms.
-     * @param  parameters The parameter values that define the transform to create.
-     * @return The map projection created from the given parameter values.
+     * @param  factory     the factory to use if this constructor needs to create other math transforms.
+     * @param  parameters  the parameter values that define the transform to create.
+     * @return the map projection created from the given parameter values.
      * @throws FactoryException if an error occurred while creating the math transform.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/FranceGeocentricInterpolation.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -25,6 +25,9 @@ import java.util.logging.LogRecord;
 import java.io.BufferedReader;
 import java.io.EOFException;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.Length;
@@ -54,11 +57,6 @@ import org.apache.sis.referencing.operat
 
 import static java.lang.Float.parseFloat;
 
-// Branch-specific imports
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.Files;
-
 
 /**
  * The provider for <cite>"France geocentric interpolation"</cite> (ESPG:9655).

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffine.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -170,9 +170,9 @@ public abstract class GeocentricAffine e
      * The default implementation creates an affine transform, but some subclasses
      * will wrap that affine operation into Geographic/Geocentric conversions.
      *
-     * @param  factory The factory to use for creating concatenated transforms.
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  the factory to use for creating concatenated transforms.
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws FactoryException if a transform can not be created.
      */
     @Override
@@ -203,10 +203,10 @@ public abstract class GeocentricAffine e
     /**
      * Creates parameter values for a Molodensky, Geocentric Translation or Position Vector transformation.
      *
-     * @param  descriptor     The {@code PARAMETERS} constant of the subclass describing the operation to create.
+     * @param  descriptor     the {@code PARAMETERS} constant of the subclass describing the operation to create.
      * @param  parameters     Bursa-Wolf parameters from which to get the values.
      * @param  isTranslation  {@code true} if the operation contains only translation terms.
-     * @return The operation parameters with their values initialized.
+     * @return the operation parameters with their values initialized.
      */
     private static Parameters createParameters(final ParameterDescriptorGroup descriptor,
             final BursaWolfParameters parameters, final boolean isTranslation)
@@ -235,12 +235,12 @@ public abstract class GeocentricAffine e
      * will cause this method to return {@code null}. In such case, it is caller's responsibility to apply
      * the datum shift itself in Cartesian geocentric coordinates.</p>
      *
-     * @param sourceCS       The source coordinate system. Only the type and number of dimensions is checked.
-     * @param targetCS       The target coordinate system. Only the type and number of dimensions is checked.
-     * @param datumShift     The datum shift as a matrix.
+     * @param sourceCS       the source coordinate system. Only the type and number of dimensions is checked.
+     * @param targetCS       the target coordinate system. Only the type and number of dimensions is checked.
+     * @param datumShift     the datum shift as a matrix.
      * @param useMolodensky  {@code true} for allowing the use of Molodensky approximation, or {@code false}
      *                       for using the transformation in geocentric space (which should be more accurate).
-     * @return The parameter values, or {@code null} if no single operation method can be found.
+     * @return the parameter values, or {@code null} if no single operation method can be found.
      */
     public static ParameterValueGroup createParameters(final CoordinateSystem sourceCS,
             final CoordinateSystem targetCS, final Matrix datumShift, boolean useMolodensky)
@@ -307,7 +307,7 @@ public abstract class GeocentricAffine e
      * boolean)} except that we need to perform the {@code forDatumShift(…)} work only after {@code beforeFormat(…)}
      * finished its work for all {@code ContextualParameters}, including the {@code EllipsoidToCentricTransform}'s one.</p>
      *
-     * @param transforms The full chain of concatenated transforms.
+     * @param  transforms  the full chain of concatenated transforms.
      */
     public static void asDatumShift(final List<Object> transforms) {
         for (int i=transforms.size() - 2; --i >= 0;) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricAffineBetweenGeographic.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -128,9 +128,9 @@ public abstract class GeocentricAffineBe
      * Creates a math transform from the specified group of parameter values.
      * This method wraps the affine operation into Geographic/Geocentric conversions.
      *
-     * @param  factory The factory to use for creating concatenated transforms.
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  the factory to use for creating concatenated transforms.
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws FactoryException if a transform can not be created.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeocentricToGeographic.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -90,9 +90,9 @@ public final class GeocentricToGeographi
     /**
      * Creates a transform from the specified group of parameter values.
      *
-     * @param  factory The factory to use for creating the transform.
-     * @param  values The parameter values that define the transform to create.
-     * @return The conversion from geocentric to geographic coordinates.
+     * @param  factory  the factory to use for creating the transform.
+     * @param  values   the parameter values that define the transform to create.
+     * @return the conversion from geocentric to geographic coordinates.
      * @throws FactoryException if an error occurred while creating a transform.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeodeticOperation.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -114,7 +114,7 @@ abstract class GeodeticOperation extends
     /**
      * Returns the interface implemented by all coordinate operations that extends this class.
      *
-     * @return Fixed to {@link Transformation}.
+     * @return fixed to {@link Transformation}.
      */
     @Override
     public final Class<Transformation> getOperationType() {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic2Dto3D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic2Dto3D.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic2Dto3D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic2Dto3D.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -77,7 +77,7 @@ public final class Geographic2Dto3D exte
     /**
      * Returns the operation type.
      *
-     * @return Interface implemented by all coordinate operations that use this method.
+     * @return interface implemented by all coordinate operations that use this method.
      */
     @Override
     public Class<Conversion> getOperationType() {
@@ -87,9 +87,9 @@ public final class Geographic2Dto3D exte
     /**
      * Returns the transform.
      *
-     * @param  factory The factory for creating affine transforms.
-     * @param  values The parameter values.
-     * @return The math transform for the given parameter values.
+     * @param  factory  the factory for creating affine transforms.
+     * @param  values   the parameter values.
+     * @return the math transform for the given parameter values.
      * @throws FactoryException if an error occurred while creating the transform.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2D.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Geographic3Dto2D.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -72,7 +72,7 @@ public final class Geographic3Dto2D exte
     /**
      * Returns the operation type.
      *
-     * @return Interface implemented by all coordinate operations that use this method.
+     * @return interface implemented by all coordinate operations that use this method.
      */
     @Override
     public Class<Conversion> getOperationType() {
@@ -92,9 +92,9 @@ public final class Geographic3Dto2D exte
      * <p>This work with SIS implementation, but is not guaranteed to work with other implementations.
      * For that reason, this method does not use the given {@code factory}.</p></div>
      *
-     * @param  factory Ignored (can be null).
-     * @param  values Ignored.
-     * @return The math transform.
+     * @param  factory  ignored (can be null).
+     * @param  values   ignored.
+     * @return the math transform.
      * @throws FactoryException should never happen.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -99,9 +99,9 @@ public class GeographicOffsets extends G
      * Creates a transform from the specified group of parameter values.
      * The parameter values are unconditionally converted to degrees and metres.
      *
-     * @param  factory Ignored (can be null).
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  ignored (can be null).
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws ParameterNotFoundException if a required parameter was not found.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets2D.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets2D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicOffsets2D.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -75,9 +75,9 @@ public final class GeographicOffsets2D e
      * Creates a transform from the specified group of parameter values.
      * The parameter values are unconditionally converted to degrees.
      *
-     * @param  factory Ignored (can be null).
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  ignored (can be null).
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws ParameterNotFoundException if a required parameter was not found.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/GeographicToGeocentric.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -97,9 +97,9 @@ public final class GeographicToGeocentri
     /**
      * Creates a transform from the specified group of parameter values.
      *
-     * @param  factory The factory to use for creating the transform.
-     * @param  values The parameter values that define the transform to create.
-     * @return The conversion from geographic to geocentric coordinates.
+     * @param  factory  the factory to use for creating the transform.
+     * @param  values   the parameter values that define the transform to create.
+     * @return the conversion from geographic to geocentric coordinates.
      * @throws FactoryException if an error occurred while creating a transform.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Interpolation1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Interpolation1D.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Interpolation1D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Interpolation1D.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -89,9 +89,9 @@ public final class Interpolation1D exten
     /**
      * Creates a transform from the specified group of parameter values.
      *
-     * @param  factory Ignored (can be null).
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  ignored (can be null).
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws ParameterNotFoundException if a required parameter was not found.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualArea.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -108,7 +108,7 @@ public final class LambertCylindricalEqu
     /**
      * {@inheritDoc}
      *
-     * @return The map projection created from the given parameter values.
+     * @return the map projection created from the given parameter values.
      */
     @Override
     protected NormalizedProjection createProjection(final Parameters parameters) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LambertCylindricalEqualAreaSpherical.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -80,7 +80,7 @@ public final class LambertCylindricalEqu
     /**
      * {@inheritDoc}
      *
-     * @return The map projection created from the given parameter values.
+     * @return the map projection created from the given parameter values.
      */
     @Override
     protected NormalizedProjection createProjection(final Parameters parameters) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/LongitudeRotation.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -96,9 +96,9 @@ public final class LongitudeRotation ext
      * does not, so maybe our unconditional conversion to degrees would be more surprising for the user if the
      * operation was shown as a "Longitude rotation".</p>
      *
-     * @param  factory Ignored (can be null).
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  ignored (can be null).
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws ParameterNotFoundException if a required parameter was not found.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -153,8 +153,8 @@ public abstract class MapProjection exte
      * were instances of {@code DefaultParameterValue}, or that the descriptor associated to
      * the user-specified {@code ParameterValue} has sufficient information.
      *
-     * @param  descriptor The descriptor that specify the parameter to validate.
-     * @param  value The parameter value in the units given by the descriptor.
+     * @param  descriptor  the descriptor that specify the parameter to validate.
+     * @param  value       the parameter value in the units given by the descriptor.
      * @throws IllegalArgumentException if the given value is out of bounds.
      *
      * @see #createZeroConstant(ParameterBuilder)
@@ -190,9 +190,9 @@ public abstract class MapProjection exte
     /**
      * Creates a map projection from the specified group of parameter values.
      *
-     * @param  factory The factory to use for creating and concatenating the (de)normalization transforms.
-     * @param  parameters The group of parameter values.
-     * @return The map projection created from the given parameter values.
+     * @param  factory     the factory to use for creating and concatenating the (de)normalization transforms.
+     * @param  parameters  the group of parameter values.
+     * @return the map projection created from the given parameter values.
      * @throws ParameterNotFoundException if a required parameter was not found.
      * @throws FactoryException if the map projection can not be created.
      */
@@ -206,8 +206,8 @@ public abstract class MapProjection exte
     /**
      * Creates a map projection on an ellipsoid having a semi-major axis length of 1.
      *
-     * @param  parameters The group of parameter values.
-     * @return The map projection created from the given parameter values.
+     * @param  parameters  the group of parameter values.
+     * @return the map projection created from the given parameter values.
      * @throws ParameterNotFoundException if a required parameter was not found.
      */
     protected abstract NormalizedProjection createProjection(final Parameters parameters) throws ParameterNotFoundException;

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/Molodensky.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -19,7 +19,6 @@ package org.apache.sis.internal.referenc
 import java.util.Map;
 import java.util.Collections;
 import javax.xml.bind.annotation.XmlTransient;
-import javax.measure.Unit;
 import org.opengis.util.FactoryException;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.parameter.ParameterDescriptor;
@@ -113,7 +112,7 @@ public final class Molodensky extends Ge
      * This is similar to the standard parameters except that the redundant target axes
      * lengths are omitted.
      *
-     * @return Internal parameter descriptor.
+     * @return internal parameter descriptor.
      */
     @Debug
     public static ParameterDescriptorGroup internal() {
@@ -165,9 +164,9 @@ public final class Molodensky extends Ge
     /**
      * Creates a Molodensky transform from the specified group of parameter values.
      *
-     * @param  factory The factory to use for creating concatenated transforms.
-     * @param  values  The group of parameter values.
-     * @return The created Molodensky transform.
+     * @param  factory  the factory to use for creating concatenated transforms.
+     * @param  values   the group of parameter values.
+     * @return the created Molodensky transform.
      * @throws FactoryException if a transform can not be created.
      */
     @Override
@@ -182,12 +181,12 @@ public final class Molodensky extends Ge
      * Creates a (potentially abridged) Molodensky transform from the specified group of parameter values.
      * The specified number of dimensions are <em>default</em> values; they may be overridden by user parameters.
      *
-     * @param  factory          The factory to use for creating concatenated transforms.
-     * @param  values           The group of parameter values specified by the users.
-     * @param  sourceDimensions Number of source dimensions (2 or 3) of the operation method.
-     * @param  targetDimensions Number of target dimensions (2 or 3) of the operation method.
-     * @param  isAbridged       {@code true} for the abridged form.
-     * @return The created (abridged) Molodensky transform.
+     * @param  factory           the factory to use for creating concatenated transforms.
+     * @param  values            the group of parameter values specified by the users.
+     * @param  sourceDimensions  number of source dimensions (2 or 3) of the operation method.
+     * @param  targetDimensions  number of target dimensions (2 or 3) of the operation method.
+     * @param  isAbridged        {@code true} for the abridged form.
+     * @return the created (abridged) Molodensky transform.
      * @throws FactoryException if a transform can not be created.
      */
     static MathTransform createMathTransform(final MathTransformFactory factory, final Parameters values,
@@ -195,7 +194,7 @@ public final class Molodensky extends Ge
     {
         final Integer dim = values.getValue(DIMENSION);
         if (dim != null) {
-            final int n = dim;  // Unboxing.
+            final int n = dim;                            // Unboxing.
             if (n != 2 && n != 3) {
                 throw new InvalidParameterValueException(Errors.format(
                         Errors.Keys.IllegalArgumentValue_2, "dim", dim), "dim", dim);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NADCON.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -21,6 +21,9 @@ import java.io.IOException;
 import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.Files;
 import java.nio.channels.ReadableByteChannel;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.measure.quantity.Angle;
@@ -42,11 +45,6 @@ import org.apache.sis.util.resources.Err
 import org.apache.sis.internal.system.DataDirectory;
 import org.apache.sis.measure.Units;
 
-// Branch-dependent imports
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.Files;
-
 
 /**
  * The provider for <cite>"North American Datum Conversion"</cite> (EPSG:9613).
@@ -113,7 +111,7 @@ public final class NADCON extends Abstra
     /**
      * Returns the base interface of the {@code CoordinateOperation} instances that use this method.
      *
-     * @return Fixed to {@link Transformation}.
+     * @return fixed to {@link Transformation}.
      */
     @Override
     public Class<Transformation> getOperationType() {
@@ -123,9 +121,9 @@ public final class NADCON extends Abstra
     /**
      * Creates a transform from the specified group of parameter values.
      *
-     * @param  factory The factory to use if this constructor needs to create other math transforms.
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  the factory to use if this constructor needs to create other math transforms.
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws ParameterNotFoundException if a required parameter was not found.
      * @throws FactoryException if an error occurred while loading the grid.
      */
@@ -142,8 +140,8 @@ public final class NADCON extends Abstra
      * Returns the grid of the given name. This method returns the cached instance if it still exists,
      * or load the grid otherwise.
      *
-     * @param latitudeShifts   Name of the grid file for latitude shifts.
-     * @param longitudeShifts  Name of the grid file for longitude shifts.
+     * @param latitudeShifts   name of the grid file for latitude shifts.
+     * @param longitudeShifts  name of the grid file for longitude shifts.
      */
     @SuppressWarnings("null")
     static DatumShiftGridFile<Angle,Angle> getOrLoad(final Path latitudeShifts, final Path longitudeShifts)
@@ -260,10 +258,10 @@ public final class NADCON extends Abstra
          * Creates a new reader for the given channel. The file can be binary or ASCII.
          * This constructor parses the header immediately, but does not read any grid.
          *
-         * @param  channel Where to read data from.
-         * @param  buffer  The buffer to use. That buffer must use little endian byte order
+         * @param channel  where to read data from.
+         * @param buffer   the buffer to use. That buffer must use little endian byte order
          *                 and have a capacity divisible by the size of the {@code float} type.
-         * @param  file    Path to the longitude or latitude difference file. Used only for error reporting.
+         * @param file     path to the longitude or latitude difference file. Used only for error reporting.
          */
         Loader(final ReadableByteChannel channel, final ByteBuffer buffer, final Path file)
                 throws IOException, FactoryException
@@ -318,21 +316,21 @@ public final class NADCON extends Abstra
             int newLine = 0;
             while (buffer.hasRemaining()) {
                 final char c = (char) buffer.get();
-                if (c != ' ' && !(c >= '+' && c <= '9' && c != ',' && c != '/')) {  // (space) + - . [0-9]
+                if (c != ' ' && !(c >= '+' && c <= '9' && c != ',' && c != '/')) {          // (space) + - . [0-9]
                     if (c == '\r' || c == '\n') {
                         if (newLine == 0) {
                             newLine = buffer.position();
                         }
                     } else {
                         if (newLine == 0 && c >= 32 & c <= 126) {
-                            continue;   // Accept other US-ASCII characters ony on the first line.
+                            continue;                   // Accept other US-ASCII characters ony on the first line.
                         }
                         return false;
                     }
                 }
             }
             if (newLine == 0) {
-                return false;   // If it was an ASCII file, we would have found at least one EOL character.
+                return false;          // If it was an ASCII file, we would have found at least one EOL character.
             }
             buffer.position(newLine);
             return true;
@@ -375,9 +373,9 @@ public final class NADCON extends Abstra
          *
          * The result is stored in the {@link #grid} field.
          *
-         * @param fb              A {@code FloatBuffer} view over the full {@link #buffer} range.
-         * @param latitudeShifts  The previously loaded latitude shifts, or {@code null} if not yet loaded.
-         * @param longitudeShifts The file for the longitude grid, or {@code null} if identical to {@link #file}.
+         * @param fb               a {@code FloatBuffer} view over the full {@link #buffer} range.
+         * @param latitudeShifts   the previously loaded latitude shifts, or {@code null} if not yet loaded.
+         * @param longitudeShifts  the file for the longitude grid, or {@code null} if identical to {@link #file}.
          */
         final void readGrid(final FloatBuffer fb, final Loader latitudeShifts, final Path longitudeShifts)
                 throws IOException, FactoryException, NoninvertibleTransformException
@@ -385,8 +383,8 @@ public final class NADCON extends Abstra
             final int dim;
             final double scale;
             if (latitudeShifts == null) {
-                dim   = 1;                          // Dimension of latitudes.
-                scale = DEGREES_TO_SECONDS * Δy;    // NADCON shifts are positive north.
+                dim   = 1;                                              // Dimension of latitudes.
+                scale = DEGREES_TO_SECONDS * Δy;                        // NADCON shifts are positive north.
                 grid  = new DatumShiftGridFile.Float<>(2, Units.DEGREE, Units.DEGREE,
                         true, x0, y0, Δx, Δy, nx, ny, PARAMETERS, file, longitudeShifts);
                 grid.accuracy = SECOND_PRECISION / DEGREES_TO_SECONDS;
@@ -397,9 +395,9 @@ public final class NADCON extends Abstra
                     throw new FactoryException(Errors.format(Errors.Keys.MismatchedGridGeometry_2,
                             latitudeShifts.file.getFileName(), file.getFileName()));
                 }
-                dim   = 0;                          // Dimension of longitudes
-                scale = -DEGREES_TO_SECONDS * Δx;   // NADCON shifts are positive west.
-                grid  = latitudeShifts.grid;        // Continue writing in existing grid.
+                dim   = 0;                                              // Dimension of longitudes
+                scale = -DEGREES_TO_SECONDS * Δx;                       // NADCON shifts are positive west.
+                grid  = latitudeShifts.grid;                            // Continue writing in existing grid.
             }
             final float[] array = grid.offsets[dim];
             if (ascii != null) {
@@ -460,7 +458,7 @@ public final class NADCON extends Abstra
          */
         private void syncView(final FloatBuffer fb) {
             if ((buffer.position() % Float.BYTES) != 0) {
-                buffer.compact();   // For bytes alignment with FloatBuffer.
+                buffer.compact();                               // For bytes alignment with FloatBuffer.
             }
             fb.limit(buffer.limit() / Float.BYTES).position(buffer.position() / Float.BYTES);
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/NTv2.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -26,7 +26,10 @@ import java.util.logging.LogRecord;
 import java.io.IOException;
 import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.channels.ReadableByteChannel;
+import java.nio.charset.StandardCharsets;
 import javax.xml.bind.annotation.XmlTransient;
 import javax.measure.Unit;
 import javax.measure.quantity.Angle;
@@ -50,11 +53,6 @@ import org.apache.sis.util.resources.Err
 import org.apache.sis.util.resources.Messages;
 import org.apache.sis.measure.Units;
 
-// Branch-dependent imports
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.charset.StandardCharsets;
-
 
 /**
  * The provider for <cite>"National Transformation version 2"</cite> (EPSG:9615).
@@ -105,7 +103,7 @@ public final class NTv2 extends Abstract
     /**
      * Returns the base interface of the {@code CoordinateOperation} instances that use this method.
      *
-     * @return Fixed to {@link Transformation}.
+     * @return fixed to {@link Transformation}.
      */
     @Override
     public Class<Transformation> getOperationType() {
@@ -115,9 +113,9 @@ public final class NTv2 extends Abstract
     /**
      * Creates a transform from the specified group of parameter values.
      *
-     * @param  factory The factory to use if this constructor needs to create other math transforms.
-     * @param  values The group of parameter values.
-     * @return The created math transform.
+     * @param  factory  the factory to use if this constructor needs to create other math transforms.
+     * @param  values   the group of parameter values.
+     * @return the created math transform.
      * @throws ParameterNotFoundException if a required parameter was not found.
      * @throws FactoryException if an error occurred while loading the grid.
      */
@@ -133,7 +131,7 @@ public final class NTv2 extends Abstract
      * Returns the grid of the given name. This method returns the cached instance if it still exists,
      * or load the grid otherwise.
      *
-     * @param file Name of the datum shift grid file to load.
+     * @param  file  name of the datum shift grid file to load.
      */
     @SuppressWarnings("null")
     static DatumShiftGridFile<Angle,Angle> getOrLoad(final Path file) throws FactoryException {
@@ -247,8 +245,8 @@ public final class NTv2 extends Abstract
          * Creates a new reader for the given channel.
          * This constructor parses the header immediately, but does not read any grid.
          *
-         * @param  channel Where to read data from.
-         * @param  file Path to the longitude and latitude difference file. Used only for error reporting.
+         * @param  channel  where to read data from.
+         * @param  file     path to the longitude and latitude difference file. Used only for error reporting.
          * @throws FactoryException if a data record can not be parsed.
          */
         Loader(final ReadableByteChannel channel, final Path file) throws IOException, FactoryException {
@@ -297,7 +295,7 @@ public final class NTv2 extends Abstract
             final Unit<Angle> unit;
             final double precision;
             final String name = (String) get("GS_TYPE");
-            if (name.equalsIgnoreCase("SECONDS")) {         // Most common value
+            if (name.equalsIgnoreCase("SECONDS")) {                 // Most common value
                 unit = Units.ARC_SECOND;
                 precision = SECOND_PRECISION;                       // Used only as a hint; will not hurt if wrong.
             } else if (name.equalsIgnoreCase("MINUTES")) {
@@ -311,10 +309,10 @@ public final class NTv2 extends Abstract
             }
             final double  ymin     = (Double)  get("S_LAT");
             final double  ymax     = (Double)  get("N_LAT");
-            final double  xmin     = (Double)  get("E_LONG");    // Sign reversed compared to usual convention.
-            final double  xmax     = (Double)  get("W_LONG");    // Idem.
+            final double  xmin     = (Double)  get("E_LONG");       // Sign reversed compared to usual convention.
+            final double  xmax     = (Double)  get("W_LONG");       // Idem.
             final double  dy       = (Double)  get("LAT_INC");
-            final double  dx       = (Double)  get("LONG_INC");  // Positive toward west.
+            final double  dx       = (Double)  get("LONG_INC");     // Positive toward west.
             final Integer declared = (Integer) header.get("GS_COUNT");
             final int     width    = Math.toIntExact(Math.round((xmax - xmin) / dx + 1));
             final int     height   = Math.toIntExact(Math.round((ymax - ymin) / dy + 1));
@@ -368,8 +366,8 @@ public final class NTv2 extends Abstract
          * It may be the overview header (in which case we expect {@code NUM_OREC} records)
          * or a sub-grid header (in which case we expect {@code NUM_SREC} records).
          *
-         * @param numRecords Default number of expected records (usually 11).
-         * @param numkey Key of the record giving the number of records: {@code "NUM_OREC"} or {@code "NUM_SREC"}.
+         * @param  numRecords  default number of expected records (usually 11).
+         * @param  numkey      key of the record giving the number of records: {@code "NUM_OREC"} or {@code "NUM_SREC"}.
          */
         private void readHeader(int numRecords, final String numkey) throws IOException, FactoryException {
             int position = buffer.position();

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/ObliqueStereographic.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -96,7 +96,7 @@ public final class ObliqueStereographic
     /**
      * {@inheritDoc}
      *
-     * @return The map projection created from the given parameter values.
+     * @return the map projection created from the given parameter values.
      */
     @Override
     protected NormalizedProjection createProjection(Parameters parameters) throws ParameterNotFoundException {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/PolarStereographicSouth.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -48,8 +48,8 @@ public final class PolarStereographicSou
      * is promoted as the primary name. The old primary name and identifiers (which are usually the
      * EPSG ones) are discarded.
      *
-     * @param  template    the parameter from which to copy the names and identifiers.
-     * @param  builder     an initially clean builder where to add the names.
+     * @param  template  the parameter from which to copy the names and identifiers.
+     * @param  builder   an initially clean builder where to add the names.
      * @return the given {@code builder}, for method call chaining.
      */
     @SuppressWarnings("unchecked")



Mime
View raw message