Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MissingFactoryResourceException.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -54,8 +54,7 @@ public class MissingFactoryResourceExcep
     /**
      * Construct an exception with the specified detail message.
      *
-     * @param  message The detail message. The detail message is saved
-     *         for later retrieval by the {@link #getMessage()} method.
+     * @param  message  the detail message, saved for later retrieval by the {@link #getMessage()} method.
      */
     public MissingFactoryResourceException(String message) {
         super(message);
@@ -66,10 +65,8 @@ public class MissingFactoryResourceExcep
      * The cause is the exception thrown in the underlying database
      * (e.g. {@link java.io.IOException} or {@link java.sql.SQLException}).
      *
-     * @param  message The detail message. The detail message is saved
-     *         for later retrieval by the {@link #getMessage()} method.
-     * @param  cause The cause for this exception. The cause is saved
-     *         for later retrieval by the {@link #getCause()} method.
+     * @param  message  the detail message, saved for later retrieval by the {@link #getMessage()} method.
+     * @param  cause    the cause for this exception, saved for later retrieval by the {@link #getCause()} method.
      */
     public MissingFactoryResourceException(String message, Throwable cause) {
         super(message, cause);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -725,7 +725,7 @@ public class MultiAuthoritiesFactory ext
      * @param  proxy  the proxy to use for creating the object.
      * @param  code   the code of the object to create.
      * @return the object from one of the authority factory specified at construction time.
-     * @throws FactoryException If an error occurred while creating the object.
+     * @throws FactoryException if an error occurred while creating the object.
      */
     final <T> T create(AuthorityFactoryProxy<? extends T> proxy, String code) throws FactoryException {
         ArgumentChecks.ensureNonNull("code", code);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/NoSuchAuthorityFactoryException.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -38,8 +38,8 @@ public class NoSuchAuthorityFactoryExcep
     /**
      * Constructs an exception with the specified detail message and authority name.
      *
-     * @param  message   The detail message, saved for later retrieval by the {@link #getMessage()} method.
-     * @param  authority The authority, saved for retrieval by the {@link #getAuthority()} method.
+     * @param  message    the detail message, saved for later retrieval by the {@link #getMessage()} method.
+     * @param  authority  the authority, saved for retrieval by the {@link #getAuthority()} method.
      */
     public NoSuchAuthorityFactoryException(final String message, final String authority) {
         super(message, authority, null, authority);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/BursaWolfInfo.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -78,11 +78,11 @@ final class BursaWolfInfo {
      * This method does not recognize the time-dependent parameters (EPSG:1040 to 1046) because
      * they are not used in WKT 1 {@code TOWGS84} elements.
      *
-     * @param  parameters The Bursa-Wolf parameters to modify.
-     * @param  code       The EPSG code for a parameter from the [PARAMETER_CODE] column.
-     * @param  value      The value of the parameter from the [PARAMETER_VALUE] column.
-     * @param  unit       The unit of the parameter value from the [UOM_CODE] column.
-     * @param  locale     The locale, used only if an error message need to be formatted.
+     * @param  parameters  the Bursa-Wolf parameters to modify.
+     * @param  code        the EPSG code for a parameter from the [PARAMETER_CODE] column.
+     * @param  value       the value of the parameter from the [PARAMETER_VALUE] column.
+     * @param  unit        the unit of the parameter value from the [UOM_CODE] column.
+     * @param  locale      the locale, used only if an error message need to be formatted.
      * @throws FactoryDataException if the code is unrecognized.
      */
     static void setBursaWolfParameter(final BursaWolfParameters parameters, final int code,
@@ -175,7 +175,7 @@ final class BursaWolfInfo {
     /**
      * Gets the domain of validity. The result is cached.
      *
-     * @param factory The factory to use for creating {@code Extent} instances.
+     * @param  factory  the factory to use for creating {@code Extent} instances.
      */
     Extent getDomainOfValidity(final GeodeticAuthorityFactory factory) throws FactoryException {
         if (extent == null && domainOfValidity != 0) {
@@ -190,9 +190,9 @@ final class BursaWolfInfo {
      * first one is retained. This presume that the instances have already been sorted for preference order
      * before to invoke this method.
      *
-     * @param factory     The factory to use for creating {@code Extent} instances.
-     * @param candidates  The Bursa-Wolf parameters candidates.
-     * @param addTo       Where to add the instances retained by this method.
+     * @param  factory     the factory to use for creating {@code Extent} instances.
+     * @param  candidates  the Bursa-Wolf parameters candidates.
+     * @param  addTo       where to add the instances retained by this method.
      */
     static void filter(final GeodeticAuthorityFactory factory, final BursaWolfInfo[] candidates,
             final List<BursaWolfInfo> addTo) throws FactoryException

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/CoordinateOperationSet.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -55,8 +55,8 @@ final class CoordinateOperationSet exten
     /**
      * Adds the specified authority code.
      *
-     * @param code The code for the {@link CoordinateOperation} to add.
-     * @param crs  The code for the CRS to create instead of the operation, or {@code null} if none.
+     * @param  code  the code for the {@link CoordinateOperation} to add.
+     * @param  crs   the code for the CRS to create instead of the operation, or {@code null} if none.
      */
     final void addAuthorityCode(final String code, final Integer crs) {
         if (crs != null) {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -2214,9 +2214,9 @@ addURIs:    for (int i=0; ; i++) {
      * <p><strong>WARNING:</strong> The EPSG database uses "{@code ORDER}" as a column name.
      * This is tolerated by Access, but MySQL does not accept that name.</p>
      *
-     * @param  cs the EPSG code for the coordinate system.
-     * @param  dimension of the coordinate system, which is also the size of the returned array.
-     * @return An array of coordinate system axis.
+     * @param  cs         the EPSG code for the coordinate system.
+     * @param  dimension  of the coordinate system, which is also the size of the returned array.
+     * @return an array of coordinate system axis.
      * @throws SQLException if an error occurred during database access.
      * @throws FactoryException if the code has not been found.
      */
@@ -2731,8 +2731,8 @@ next:               while (r.next()) {
      *   <tr><td>6326</td> <td>NAD83(2011) to NAVD88 height (1)</td></tr>
      * </table></div>
      *
-     * @param  code Value allocated by EPSG.
-     * @return The operation for the given code.
+     * @param  code  value allocated by EPSG.
+     * @return the operation for the given code.
      * @throws NoSuchAuthorityCodeException if the specified {@code code} was not found.
      * @throws FactoryException if the object creation failed for some other reason.
      */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/AbstractSingleOperation.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -19,6 +19,7 @@ package org.apache.sis.referencing.opera
 import java.util.Map;
 import java.util.List;
 import java.util.IdentityHashMap;
+import java.util.Objects;
 import javax.xml.bind.Unmarshaller;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlSeeAlso;
@@ -57,9 +58,6 @@ import org.apache.sis.util.ComparisonMod
 
 import static org.apache.sis.util.Utilities.deepEquals;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * Shared implementation for {@link DefaultConversion} and {@link DefaultTransformation}.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CRSPair.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.referencing.operation;
 
+import java.util.Objects;
 import org.opengis.referencing.cs.EllipsoidalCS;
 import org.opengis.referencing.cs.CoordinateSystem;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -25,9 +26,6 @@ import org.apache.sis.referencing.Identi
 import org.apache.sis.util.CharSequences;
 import org.apache.sis.util.Classes;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * A pair of source-destination {@link CoordinateReferenceSystem} objects.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationContext.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -84,8 +84,8 @@ public class CoordinateOperationContext
     /**
      * Creates a new context with the given area of interest and desired accuracy.
      *
-     * @param area     The area of interest, or {@code null} if none.
-     * @param accuracy The desired accuracy in metres, or 0 for the best accuracy available.
+     * @param area      the area of interest, or {@code null} if none.
+     * @param accuracy  the desired accuracy in metres, or 0 for the best accuracy available.
      * See {@link #getDesiredAccuracy()} for more details about what we mean by <cite>"best accuracy"</cite>.
      */
     public CoordinateOperationContext(final Extent area, final double accuracy) {
@@ -97,7 +97,7 @@ public class CoordinateOperationContext
     /**
      * Returns the spatio-temporal area of interest, or {@code null} if none.
      *
-     * @return The spatio-temporal area of interest, or {@code null} if none.
+     * @return the spatio-temporal area of interest, or {@code null} if none.
      *
      * @see Extents#getGeographicBoundingBox(Extent)
      */
@@ -108,7 +108,7 @@ public class CoordinateOperationContext
     /**
      * Sets the spatio-temporal area of interest, or {@code null} if none.
      *
-     * @param area The spatio-temporal area of interest, or {@code null} if none.
+     * @param  area  the spatio-temporal area of interest, or {@code null} if none.
      */
     public void setAreaOfInterest(Extent area) {
         if (area != null) {
@@ -124,7 +124,7 @@ public class CoordinateOperationContext
      * <p>The reverse operation can be done with <code>{@linkplain Extents#getGeographicBoundingBox(Extent)
      * Extents.getGeographicBoundingBox}({@linkplain #getAreaOfInterest()})</code>.</p>
      *
-     * @param area The geographic area of interest, or {@code null} if none.
+     * @param  area  the geographic area of interest, or {@code null} if none.
      */
     public void setAreaOfInterest(final GeographicBoundingBox area) {
         areaOfInterest = setGeographicBoundingBox(areaOfInterest, area);
@@ -153,7 +153,7 @@ public class CoordinateOperationContext
      * But if all coordinate operations defined by the authority use the Abridged Molodensky method, then SIS will ignore
      * the Molodensky one.</p>
      *
-     * @return The desired accuracy in metres.
+     * @return the desired accuracy in metres.
      */
     public double getDesiredAccuracy() {
         return desiredAccuracy;
@@ -164,7 +164,7 @@ public class CoordinateOperationContext
      * A value of 0 means to search for the most accurate operation.
      * See {@link #getDesiredAccuracy()} for more details about what we mean by <cite>"most accurate"</cite>.
      *
-     * @param accuracy The desired accuracy in metres.
+     * @param  accuracy  the desired accuracy in metres.
      */
     public void setDesiredAccuracy(final double accuracy) {
         ArgumentChecks.ensurePositive("accuracy", accuracy);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -735,10 +735,10 @@ public class CoordinateOperationFinder e
      * various combinations of source and target components. A preference is given for components of the same
      * type (e.g. source {@link GeodeticCRS} with target {@code GeodeticCRS}, <i>etc.</i>).
      *
-     * @param  sourceCRS        input coordinate reference system.
-     * @param  sourceComponents components of the source CRS.
-     * @param  targetCRS        output coordinate reference system.
-     * @param  targetComponents components of the target CRS.
+     * @param  sourceCRS         input coordinate reference system.
+     * @param  sourceComponents  components of the source CRS.
+     * @param  targetCRS         output coordinate reference system.
+     * @param  targetComponents  components of the target CRS.
      * @return a coordinate operation from {@code sourceCRS} to {@code targetCRS}.
      * @throws FactoryException if the operation can not be constructed.
      */
@@ -883,11 +883,11 @@ public class CoordinateOperationFinder e
      * where the {@code name} identifier is {@link #DATUM_SHIFT} or {@link #ELLIPSOID_CHANGE},
      * the operation will be a {@link Transformation} instance instead of {@link Conversion}.
      *
-     * @param  name      The identifier for the operation to be created.
-     * @param  sourceCRS The source coordinate reference system.
-     * @param  targetCRS The target coordinate reference system.
-     * @param  matrix    The matrix which describe an affine transform operation.
-     * @return The conversion or transformation.
+     * @param  name       the identifier for the operation to be created.
+     * @param  sourceCRS  the source coordinate reference system.
+     * @param  targetCRS  the target coordinate reference system.
+     * @param  matrix     the matrix which describe an affine transform operation.
+     * @return the conversion or transformation.
      * @throws FactoryException if the operation can not be created.
      */
     private CoordinateOperation createFromAffineTransform(final Identifier                name,
@@ -908,9 +908,9 @@ public class CoordinateOperationFinder e
      * If one of the given operation steps performs a change of axis order or units,
      * then that change will be merged with the other operation instead of creating an {@link ConcatenatedOperation}.
      *
-     * @param  step1 The first  step, or {@code null} for the identity operation.
-     * @param  step2 The second step, or {@code null} for the identity operation.
-     * @return A concatenated operation, or {@code null} if all arguments were null.
+     * @param  step1  the first  step, or {@code null} for the identity operation.
+     * @param  step2  the second step, or {@code null} for the identity operation.
+     * @return a concatenated operation, or {@code null} if all arguments were null.
      * @throws FactoryException if the operation can't be constructed.
      */
     private CoordinateOperation concatenate(final CoordinateOperation step1,
@@ -972,10 +972,10 @@ public class CoordinateOperationFinder e
      * then it will be included as part of the second operation instead of creating a {@link ConcatenatedOperation}.
      * If a concatenated operation is created, it will get an automatically generated name.
      *
-     * @param  step1 The first  step, or {@code null} for the identity operation.
-     * @param  step2 The second step, or {@code null} for the identity operation.
-     * @param  step3 The third  step, or {@code null} for the identity operation.
-     * @return A concatenated operation, or {@code null} if all arguments were null.
+     * @param  step1  the first  step, or {@code null} for the identity operation.
+     * @param  step2  the second step, or {@code null} for the identity operation.
+     * @param  step3  the third  step, or {@code null} for the identity operation.
+     * @return a concatenated operation, or {@code null} if all arguments were null.
      * @throws FactoryException if the operation can not be constructed.
      */
     private CoordinateOperation concatenate(final CoordinateOperation step1,
@@ -1057,9 +1057,9 @@ public class CoordinateOperationFinder e
      * Returns an error message for "No path found from sourceCRS to targetCRS".
      * This is used for the construction of {@link OperationNotFoundException}.
      *
-     * @param  source the source CRS.
-     * @param  target the target CRS.
-     * @return A default error message.
+     * @param  source  the source CRS.
+     * @param  target  the target CRS.
+     * @return a default error message.
      */
     private static String notFoundMessage(final IdentifiedObject source, final IdentifiedObject target) {
         return Resources.format(Resources.Keys.CoordinateOperationNotFound_2, CRSPair.label(source), CRSPair.label(target));
@@ -1070,7 +1070,7 @@ public class CoordinateOperationFinder e
      * This is used for the construction of {@link OperationNotFoundException}.
      *
      * @param  crs  the CRS having a conversion that can not be inverted.
-     * @return A default error message.
+     * @return a default error message.
      */
     private static String canNotInvert(final GeneralDerivedCRS crs) {
         return Resources.format(Resources.Keys.NonInvertibleOperation_1, crs.getConversionFromBase().getName().getCode());

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import javax.measure.IncommensurableException;
@@ -76,7 +77,6 @@ import org.apache.sis.util.collection.Ba
 import org.apache.sis.util.resources.Vocabulary;
 
 // Branch-dependent imports
-import java.util.Objects;
 import java.util.function.Predicate;
 
 

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConcatenatedOperation.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -20,6 +20,7 @@ import java.util.Map;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -41,9 +42,6 @@ import org.apache.sis.io.wkt.Formatter;
 
 import static org.apache.sis.util.Utilities.deepEquals;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * An ordered sequence of two or more single coordinate operations. The sequence of operations is constrained
@@ -156,12 +154,12 @@ final class DefaultConcatenatedOperation
      * since we are adding accuracy informations to a concatenated operation. This departure should be considered
      * as a convenience feature only; accuracies are really relevant in transformations only.</div>
      *
-     * @param  properties  the properties specified at construction time, or {@code null} if unknown.
-     * @param  operations  the operations to concatenate.
-     * @param  flattened   the destination list in which to add the {@code SingleOperation} instances.
-     * @param  mtFactory   the math transform factory to use, or {@code null} for not performing concatenation.
-     * @param  setAccuracy {@code true} for setting the {@link #coordinateOperationAccuracy} field.
-     * @param  setDomain   {@code true} for setting the {@link #domainOfValidity} field.
+     * @param  properties   the properties specified at construction time, or {@code null} if unknown.
+     * @param  operations   the operations to concatenate.
+     * @param  flattened    the destination list in which to add the {@code SingleOperation} instances.
+     * @param  mtFactory    the math transform factory to use, or {@code null} for not performing concatenation.
+     * @param  setAccuracy  {@code true} for setting the {@link #coordinateOperationAccuracy} field.
+     * @param  setDomain    {@code true} for setting the {@link #domainOfValidity} field.
      * @throws FactoryException if the factory can not concatenate the math transforms.
      */
     private void initialize(final Map<String,?>             properties,

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConicProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConicProjection.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConicProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConicProjection.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -50,11 +50,11 @@ final class DefaultConicProjection exten
     /**
      * Creates a projection from the given properties.
      *
-     * @param properties The properties to be given to the identified object.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param method     The coordinate operation method.
-     * @param transform  Transform from positions in the source CRS to positions in the target CRS.
+     * @param  properties  the properties to be given to the identified object.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  method      the coordinate operation method.
+     * @param  transform   transform from positions in the source CRS to positions in the target CRS.
      */
     public DefaultConicProjection(final Map<String,?>   properties,
                                   final GeographicCRS   sourceCRS,
@@ -70,11 +70,11 @@ final class DefaultConicProjection exten
      * specified source and target CRS. While the source conversion can be an arbitrary one, it
      * is typically a defining conversion.
      *
-     * @param definition The defining conversion.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param factory    The factory to use for creating a transform from the parameters or for performing axis changes.
-     * @param actual     An array of length 1 where to store the actual operation method used by the math transform factory.
+     * @param  definition  the defining conversion.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  factory     the factory to use for creating a transform from the parameters or for performing axis changes.
+     * @param  actual      an array of length 1 where to store the actual operation method used by the math transform factory.
      */
     DefaultConicProjection(final Conversion definition,
                            final CoordinateReferenceSystem sourceCRS,
@@ -92,7 +92,7 @@ final class DefaultConicProjection exten
      *
      * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
      *
-     * @param operation The coordinate operation to copy.
+     * @param  operation  the coordinate operation to copy.
      */
     protected DefaultConicProjection(final ConicProjection operation) {
         super(operation);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -144,13 +144,13 @@ public class DefaultConversion extends A
      * with different source and target datum, it does not accept to use such instances for
      * {@linkplain org.apache.sis.referencing.crs.DefaultDerivedCRS derived CRS} construction.
      *
-     * @param properties  the properties to be given to the identified object.
-     * @param sourceCRS   the source CRS.
-     * @param targetCRS   the target CRS, which shall use a datum
-     *                    {@linkplain Utilities#equalsIgnoreMetadata equals (ignoring metadata)} to the source CRS datum.
+     * @param properties        the properties to be given to the identified object.
+     * @param sourceCRS         the source CRS.
+     * @param targetCRS         the target CRS, which shall use a datum {@linkplain Utilities#equalsIgnoreMetadata
+     *                          equals (ignoring metadata)} to the source CRS datum.
      * @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 transform   transform from positions in the source CRS to positions in the target CRS.
+     * @param method            the coordinate operation method (mandatory in all cases).
+     * @param transform         transform from positions in the source CRS to positions in the target CRS.
      */
     public DefaultConversion(final Map<String,?>             properties,
                              final CoordinateReferenceSystem sourceCRS,

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -42,6 +42,7 @@ import org.apache.sis.internal.util.Coll
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.referencing.CRS;
 import org.apache.sis.referencing.factory.InvalidGeodeticParameterException;
+import org.apache.sis.referencing.operation.transform.AbstractMathTransform;
 import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
 import org.apache.sis.util.collection.WeakHashSet;
 import org.apache.sis.util.collection.Containers;
@@ -150,10 +151,10 @@ public class DefaultCoordinateOperationF
      * for any property not present in the map provided to a {@code createFoo(Map<String,?>, …)} method.
      *
      * @param properties  the default properties, or {@code null} if none.
-     * @param factory     the factory to use for creating
-     *        {@linkplain org.apache.sis.referencing.operation.transform.AbstractMathTransform math transforms},
-     *        or {@code null} for the default factory.
+     * @param factory     the factory to use for creating {@linkplain AbstractMathTransform math transforms},
+     *                    or {@code null} for the default factory.
      */
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     public DefaultCoordinateOperationFactory(Map<String,?> properties, final MathTransformFactory factory) {
         if (properties == null || properties.isEmpty()) {
             properties = Collections.emptyMap();
@@ -432,7 +433,7 @@ next:   for (int i=components.size(); --
             final Datum d = components.get(i).getDatum();
             for (int j=n; --j >= 0;) {
                 if (Utilities.equalsIgnoreMetadata(d, datum[j])) {
-                    System.arraycopy(datum, j+1, datum, j, --n - j);  // Remove the datum from the list.
+                    System.arraycopy(datum, j+1, datum, j, --n - j);    // Remove the datum from the list.
                     continue next;
                 }
             }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCylindricalProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCylindricalProjection.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCylindricalProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCylindricalProjection.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -50,11 +50,11 @@ final class DefaultCylindricalProjection
     /**
      * Creates a projection from the given properties.
      *
-     * @param properties The properties to be given to the identified object.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param method     The coordinate operation method.
-     * @param transform  Transform from positions in the source CRS to positions in the target CRS.
+     * @param  properties  the properties to be given to the identified object.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  method      the coordinate operation method.
+     * @param  transform   transform from positions in the source CRS to positions in the target CRS.
      */
     public DefaultCylindricalProjection(final Map<String,?>   properties,
                                         final GeographicCRS   sourceCRS,
@@ -70,11 +70,11 @@ final class DefaultCylindricalProjection
      * specified source and target CRS. While the source conversion can be an arbitrary one, it
      * is typically a defining conversion.
      *
-     * @param definition The defining conversion.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param factory    The factory to use for creating a transform from the parameters or for performing axis changes.
-     * @param actual     An array of length 1 where to store the actual operation method used by the math transform factory.
+     * @param  definition  the defining conversion.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  factory     the factory to use for creating a transform from the parameters or for performing axis changes.
+     * @param  actual      an array of length 1 where to store the actual operation method used by the math transform factory.
      */
     DefaultCylindricalProjection(final Conversion definition,
                                  final CoordinateReferenceSystem sourceCRS,
@@ -92,7 +92,7 @@ final class DefaultCylindricalProjection
      *
      * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
      *
-     * @param operation The coordinate operation to copy.
+     * @param  operation  the coordinate operation to copy.
      */
     protected DefaultCylindricalProjection(final CylindricalProjection operation) {
         super(operation);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultFormula.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultFormula.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultFormula.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultFormula.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -16,6 +16,7 @@
  */
 package org.apache.sis.referencing.operation;
 
+import java.util.Objects;
 import java.io.Serializable;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.citation.Citation;
@@ -28,9 +29,6 @@ import org.apache.sis.util.iso.Types;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * Specification of the coordinate operation method formula.
@@ -79,7 +77,7 @@ public class DefaultFormula extends Form
     /**
      * Creates a new formula from the given string.
      *
-     * @param formula The formula.
+     * @param formula  the formula.
      */
     public DefaultFormula(final CharSequence formula) {
         ensureNonNull("formula", formula);
@@ -90,7 +88,7 @@ public class DefaultFormula extends Form
     /**
      * Creates a new formula from the given citation.
      *
-     * @param citation The citation.
+     * @param citation  the citation.
      */
     public DefaultFormula(final Citation citation) {
         ensureNonNull("citation", citation);
@@ -105,7 +103,7 @@ public class DefaultFormula extends Form
      *
      * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
      *
-     * @param formula The formula to copy.
+     * @param formula  the formula to copy.
      *
      * @see #castOrCopy(Formula)
      */
@@ -121,8 +119,8 @@ public class DefaultFormula extends Form
      * 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 DefaultFormula castOrCopy(final Formula object) {
@@ -161,7 +159,7 @@ public class DefaultFormula extends Form
     /**
      * Compares this formula with the given object for equality.
      *
-     * @param  object The object to compare with this formula.
+     * @param  object  the object to compare with this formula.
      * @return {@code true} if both objects are equal.
      */
     @Override

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultOperationMethod.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -19,6 +19,7 @@ package org.apache.sis.referencing.opera
 import java.util.Map;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.Collections;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
@@ -61,9 +62,6 @@ import org.apache.sis.io.wkt.Formattable
 
 import static org.apache.sis.util.ArgumentChecks.*;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * Describes the algorithm and parameters used to perform a coordinate operation. An {@code OperationMethod}
@@ -236,10 +234,10 @@ public class DefaultOperationMethod exte
      * The source and target dimensions may be {@code null} if this method can work
      * with any number of dimensions (e.g. <cite>Affine Transform</cite>).
      *
-     * @param properties       Set of properties. Shall contain at least {@code "name"}.
-     * @param sourceDimensions Number of dimensions in the source CRS of this operation method, or {@code null}.
-     * @param targetDimensions Number of dimensions in the target CRS of this operation method, or {@code null}.
-     * @param parameters       Description of parameters expected by this operation.
+     * @param  properties        set of properties. Shall contain at least {@code "name"}.
+     * @param  sourceDimensions  number of dimensions in the source CRS of this operation method, or {@code null}.
+     * @param  targetDimensions  number of dimensions in the target CRS of this operation method, or {@code null}.
+     * @param  parameters        description of parameters expected by this operation.
      */
     public DefaultOperationMethod(final Map<String,?> properties,
                                   final Integer sourceDimensions,
@@ -272,7 +270,7 @@ public class DefaultOperationMethod exte
      * The information provided in the newly created object are approximative, and
      * usually acceptable only as a fallback when no other information are available.
      *
-     * @param transform The math transform to describe.
+     * @param  transform  the math transform to describe.
      */
     public DefaultOperationMethod(final MathTransform transform) {
         super(getProperties(transform));
@@ -317,10 +315,10 @@ public class DefaultOperationMethod exte
      * This method returns a mutable map. Consequently, callers can add their own identifiers
      * directly to this map if they wish.
      *
-     * @param  info The identified object to view as a properties map.
-     * @param  authority The new authority for the object to be created,
-     *         or {@code null} if it is not going to have any declared authority.
-     * @return The identified object properties in a mutable map.
+     * @param  info       the identified object to view as a properties map.
+     * @param  authority  the new authority for the object to be created,
+     *                    or {@code null} if it is not going to have any declared authority.
+     * @return the identified object properties in a mutable map.
      */
     private static Map<String,Object> getProperties(final IdentifiedObject info, final Citation authority) {
         final Map<String,Object> properties = new HashMap<>(IdentifiedObjects.getProperties(info));
@@ -336,7 +334,7 @@ public class DefaultOperationMethod exte
      *
      * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
      *
-     * @param method The operation method to copy.
+     * @param  method  the operation method to copy.
      *
      * @see #castOrCopy(OperationMethod)
      */
@@ -354,8 +352,8 @@ public class DefaultOperationMethod exte
      * Otherwise if the given object is already a SIS implementation, then the given object is returned unchanged.
      * Otherwise a new SIS implementation is created and initialized to the attribute values of the given object.
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultOperationMethod castOrCopy(final OperationMethod object) {
@@ -368,9 +366,9 @@ public class DefaultOperationMethod exte
      * The source and target dimensions may be {@code null} if this method can work with any number of dimensions
      * (e.g. <cite>Affine Transform</cite>).
      *
-     * @param method           The operation method to copy.
-     * @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  method            the operation method to copy.
+     * @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.
      */
     private DefaultOperationMethod(final OperationMethod method,
                                    final Integer sourceDimensions,
@@ -388,11 +386,11 @@ public class DefaultOperationMethod exte
      * This method accepts to change a dimension only if the value specified by the original method
      * is {@code null}. Otherwise an {@link IllegalArgumentException} is thrown.
      *
-     * @param method           The operation method to redimension.
-     * @param sourceDimensions The desired new source dimensions.
-     * @param methodSource     The current number of source dimensions (may be {@code null}).
-     * @param targetDimensions The desired new target dimensions.
-     * @param methodTarget     The current number of target dimensions (may be {@code null}).
+     * @param  method            the operation method to redimension.
+     * @param  sourceDimensions  the desired new source dimensions.
+     * @param  methodSource      the current number of source dimensions (may be {@code null}).
+     * @param  targetDimensions  the desired new target dimensions.
+     * @param  methodTarget      the current number of target dimensions (may be {@code null}).
      * @throws IllegalArgumentException if the given dimensions are illegal for this operation method.
      */
     private static OperationMethod redimension(final OperationMethod method,
@@ -445,10 +443,10 @@ public class DefaultOperationMethod exte
      *   </li>
      * </ul>
      *
-     * @param  method           The operation method to redimension, or {@code null}.
-     * @param  sourceDimensions The desired number of input dimensions.
-     * @param  targetDimensions The desired number of output dimensions.
-     * @return The redimensioned operation method, or {@code null} if the given method was null,
+     * @param  method            the operation method to redimension, or {@code null}.
+     * @param  sourceDimensions  the desired number of input dimensions.
+     * @param  targetDimensions  the desired number of output dimensions.
+     * @return the redimensioned operation method, or {@code null} if the given method was null,
      *         or {@code method} if no change is needed.
      * @throws IllegalArgumentException if the given dimensions are illegal for the given operation method.
      */
@@ -484,9 +482,9 @@ public class DefaultOperationMethod exte
      * but can also work in a two-dimensional space by assuming that the ellipsoidal height is zero
      * everywhere.
      *
-     * @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.
      * @throws IllegalArgumentException if the given dimensions are illegal for this operation method.
      *
      * @since 0.6
@@ -536,7 +534,7 @@ public class DefaultOperationMethod exte
      * The default implementation returns {@code SingleOperation.class},
      * which is the most conservative return value.
      *
-     * @return Interface implemented by all coordinate operations that use this method.
+     * @return interface implemented by all coordinate operations that use this method.
      *
      * @see org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory#getAvailableMethods(Class)
      */
@@ -552,7 +550,7 @@ public class DefaultOperationMethod exte
      * <div class="note"><b>Departure from the ISO 19111 standard:</b>
      * this property is mandatory according ISO 19111, but optional in Apache SIS.</div>
      *
-     * @return The formula used by this method, or {@code null} if unknown.
+     * @return the formula used by this method, or {@code null} if unknown.
      *
      * @see DefaultFormula
      * @see org.apache.sis.referencing.operation.transform.MathTransformProvider
@@ -566,7 +564,7 @@ public class DefaultOperationMethod exte
      * Number of dimensions in the source CRS of this operation method.
      * May be null if unknown, as in an <cite>Affine Transform</cite>.
      *
-     * @return The dimension of source CRS, or {@code null} if unknown.
+     * @return the dimension of source CRS, or {@code null} if unknown.
      *
      * @see org.apache.sis.referencing.operation.transform.AbstractMathTransform#getSourceDimensions()
      */
@@ -581,7 +579,7 @@ public class DefaultOperationMethod exte
      * Number of dimensions in the target CRS of this operation method.
      * May be null if unknown, as in an <cite>Affine Transform</cite>.
      *
-     * @return The dimension of target CRS, or {@code null} if unknown.
+     * @return the dimension of target CRS, or {@code null} if unknown.
      *
      * @see org.apache.sis.referencing.operation.transform.AbstractMathTransform#getTargetDimensions()
      */
@@ -600,7 +598,7 @@ public class DefaultOperationMethod exte
      * {@link #DefaultOperationMethod(MathTransform)} constructor has been unable to infer it
      * or if this {@code OperationMethod} has been read from an incomplete GML document.</div>
      *
-     * @return The parameters, or {@code null} if unknown.
+     * @return the parameters, or {@code null} if unknown.
      *
      * @see DefaultConversion#getParameterDescriptors()
      * @see DefaultConversion#getParameterValues()
@@ -616,16 +614,16 @@ public class DefaultOperationMethod exte
      * {@link ComparisonMode#BY_CONTRACT BY_CONTRACT}, then all available properties
      * are compared including the {@linkplain #getFormula() formula}.
      *
-     * @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 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 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)) {
             switch (mode) {
@@ -680,7 +678,7 @@ public class DefaultOperationMethod exte
      * See {@link org.apache.sis.referencing.AbstractIdentifiedObject#computeHashCode()}
      * for more information.
      *
-     * @return The hash code value. This value may change in any future Apache SIS version.
+     * @return the hash code value. This value may change in any future Apache SIS version.
      */
     @Override
     protected long computeHashCode() {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPassThroughOperation.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -18,6 +18,7 @@ package org.apache.sis.referencing.opera
 
 import java.util.Map;
 import java.util.Arrays;
+import java.util.Objects;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -38,9 +39,6 @@ import org.apache.sis.io.wkt.Formatter;
 
 import static org.apache.sis.util.Utilities.deepEquals;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * Specifies that a subset of a coordinate tuple is subject to a specific coordinate operation.
@@ -97,12 +95,12 @@ public class DefaultPassThroughOperation
      *   </tr>
      * </table>
      *
-     * @param properties The properties to be given to the identified object.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param operation  The operation to apply on the subset of a coordinate tuple.
-     * @param firstAffectedOrdinate Index of the first affected ordinate.
-     * @param numTrailingOrdinates Number of trailing ordinates to pass through.
+     * @param  properties             the properties to be given to the identified object.
+     * @param  sourceCRS              the source CRS.
+     * @param  targetCRS              the target CRS.
+     * @param  operation              the operation to apply on the subset of a coordinate tuple.
+     * @param  firstAffectedOrdinate  index of the first affected ordinate.
+     * @param  numTrailingOrdinates   number of trailing ordinates to pass through.
      */
     public DefaultPassThroughOperation(final Map<String,?>            properties,
                                        final CoordinateReferenceSystem sourceCRS,
@@ -124,7 +122,7 @@ public class DefaultPassThroughOperation
      *
      * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
      *
-     * @param operation The coordinate operation to copy.
+     * @param  operation  the coordinate operation to copy.
      *
      * @see #castOrCopy(PassThroughOperation)
      */
@@ -141,8 +139,8 @@ public class DefaultPassThroughOperation
      * Note that this is a <cite>shallow</cite> copy operation, since the other properties contained in the given
      * object are not recursively copied.
      *
-     * @param  object The object to get as a SIS implementation, or {@code null} if none.
-     * @return A SIS implementation containing the values of the given object (may be the
+     * @param  object  the object to get as a SIS implementation, or {@code null} if none.
+     * @return a SIS implementation containing the values of the given object (may be the
      *         given object itself), or {@code null} if the argument was null.
      */
     public static DefaultPassThroughOperation castOrCopy(final PassThroughOperation object) {
@@ -169,7 +167,7 @@ public class DefaultPassThroughOperation
     /**
      * Returns the operation to apply on the subset of a coordinate tuple.
      *
-     * @return The operation to apply on the subset of a coordinate tuple.
+     * @return the operation to apply on the subset of a coordinate tuple.
      *
      * @see PassThroughTransform#getSubTransform()
      */
@@ -183,7 +181,7 @@ public class DefaultPassThroughOperation
      * Returns the ordered sequence of indices in a source coordinate tuple of the coordinates
      * affected by this pass-through operation.
      *
-     * @return Zero-based indices of the modified source coordinates.
+     * @return zero-based indices of the modified source coordinates.
      *
      * @see PassThroughTransform#getModifiedCoordinates()
      */
@@ -229,7 +227,7 @@ public class DefaultPassThroughOperation
     @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)) {
             if (mode == ComparisonMode.STRICT) {
@@ -256,8 +254,8 @@ public class DefaultPassThroughOperation
      * Current format is specific to Apache SIS and may change in any future version
      * if a standard format for pass through operations is defined.
      *
-     * @param  formatter The formatter to use.
-     * @return Currently {@code "PassThroughOperation"} (may change in any future version).
+     * @param  formatter  the formatter to use.
+     * @return currently {@code "PassThroughOperation"} (may change in any future version).
      *
      * @since 0.7
      */

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPlanarProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPlanarProjection.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPlanarProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultPlanarProjection.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -50,11 +50,11 @@ final class DefaultPlanarProjection exte
     /**
      * Creates a projection from the given properties.
      *
-     * @param properties The properties to be given to the identified object.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param method     The coordinate operation method.
-     * @param transform  Transform from positions in the source CRS to positions in the target CRS.
+     * @param  properties  the properties to be given to the identified object.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  method      the coordinate operation method.
+     * @param  transform   transform from positions in the source CRS to positions in the target CRS.
      */
     public DefaultPlanarProjection(final Map<String,?>   properties,
                                    final GeographicCRS   sourceCRS,
@@ -70,11 +70,11 @@ final class DefaultPlanarProjection exte
      * specified source and target CRS. While the source conversion can be an arbitrary one, it
      * is typically a defining conversion.
      *
-     * @param definition The defining conversion.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param factory    The factory to use for creating a transform from the parameters or for performing axis changes.
-     * @param actual     An array of length 1 where to store the actual operation method used by the math transform factory.
+     * @param  definition  the defining conversion.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  factory     the factory to use for creating a transform from the parameters or for performing axis changes.
+     * @param  actual      an array of length 1 where to store the actual operation method used by the math transform factory.
      */
     DefaultPlanarProjection(final Conversion definition,
                             final CoordinateReferenceSystem sourceCRS,
@@ -92,7 +92,7 @@ final class DefaultPlanarProjection exte
      *
      * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
      *
-     * @param operation The coordinate operation to copy.
+     * @param  operation  the coordinate operation to copy.
      */
     protected DefaultPlanarProjection(final PlanarProjection operation) {
         super(operation);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultProjection.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultProjection.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -63,11 +63,11 @@ class DefaultProjection extends DefaultC
     /**
      * Creates a projection from the given properties.
      *
-     * @param properties The properties to be given to the identified object.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param method     The coordinate operation method.
-     * @param transform  Transform from positions in the source CRS to positions in the target CRS.
+     * @param  properties  the properties to be given to the identified object.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  method      the coordinate operation method.
+     * @param  transform   transform from positions in the source CRS to positions in the target CRS.
      */
     public DefaultProjection(final Map<String,?>   properties,
                              final GeographicCRS   sourceCRS,
@@ -83,11 +83,11 @@ class DefaultProjection extends DefaultC
      * specified source and target CRS. While the source conversion can be an arbitrary one, it
      * is typically a defining conversion.
      *
-     * @param definition The defining conversion.
-     * @param sourceCRS  The source CRS.
-     * @param targetCRS  The target CRS.
-     * @param factory    The factory to use for creating a transform from the parameters or for performing axis changes.
-     * @param actual     An array of length 1 where to store the actual operation method used by the math transform factory.
+     * @param  definition  the defining conversion.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  factory     the factory to use for creating a transform from the parameters or for performing axis changes.
+     * @param  actual      an array of length 1 where to store the actual operation method used by the math transform factory.
      */
     DefaultProjection(final Conversion definition,
                       final CoordinateReferenceSystem sourceCRS,
@@ -107,7 +107,7 @@ class DefaultProjection extends DefaultC
      *
      * <p>This constructor performs a shallow copy, i.e. the properties are not cloned.</p>
      *
-     * @param operation The coordinate operation to copy.
+     * @param  operation  the coordinate operation to copy.
      */
     protected DefaultProjection(final Projection operation) {
         super(operation);
@@ -118,7 +118,7 @@ class DefaultProjection extends DefaultC
      * The default implementation returns {@code Projection.class}.
      * Subclasses implementing a more specific GeoAPI interface shall override this method.
      *
-     * @return The conversion interface implemented by this class.
+     * @return the conversion interface implemented by this class.
      */
     @Override
     public Class<? extends Projection> getInterface() {

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/MismatchedDatumException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/MismatchedDatumException.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/MismatchedDatumException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/MismatchedDatumException.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -58,7 +58,7 @@ public class MismatchedDatumException ex
     /**
      * Constructs a new exception with the specified detail message.
      *
-     * @param message The detail message, or {@code null} if none.
+     * @param message  the detail message, or {@code null} if none.
      */
     public MismatchedDatumException(final String message) {
         super(message);
@@ -67,8 +67,8 @@ public class MismatchedDatumException ex
     /**
      * Constructs a new exception with the specified detail message and cause.
      *
-     * @param message The detail message, or {@code null} if none.
-     * @param cause The cause, or {@code null} if none.
+     * @param message  the detail message, or {@code null} if none.
+     * @param cause    the cause, or {@code null} if none.
      */
     public MismatchedDatumException(final String message, final Throwable cause) {
         super(message, cause);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubOperationInfo.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -98,10 +98,10 @@ final class SubOperationInfo {
      * Searches in given list of source components for an operation capable to convert or transform coordinates
      * to the given target CRS. If no such operation can be found, then this method returns {@code null}.
      *
-     * @param  caller       the object which is inferring a coordinate operation.
-     * @param  sourceIsUsed flags for keeping trace of which source has been used.
-     * @param  sources      all components of the source CRS.
-     * @param  target       one component of the target CRS.
+     * @param  caller        the object which is inferring a coordinate operation.
+     * @param  sourceIsUsed  flags for keeping trace of which source has been used.
+     * @param  sources       all components of the source CRS.
+     * @param  target        one component of the target CRS.
      * @return information about a coordinate operation from a source CRS to the given target CRS, or {@code null}.
      * @throws FactoryException if an error occurred while grabbing a coordinate operation.
      */
@@ -182,7 +182,7 @@ final class SubOperationInfo {
      *
      * @param sourceDimensions    number of dimension of the source {@code CompoundCRS}.
      * @param selectedDimensions  number of source dimensions needed by the coordinate operations.
-     * @param selected all {@code SourceComponent} instances needed for the target {@code CompoundCRS}.
+     * @param selected            all {@code SourceComponent} instances needed for the target {@code CompoundCRS}.
      */
     static Matrix sourceToSelected(final int sourceDimensions, final int selectedDimensions, final SubOperationInfo[] selected) {
         final Matrix select = Matrices.createZero(selectedDimensions + 1, sourceDimensions + 1);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubTypes.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubTypes.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubTypes.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/SubTypes.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -116,12 +116,12 @@ final class SubTypes {
      * a more specific GeoAPI interface if this method has been able to infer the type from the
      * {@code conversion} argument.
      *
-     * @param  baseType   The base GeoAPI interface to be implemented by the conversion to return.
-     * @param  definition The defining conversion.
-     * @param  sourceCRS  The source CRS.
-     * @param  targetCRS  The target CRS.
-     * @param  factory    The factory to use for creating a transform from the parameters or for performing axis changes.
-     * @return The conversion of the given type between the given CRS.
+     * @param  baseType    the base GeoAPI interface to be implemented by the conversion to return.
+     * @param  definition  the defining conversion.
+     * @param  sourceCRS   the source CRS.
+     * @param  targetCRS   the target CRS.
+     * @param  factory     the factory to use for creating a transform from the parameters or for performing axis changes.
+     * @return the conversion of the given type between the given CRS.
      * @throws ClassCastException if a contradiction is found between the given {@code baseType},
      *         the defining {@linkplain DefaultConversion#getInterface() conversion type} and
      *         the {@linkplain DefaultOperationMethod#getOperationType() method operation type}.
@@ -133,14 +133,14 @@ final class SubTypes {
         Class<? extends T> type = baseType;
         if (definition instanceof AbstractIdentifiedObject) {
             final Class<?> c = ((AbstractIdentifiedObject) definition).getInterface();
-            if (!c.isAssignableFrom(baseType)) {  // Do nothing if c is a parent type.
+            if (!c.isAssignableFrom(baseType)) {                        // Do nothing if c is a parent type.
                 type = c.asSubclass(type);
             }
         }
         final OperationMethod method = definition.getMethod();
         if (method instanceof DefaultOperationMethod) {
             final Class<? extends SingleOperation> c = ((DefaultOperationMethod) method).getOperationType();
-            if (!c.isAssignableFrom(baseType)) {  // Do nothing if c is a parent type.
+            if (!c.isAssignableFrom(baseType)) {                        // Do nothing if c is a parent type.
                 type = c.asSubclass(type);
             }
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/builder/LinearTransformBuilder.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -88,8 +88,8 @@ public class LinearTransformBuilder {
     /**
      * Extracts the ordinate values of the given points into separated arrays, one for each dimension.
      *
-     * @param points The points from which to extract the ordinate values.
-     * @param dimension The expected number of dimensions.
+     * @param  points     the points from which to extract the ordinate values.
+     * @param  dimension  the expected number of dimensions.
      */
     private static double[][] toArrays(final DirectPosition[] points, final int dimension) {
         final int length = points.length;
@@ -114,7 +114,7 @@ public class LinearTransformBuilder {
      * <p><b>Limitation:</b> in current implementation, the source points must be one or two-dimensional.
      * This restriction may be removed in a future SIS version.</p>
      *
-     * @param  points The source points, assumed precise.
+     * @param  points  the source points, assumed precise.
      * @throws MismatchedDimensionException if at least one point does not have the expected number of dimensions.
      */
     public void setSourcePoints(final DirectPosition... points) throws MismatchedDimensionException {
@@ -133,7 +133,7 @@ public class LinearTransformBuilder {
      * Target points can have any number of dimensions (not necessarily 2), but all points shall have
      * the same number of dimensions.
      *
-     * @param  points The target points, assumed uncertain.
+     * @param  points  the target points, assumed uncertain.
      * @throws MismatchedDimensionException if not all points have the same number of dimensions.
      */
     public void setTargetPoints(final DirectPosition... points) throws MismatchedDimensionException {
@@ -156,11 +156,11 @@ public class LinearTransformBuilder {
      * Creates a linear transform approximation from the source points to the target points.
      * This method assumes that source points are precise and all uncertainty is in the target points.
      *
-     * @return The fitted linear transform.
+     * @return the fitted linear transform.
      */
     public LinearTransform create() {
         if (transform == null) {
-            final double[][] sources = this.sources;  // Protect from changes.
+            final double[][] sources = this.sources;                    // Protect from changes.
             final double[][] targets = this.targets;
             if (sources == null || targets == null) {
                 throw new IllegalStateException(Errors.format(
@@ -174,7 +174,7 @@ public class LinearTransformBuilder {
             switch (sourceDim) {
                 case 1: {
                     final Line line = new Line();
-                    for (int j=0; j<targets.length; j++) {
+                    for (int j=0; j < targets.length; j++) {
                         correlation[j] = line.fit(sources[0], targets[j]);
                         matrix.setElement(j, 0, line.slope());
                         matrix.setElement(j, 1, line.y0());
@@ -183,7 +183,7 @@ public class LinearTransformBuilder {
                 }
                 case 2: {
                     final Plane plan = new Plane();
-                    for (int j=0; j<targets.length; j++) {
+                    for (int j=0; j < targets.length; j++) {
                         correlation[j] = plan.fit(sources[0], sources[1], targets[j]);
                         matrix.setElement(j, 0, plan.slopeX());
                         matrix.setElement(j, 1, plan.slopeY());
@@ -191,7 +191,7 @@ public class LinearTransformBuilder {
                     }
                     break;
                 }
-                default: throw new AssertionError(sourceDim); // Should have been verified by setSourcePoints(…) method.
+                default: throw new AssertionError(sourceDim);   // Should have been verified by setSourcePoints(…) method.
             }
             transform = MathTransforms.linear(matrix);
         }
@@ -203,7 +203,7 @@ public class LinearTransformBuilder {
      * or {@code null} if none. If non-null, the array length is equals to the number of target
      * dimensions.
      *
-     * @return Estimation of correlation coefficients for each target dimension, or {@code null}.
+     * @return estimation of correlation coefficients for each target dimension, or {@code null}.
      */
     public double[] correlation() {
         return (correlation != null) ? correlation.clone() : null;
@@ -212,7 +212,7 @@ public class LinearTransformBuilder {
     /**
      * Returns a string representation of this builder for debugging purpose.
      *
-     * @return A string representation of this builder.
+     * @return a string representation of this builder.
      */
     @Debug
     @Override
@@ -238,7 +238,7 @@ public class LinearTransformBuilder {
             try {
                 table.flush();
             } catch (IOException e) {
-                throw new AssertionError(e); // Should never happen since we wrote into a StringBuilder.
+                throw new AssertionError(e);        // Should never happen since we wrote into a StringBuilder.
             }
         }
         return buffer.toString();

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java?rev=1779702&r1=1779701&r2=1779702&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/matrix/AffineTransforms2D.java [UTF-8] Sat Jan 21 08:49:49 2017
@@ -97,11 +97,10 @@ public final class AffineTransforms2D ex
      *   <li>It tries to recycle the given object if {@code overwrite} is {@code true}.</li>
      * </ul>
      *
-     * @param transform       the affine transform to use.
-     * @param shape           the shape to transform, or {@code null}.
-     * @param allowOverwrite  if {@code true}, this method is allowed to overwrite {@code shape} with the
-     *                        transform result. If {@code false}, then {@code shape} is never modified.
-     *
+     * @param  transform       the affine transform to use.
+     * @param  shape           the shape to transform, or {@code null}.
+     * @param  allowOverwrite  if {@code true}, this method is allowed to overwrite {@code shape} with the
+     *                         transform result. If {@code false}, then {@code shape} is never modified.
      * @return the transform of the given shape, or {@code null} if the given shape was null.
      *         May or may not be the same instance than the given shape.
      *
@@ -116,16 +115,20 @@ public final class AffineTransforms2D ex
         if (type == TYPE_IDENTITY) {
             return shape;
         }
-        // If there is only scale, flip, quadrant rotation or translation,
-        // then we can optimize the transformation of rectangular shapes.
+        /*
+         * If there is only scale, flip, quadrant rotation or translation,
+         * then we can optimize the transformation of rectangular shapes.
+         */
         if ((type & (TYPE_GENERAL_ROTATION | TYPE_GENERAL_TRANSFORM)) == 0) {
             // For a Rectangle input, the output should be a rectangle as well.
             if (shape instanceof Rectangle2D) {
                 final Rectangle2D rect = (Rectangle2D) shape;
                 return transform(transform, rect, allowOverwrite ? rect : null);
             }
-            // For other rectangular shapes, we restrict to cases without
-            // rotation or flip because we don't know if the shape is symmetric.
+            /*
+             * For other rectangular shapes, we restrict to cases without
+             * rotation or flip because we don't know if the shape is symmetric.
+             */
             if ((type & (TYPE_FLIP | TYPE_MASK_ROTATION)) == 0) {
                 if (shape instanceof RectangularShape) {
                     RectangularShape rect = (RectangularShape) shape;
@@ -171,11 +174,10 @@ public final class AffineTransforms2D ex
      * <strong>upper-left corner</strong> of pixels (as in Java2D usage), not the center of pixels
      * (OGC usage).
      *
-     * @param transform  the affine transform to use.
-     * @param bounds     the rectangle to transform, or {@code null}.
-     *                   this rectangle will not be modified except if {@code dest} references the same object.
-     * @param dest       rectangle in which to place the result. If {@code null}, a new rectangle will be created.
-     *
+     * @param  transform  the affine transform to use.
+     * @param  bounds     the rectangle to transform, or {@code null}.
+     *                    this rectangle will not be modified except if {@code dest} references the same object.
+     * @param  dest       rectangle in which to place the result. If {@code null}, a new rectangle will be created.
      * @return the direct transform of the {@code bounds} rectangle, or {@code null} if {@code bounds} was null.
      *
      * @see org.apache.sis.geometry.Shapes2D#transform(MathTransform2D, Rectangle2D, Rectangle2D)
@@ -217,11 +219,10 @@ public final class AffineTransforms2D ex
      *     return createInverse().createTransformedShape(bounds).getBounds2D();
      * }
      *
-     * @param transform  the affine transform to use.
-     * @param bounds     the rectangle to transform, or {@code null}.
-     *                   this rectangle will not be modified except if {@code dest} references the same object.
-     * @param dest       rectangle in which to place the result. If {@code null}, a new rectangle will be created.
-     *
+     * @param  transform  the affine transform to use.
+     * @param  bounds     the rectangle to transform, or {@code null}.
+     *                    this rectangle will not be modified except if {@code dest} references the same object.
+     * @param  dest       rectangle in which to place the result. If {@code null}, a new rectangle will be created.
      * @return the inverse transform of the {@code bounds} rectangle, or {@code null} if {@code bounds} was null.
      * @throws NoninvertibleTransformException if the affine transform can't be inverted.
      */
@@ -257,11 +258,10 @@ public final class AffineTransforms2D ex
      * Calculates the inverse transform of a point without applying the translation components.
      * In other words, calculates the inverse transform of a displacement vector.
      *
-     * @param transform  the affine transform to use.
-     * @param vector     the vector to transform stored as a point.
-     *                   this point will not be modified except if {@code dest} references the same object.
-     * @param dest       point in which to place the result. If {@code null}, a new point will be created.
-     *
+     * @param  transform  the affine transform to use.
+     * @param  vector     the vector to transform stored as a point.
+     *                    this point will not be modified except if {@code dest} references the same object.
+     * @param  dest       point in which to place the result. If {@code null}, a new point will be created.
      * @return the inverse transform of the {@code vector}, or {@code null} if {@code source} was null.
      * @throws NoninvertibleTransformException if the affine transform can't be inverted.
      */
@@ -365,7 +365,7 @@ public final class AffineTransforms2D ex
      *     boolean flipped = (tr.getType() & TYPE_FLIP) != 0;
      * }
      *
-     * @param transform  the affine transform to inspect.
+     * @param  transform  the affine transform to inspect.
      * @return -1 if an axis has been flipped, +1 if no flipping, or 0 if unknown.
      */
     public static int getFlip(final AffineTransform transform) {