sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1763840 [4/12] - in /sis/branches/JDK7: ./ core/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feature/src/main/java/org/apache/sis/feature/builder/ core/sis-feature/src/main/java/org/apache/sis/internal/feature/ core/sis...
Date Fri, 07 Oct 2016 21:35:45 GMT
Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/EqualAreaProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/EqualAreaProjection.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/EqualAreaProjection.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/EqualAreaProjection.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -18,7 +18,7 @@ package org.apache.sis.referencing.opera
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.referencing.Resources;
 
 import static java.lang.Math.*;
 import static org.apache.sis.math.MathFunctions.atanh;
@@ -88,7 +88,7 @@ abstract class EqualAreaProjection exten
     /**
      * Creates a new normalized projection from the parameters computed by the given initializer.
      *
-     * @param initializer The initializer for computing map projection internal parameters.
+     * @param  initializer  the initializer for computing map projection internal parameters.
      */
     EqualAreaProjection(final Initializer initializer) {
         super(initializer);
@@ -152,7 +152,7 @@ abstract class EqualAreaProjection exten
      *
      * In the spherical case, <var>q</var> = 2⋅sinφ.
      *
-     * @param  sinφ sine of the latitude <var>q</var> is calculated for.
+     * @param  sinφ  the sine of the latitude <var>q</var> is calculated for.
      * @return <var>q</var> from Snyder equation (3-12).
      */
     final double qm(final double sinφ) {
@@ -168,7 +168,7 @@ abstract class EqualAreaProjection exten
      * It is caller responsibility to ensure that this method is not invoked in the spherical case, since
      * this implementation does not work in such case.
      *
-     * @param  sinφ sine of the latitude <var>q</var> is calculated for.
+     * @param  sinφ  the sine of the latitude <var>q</var> is calculated for.
      * @return <var>q</var> from Snyder equation (3-12).
      */
     final double qm_ellipsoid(final double sinφ) {
@@ -192,12 +192,12 @@ abstract class EqualAreaProjection exten
 
     /**
      * Computes the latitude using equation 3-18 from Synder, followed by iterative resolution of Synder 3-16.
-     * If theory, the series expansion given by equation 3-18 (φ ≈ c₂⋅sin(2β) + c₄⋅sin(4β) + c₈⋅sin(8β)) should
+     * In theory, the series expansion given by equation 3-18 (φ ≈ c₂⋅sin(2β) + c₄⋅sin(4β) + c₈⋅sin(8β)) should
      * be used in replacement of the iterative method. However in practice the series expansion seems to not
      * have a sufficient amount of terms for achieving the centimetric precision, so we "finish" it by the
      * iterative method. The series expansion is nevertheless useful for reducing the number of iterations.
      *
-     * @param  y in the cylindrical case, this is northing on the normalized ellipsoid.
+     * @param  y  in the cylindrical case, this is northing on the normalized ellipsoid.
      * @return the latitude in radians.
      */
     final double φ(final double y) throws ProjectionException {
@@ -275,7 +275,7 @@ abstract class EqualAreaProjection exten
             return Double.NaN;                      // Value "after" the pole.
         }
         // Value should have converged but did not.
-        throw new ProjectionException(Errors.format(Errors.Keys.NoConvergence));
+        throw new ProjectionException(Resources.format(Resources.Keys.NoConvergence));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/LambertConicConformal.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -34,8 +34,8 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.internal.referencing.provider.LambertConformalBelgium;
 import org.apache.sis.internal.referencing.provider.LambertConformalMichigan;
 import org.apache.sis.internal.referencing.Formulas;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.DoubleDouble;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Workaround;
 
 import static java.lang.Math.*;
@@ -227,7 +227,7 @@ public class LambertConicConformal exten
              * in this class break down with indetermination like 0 × ∞.
              * The caller should use the Mercator projection instead for such cases.
              */
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.LatitudesAreOpposite_2,
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.LatitudesAreOpposite_2,
                     new Latitude(φ1), new Latitude(φ2)));
         }
         /*

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ObliqueStereographic.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -29,7 +29,7 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.internal.referencing.provider.PolarStereographicA;
 import org.apache.sis.internal.referencing.Formulas;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.util.Workaround;
 
 import static java.lang.Math.*;
@@ -97,8 +97,8 @@ public class ObliqueStereographic extend
      *   <li><cite>"Oblique Stereographic"</cite>, also known as <cite>"Roussilhe"</cite>.</li>
      * </ul>
      *
-     * @param method     Description of the projection parameters.
-     * @param parameters The parameter values of the projection to create.
+     * @param  method      description of the projection parameters.
+     * @param  parameters  the parameter values of the projection to create.
      */
     public ObliqueStereographic(final OperationMethod method, final Parameters parameters) {
         this(initializer(method, parameters));
@@ -216,8 +216,8 @@ public class ObliqueStereographic extend
      * <p>The non-linear part of the returned transform will be {@code this} transform, except if the ellipsoid
      * is spherical. In the later case, {@code this} transform will be replaced by a simplified implementation.</p>
      *
-     * @param  factory The factory to use for creating the transform.
-     * @return The map projection from (λ,φ) to (<var>x</var>,<var>y</var>) coordinates.
+     * @param  factory  the factory to use for creating the transform.
+     * @return the map projection from (λ,φ) to (<var>x</var>,<var>y</var>) coordinates.
      * @throws FactoryException if an error occurred while creating a transform.
      */
     @Override
@@ -244,7 +244,7 @@ public class ObliqueStereographic extend
      * Converts the specified (λ,φ) coordinate (units in radians) and stores the result in {@code dstPts}.
      * In addition, opportunistically computes the projection derivative if {@code derivate} is {@code true}.
      *
-     * @return The matrix of the projection derivative at the given source position,
+     * @return the matrix of the projection derivative at the given source position,
      *         or {@code null} if the {@code derivate} argument is {@code false}.
      * @throws ProjectionException if the coordinate can not be converted.
      */
@@ -364,7 +364,7 @@ public class ObliqueStereographic extend
                 return;
             }
         }
-        throw new ProjectionException(Errors.Keys.NoConvergence);
+        throw new ProjectionException(Resources.format(Resources.Keys.NoConvergence));
     }
 
 
@@ -389,7 +389,7 @@ public class ObliqueStereographic extend
         /**
          * Constructs a new map projection from the supplied parameters.
          *
-         * @param parameters The parameters of the projection to be created.
+         * @param  parameters  the parameters of the projection to be created.
          */
         protected Spherical(ObliqueStereographic other) {
             super(other);

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -30,8 +30,8 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.internal.referencing.provider.PolarStereographicB;
 import org.apache.sis.internal.referencing.provider.PolarStereographicC;
 import org.apache.sis.internal.referencing.Formulas;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.Workaround;
 import org.apache.sis.measure.Latitude;
 import org.apache.sis.math.MathFunctions;
@@ -165,7 +165,7 @@ public class PolarStereographic extends
                     (variant == SOUTH) ? Latitude.MIN_VALUE : Double.NaN);
         }
         if (abs(abs(φ0) - Latitude.MAX_VALUE) > Formulas.ANGULAR_TOLERANCE) {       // Can be only -90°, +90° or NaN
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalParameterValue_2,
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.IllegalParameterValue_2,
                     PolarStereographicA.LATITUDE_OF_ORIGIN.getName(), φ0));
         }
         double φ1;

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionException.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/ProjectionException.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -17,7 +17,6 @@
 package org.apache.sis.referencing.operation.projection;
 
 import org.opengis.referencing.operation.TransformException;
-import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -85,13 +84,4 @@ public class ProjectionException extends
     public ProjectionException(final String message, final Throwable cause) {
         super(message, cause);
     }
-
-    /**
-     * Constructs a new exception with the specified detail message.
-     *
-     * @param  code  one of the constants suitable for {@link Errors#format(short)}.
-     */
-    ProjectionException(final short code) {
-        this(Errors.format(code));
-    }
 }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/TransverseMercator.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -27,6 +27,7 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.referencing.operation.matrix.MatrixSIS;
 import org.apache.sis.referencing.operation.transform.ContextualParameters;
 import org.apache.sis.internal.referencing.provider.TransverseMercatorSouth;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.DoubleDouble;
 import org.apache.sis.parameter.Parameters;
 import org.apache.sis.util.resources.Errors;
@@ -95,8 +96,8 @@ public class TransverseMercator extends
      *   <li><cite>"Transverse Mercator (South Orientated)"</cite>.</li>
      * </ul>
      *
-     * @param method     Description of the projection parameters.
-     * @param parameters The parameter values of the projection to create.
+     * @param  method      description of the projection parameters.
+     * @param  parameters  the parameter values of the projection to create.
      */
     public TransverseMercator(final OperationMethod method, final Parameters parameters) {
         this(initializer(method, parameters));
@@ -244,7 +245,7 @@ public class TransverseMercator extends
      *
      *     <blockquote>b/a = √(1 - ℯ²)</blockquote>
      *
-     * @param n The value of {@code f / (2-f)} where {@code f} is the flattening factor.
+     * @param  n  the value of {@code f / (2-f)} where {@code f} is the flattening factor.
      */
     private void computeCoefficients(final double n) {
         final double n2 = n  * n;
@@ -287,8 +288,8 @@ public class TransverseMercator extends
      * <p>The non-linear part of the returned transform will be {@code this} transform, except if the ellipsoid
      * is spherical. In the later case, {@code this} transform will be replaced by a simplified implementation.</p>
      *
-     * @param  factory The factory to use for creating the transform.
-     * @return The map projection from (λ,φ) to (<var>x</var>,<var>y</var>) coordinates.
+     * @param  factory  the factory to use for creating the transform.
+     * @return the map projection from (λ,φ) to (<var>x</var>,<var>y</var>) coordinates.
      * @throws FactoryException if an error occurred while creating a transform.
      */
     @Override
@@ -304,7 +305,7 @@ public class TransverseMercator extends
      * Converts the specified (λ,φ) coordinate (units in radians) and stores the result in {@code dstPts}.
      * In addition, opportunistically computes the projection derivative if {@code derivate} is {@code true}.
      *
-     * @return The matrix of the projection derivative at the given source position,
+     * @return the matrix of the projection derivative at the given source position,
      *         or {@code null} if the {@code derivate} argument is {@code false}.
      * @throws ProjectionException if the coordinate can not be converted.
      */
@@ -333,7 +334,7 @@ public class TransverseMercator extends
              * using WGS84 ellipsoid. We do not need to reduce the limit for the spherical formulas,
              * because the mathematic are simpler and the function still smooth until 90°.
              */
-            throw new ProjectionException(Errors.Keys.OutsideDomainOfValidity);
+            throw new ProjectionException(Errors.format(Errors.Keys.OutsideDomainOfValidity));
         }
         final double φ     = srcPts[srcOff+1];
         final double sinλ  = sin(λ);
@@ -577,7 +578,7 @@ public class TransverseMercator extends
             }
             p = c;
         }
-        throw new ProjectionException(Errors.Keys.NoConvergence);
+        throw new ProjectionException(Resources.format(Resources.Keys.NoConvergence));
     }
 
 
@@ -602,7 +603,7 @@ public class TransverseMercator extends
         /**
          * Constructs a new map projection from the parameters of the given projection.
          *
-         * @param other The other projection (usually ellipsoidal) from which to copy the parameters.
+         * @param  other  the other projection (usually ellipsoidal) from which to copy the parameters.
          */
         protected Spherical(final TransverseMercator other) {
             super(other);
@@ -619,7 +620,7 @@ public class TransverseMercator extends
             final double λ = srcPts[srcOff  ];
             if (abs(λ) > PI/2) {
                 // See comment in the overridden class.
-                throw new ProjectionException(Errors.Keys.OutsideDomainOfValidity);
+                throw new ProjectionException(Errors.format(Errors.Keys.OutsideDomainOfValidity));
             }
             final double φ    = srcPts[srcOff+1];
             final double sinλ = sin(λ);

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractLinearTransform.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -24,6 +24,7 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.internal.referencing.provider.Affine;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
@@ -165,7 +166,7 @@ abstract class AbstractLinearTransform e
     @Override
     public final void setElement(final int row, final int column, final double value) {
         throw new UnsupportedOperationException(isAffine()
-                ? Errors.format(Errors.Keys.UnmodifiableAffineTransform)
+                ? Resources.format(Resources.Keys.UnmodifiableAffineTransform)
                 : Errors.format(Errors.Keys.UnmodifiableObject_1, AbstractLinearTransform.class));
     }
 

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -37,6 +37,7 @@ import org.apache.sis.parameter.Paramete
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.io.wkt.Formatter;
 import org.apache.sis.io.wkt.FormattableObject;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.WKTUtilities;
 import org.apache.sis.internal.metadata.WKTKeywords;
 import org.apache.sis.util.Utilities;
@@ -767,7 +768,7 @@ public abstract class AbstractMathTransf
         }
         final Matrix derivative = transform(coordinate, 0, null, 0, true);
         if (derivative == null) {
-            throw new TransformException(Errors.format(Errors.Keys.CanNotComputeDerivative));
+            throw new TransformException(Resources.format(Resources.Keys.CanNotComputeDerivative));
         }
         return derivative;
     }
@@ -785,7 +786,7 @@ public abstract class AbstractMathTransf
         if (isIdentity()) {
             return this;
         }
-        throw new NoninvertibleTransformException(Errors.format(Errors.Keys.NonInvertibleTransform));
+        throw new NoninvertibleTransformException(Resources.format(Resources.Keys.NonInvertibleTransform));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/AbstractMathTransform2D.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -28,8 +28,8 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.MathTransform2D;
 import org.opengis.referencing.operation.TransformException;
 import org.opengis.referencing.operation.NoninvertibleTransformException;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.j2d.ShapeUtilities;
-import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -300,7 +300,7 @@ public abstract class AbstractMathTransf
         final double[] coordinate = new double[] {point.getX(), point.getY()};
         final Matrix derivative = tr.transform(coordinate, 0, null, 0, true);
         if (derivative == null) {
-            throw new TransformException(Errors.format(Errors.Keys.CanNotComputeDerivative));
+            throw new TransformException(Resources.format(Resources.Keys.CanNotComputeDerivative));
         }
         return derivative;
     }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -35,6 +35,7 @@ import org.apache.sis.parameter.Paramete
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.internal.referencing.provider.GeocentricAffine;
 import org.apache.sis.internal.metadata.WKTKeywords;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.system.Semaphores;
 import org.apache.sis.util.Classes;
 import org.apache.sis.util.LenientComparable;
@@ -106,7 +107,7 @@ class ConcatenatedTransform extends Abst
         this.transform1 = transform1;
         this.transform2 = transform2;
         if (!isValid()) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.CanNotConcatenateTransforms_2,
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.CanNotConcatenateTransforms_2,
                     getName(transform1), getName(transform2)));
         }
     }
@@ -158,7 +159,7 @@ class ConcatenatedTransform extends Abst
         final int dim1 = tr1.getTargetDimensions();
         final int dim2 = tr2.getSourceDimensions();
         if (dim1 != dim2) {
-            throw new MismatchedDimensionException(Errors.format(Errors.Keys.CanNotConcatenateTransforms_2, getName(tr1),
+            throw new MismatchedDimensionException(Resources.format(Resources.Keys.CanNotConcatenateTransforms_2, getName(tr1),
                     getName(tr2)) + ' ' + Errors.format(Errors.Keys.MismatchedDimension_2, dim1, dim2));
         }
         MathTransform mt = createOptimized(tr1, tr2, factory);
@@ -873,7 +874,7 @@ class ConcatenatedTransform extends Abst
                 ((ConcatenatedTransform) inverse).inverse = this;
             }
         } catch (FactoryException e) {
-            throw new NoninvertibleTransformException(Errors.format(Errors.Keys.NonInvertibleTransform), e);
+            throw new NoninvertibleTransformException(Resources.format(Resources.Keys.NonInvertibleTransform), e);
         }
         return inverse;
     }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -37,6 +37,7 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.apache.sis.internal.referencing.ExtendedPrecisionMatrix;
 import org.apache.sis.internal.referencing.WKTUtilities;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.metadata.WKTKeywords;
 import org.apache.sis.internal.system.Loggers;
@@ -665,8 +666,8 @@ public class ContextualParameters extend
      * Returns the exception to thrown when the parameter of the given name has not been found.
      */
     private ParameterNotFoundException parameterNotFound(final String name) {
-        return new ParameterNotFoundException(Errors.format(
-                Errors.Keys.ParameterNotFound_2, descriptor.getName(), name), name);
+        return new ParameterNotFoundException(Resources.format(
+                Resources.Keys.ParameterNotFound_2, descriptor.getName(), name), name);
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/CoordinateSystemTransform.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -29,6 +29,7 @@ import org.opengis.referencing.cs.PolarC
 import org.opengis.referencing.operation.MathTransform;
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.opengis.referencing.operation.OperationNotFoundException;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.WKTUtilities;
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.internal.util.Constants;
@@ -38,7 +39,6 @@ import org.apache.sis.parameter.DefaultP
 import org.apache.sis.referencing.cs.AxesConvention;
 import org.apache.sis.referencing.cs.CoordinateSystems;
 import org.apache.sis.referencing.operation.DefaultOperationMethod;
-import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -207,7 +207,7 @@ abstract class CoordinateSystemTransform
         } catch (IllegalArgumentException | ConversionException e) {
             cause = e;
         }
-        throw new OperationNotFoundException(Errors.format(Errors.Keys.CoordinateOperationNotFound_2,
+        throw new OperationNotFoundException(Resources.format(Resources.Keys.CoordinateOperationNotFound_2,
                 WKTUtilities.toType(CoordinateSystem.class, source.getClass()),
                 WKTUtilities.toType(CoordinateSystem.class, target.getClass())), cause);
     }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DatumShiftTransform.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -25,6 +25,7 @@ import org.opengis.parameter.ParameterVa
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.geometry.MismatchedDimensionException;
 import org.apache.sis.referencing.datum.DatumShiftGrid;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.provider.Molodensky;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ComparisonMode;
@@ -144,7 +145,7 @@ public abstract class DatumShiftTransfor
         }
         Object unitLabel = "ratio";
         if (grid.isCellValueRatio() || (unitLabel = grid.getTranslationUnit()) != unit) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalUnitFor_2, "translation", unitLabel));
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.IllegalUnitFor_2, "translation", unitLabel));
         }
     }
 

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -62,6 +62,7 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.internal.referencing.provider.AbstractProvider;
 import org.apache.sis.internal.referencing.provider.VerticalOffset;
 import org.apache.sis.internal.referencing.provider.Providers;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.DefaultParameterValueGroup;
@@ -79,7 +80,6 @@ import org.apache.sis.util.collection.We
 import org.apache.sis.util.iso.AbstractFactory;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.resources.Errors;
-import org.apache.sis.util.resources.Messages;
 
 // Branch-specific imports
 import org.apache.sis.internal.jdk8.JDK8;
@@ -393,7 +393,7 @@ public class DefaultMathTransformFactory
                 method = services.getOperationMethod(methods, identifier);
             }
             if (method == null) {
-                throw new NoSuchIdentifierException(Errors.format(Errors.Keys.NoSuchOperationMethod_1, identifier), identifier);
+                throw new NoSuchIdentifierException(Resources.format(Resources.Keys.NoSuchOperationMethod_1, identifier), identifier);
             }
             /*
              * Remember the method we just found, for faster check next time.
@@ -679,7 +679,7 @@ public class DefaultMathTransformFactory
             if (parameters != null) {
                 return parameters;
             }
-            throw new IllegalStateException(Errors.format(Errors.Keys.UnspecifiedParameterValues));
+            throw new IllegalStateException(Resources.format(Resources.Keys.UnspecifiedParameterValues));
         }
 
         /**
@@ -811,8 +811,8 @@ public class DefaultMathTransformFactory
                 }
                 final boolean isIvfDefinitive;
                 if (mismatchedParam != null) {
-                    final LogRecord record = Messages.getResources(null).getLogRecord(Level.WARNING,
-                            Messages.Keys.MismatchedEllipsoidAxisLength_3, ellipsoid.getName().getCode(),
+                    final LogRecord record = Resources.forLocale(null).getLogRecord(Level.WARNING,
+                            Resources.Keys.MismatchedEllipsoidAxisLength_3, ellipsoid.getName().getCode(),
                             mismatchedParam.getDescriptor().getName().getCode(), mismatchedValue);
                     record.setLoggerName(Loggers.COORDINATE_OPERATION);
                     Logging.log(DefaultMathTransformFactory.class, "createParameterizedTransform", record);

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/EllipsoidToCentricTransform.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -42,6 +42,7 @@ import org.apache.sis.internal.util.Nume
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.internal.util.DoubleDouble;
 import org.apache.sis.internal.referencing.Formulas;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.DirectPositionView;
 import org.apache.sis.internal.referencing.provider.GeocentricToGeographic;
 import org.apache.sis.internal.referencing.provider.GeographicToGeocentric;
@@ -55,7 +56,6 @@ import org.apache.sis.referencing.operat
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.parameter.ParameterBuilder;
 import org.apache.sis.parameter.Parameters;
-import org.apache.sis.util.resources.Errors;
 
 import static java.lang.Math.*;
 import static org.apache.sis.internal.referencing.provider.MapProjection.SEMI_MAJOR;
@@ -725,7 +725,7 @@ next:   while (--numPts >= 0) {
                         continue next;
                     }
                 }
-                throw new TransformException(Errors.format(Errors.Keys.NoConvergence));
+                throw new TransformException(Resources.format(Resources.Keys.NoConvergence));
             }
         }
     }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -35,6 +35,7 @@ import org.apache.sis.measure.Units;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ComparisonMode;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.Formulas;
 import org.apache.sis.internal.referencing.DirectPositionView;
 import org.apache.sis.internal.referencing.provider.NTv2;
@@ -140,12 +141,12 @@ public class InterpolatedTransform exten
          */
         super((grid instanceof DatumShiftGridFile<?,?>) ? ((DatumShiftGridFile<?,?>) grid).descriptor : NTv2.PARAMETERS, grid);
         if (!grid.isCellValueRatio()) {
-            throw new IllegalArgumentException(Errors.format(
-                    Errors.Keys.IllegalParameterValue_2, "isCellValueRatio", Boolean.FALSE));
+            throw new IllegalArgumentException(Resources.format(
+                    Resources.Keys.IllegalParameterValue_2, "isCellValueRatio", Boolean.FALSE));
         }
         final Unit<T> unit = grid.getTranslationUnit();
         if (unit != grid.getCoordinateUnit()) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalUnitFor_2, "translation", unit));
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.IllegalUnitFor_2, "translation", unit));
         }
         dimension = grid.getTranslationDimensions();
         if (grid instanceof DatumShiftGridFile<?,?>) {
@@ -169,7 +170,7 @@ public class InterpolatedTransform exten
         if (!unit.equals(normalized)) {
             final UnitConverter converter = normalized.getConverterTo(unit);
             if (!(converter instanceof LinearConverter)) {
-                throw new IllegalArgumentException(Errors.format(Errors.Keys.NonLinearUnitConversion_2, normalized, unit));
+                throw new IllegalArgumentException(Resources.format(Resources.Keys.NonLinearUnitConversion_2, normalized, unit));
             }
             final Double offset = converter.convert(0);
             final Double scale  = Units.derivative(converter, 0);
@@ -479,7 +480,7 @@ public class InterpolatedTransform exten
                     return null;
                 }
             } while (--it >= 0);
-            throw new TransformException(Errors.format(Errors.Keys.NoConvergence));
+            throw new TransformException(Resources.format(Resources.Keys.NoConvergence));
         }
 
         /**
@@ -546,7 +547,7 @@ nextPoint:  while (--numPts >= 0) {
                         continue nextPoint;
                     }
                 } while (--it >= 0);
-                throw new TransformException(Errors.format(Errors.Keys.NoConvergence));
+                throw new TransformException(Resources.format(Resources.Keys.NoConvergence));
             }
         }
     }

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/LinearInterpolator1D.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -26,6 +26,7 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.NoninvertibleTransformException;
 import org.apache.sis.referencing.operation.matrix.Matrix1;
 import org.apache.sis.internal.referencing.provider.Interpolation1D;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.Numerics;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.resources.Errors;
@@ -168,7 +169,7 @@ final class LinearInterpolator1D extends
             try {
                 tr = create(preimage.clone()).inverse();                                // preimageToIndex transform.
             } catch (NoninvertibleTransformException e) {
-                throw new IllegalArgumentException(Errors.format(Errors.Keys.NonMonotonicSequence_1, "preimage"), e);
+                throw new IllegalArgumentException(Resources.format(Resources.Keys.NonMonotonicSequence_1, "preimage"), e);
             }
             if (indexToValues != null) {
                 tr = MathTransforms.concatenate(tr, indexToValues);

Modified: sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/TransformSeparator.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -23,6 +23,7 @@ import org.opengis.referencing.operation
 import org.opengis.referencing.operation.MathTransformFactory;
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.internal.system.DefaultFactories;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.ArraysExt;
@@ -292,7 +293,7 @@ public class TransformSeparator {
         if (sourceDimensions != null) {
             return sourceDimensions.clone();
         }
-        throw new IllegalStateException(Errors.format(Errors.Keys.UnspecifiedDimensions));
+        throw new IllegalStateException(Resources.format(Resources.Keys.UnspecifiedDimensions));
     }
 
     /**
@@ -353,7 +354,7 @@ public class TransformSeparator {
         if (targetDimensions != null) {
             return targetDimensions.clone();
         }
-        throw new IllegalStateException(Errors.format(Errors.Keys.UnspecifiedDimensions));
+        throw new IllegalStateException(Resources.format(Resources.Keys.UnspecifiedDimensions));
     }
 
     /**
@@ -411,7 +412,7 @@ public class TransformSeparator {
                          * because at least one of the requested target dimensions has a dependency to a
                          * source dimension that does not appear in the list of source dimensions to keep.
                          */
-                        throw new FactoryException(Errors.format(Errors.Keys.CanNotSeparateTargetDimension_1, r));
+                        throw new FactoryException(Resources.format(Resources.Keys.CanNotSeparateTargetDimension_1, r));
                     }
                     subDimensions[i] = j;
                 }
@@ -432,7 +433,7 @@ public class TransformSeparator {
                 return tr;
             }
         }
-        throw new FactoryException(Errors.format(Errors.Keys.MismatchedTransformDimension_3, type, expected, actual));
+        throw new FactoryException(Resources.format(Resources.Keys.MismatchedTransformDimension_3, type, expected, actual));
     }
 
     /**
@@ -590,7 +591,7 @@ reduce:     for (int j=0; j <= numTgt; j
              * But if we reach this point, our matrix has such dependencies.
              */
         }
-        throw new FactoryException(Errors.format(Errors.Keys.NotAnAffineTransform));
+        throw new FactoryException(Resources.format(Resources.Keys.NotAnAffineTransform));
     }
 
     /**

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/StandardDefinitionsTest.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -51,7 +51,7 @@ import static org.junit.Assert.*;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 @DependsOn({
@@ -60,6 +60,17 @@ import static org.junit.Assert.*;
 })
 public final strictfp class StandardDefinitionsTest extends TestCase {
     /**
+     * Verifies value of the {@link StandardDefinitions#GREENWICH} code.
+     * This method is for ensuring consistency between hard-coded constants.
+     *
+     * @since 0.8
+     */
+    @Test
+    public void verifyGreenwichCode() {
+        assertEquals(String.valueOf(Constants.EPSG_GREENWICH), StandardDefinitions.GREENWICH);
+    }
+
+    /**
      * Tests {@link StandardDefinitions#createUTM(int, GeographicCRS, double, boolean, CartesianCS)}.
      *
      * @since 0.7

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/referencing/operation/projection/MercatorMethodComparison.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -23,7 +23,7 @@ import org.apache.sis.io.TableAppender;
 import org.apache.sis.math.Statistics;
 import org.apache.sis.math.StatisticsFormat;
 import org.apache.sis.util.ArraysExt;
-import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.metadata.ReferencingServices;
 
 import static java.lang.Math.*;     // Not StrictMath in this particular case.
@@ -85,7 +85,7 @@ public final class MercatorMethodCompari
     /**
      * Creates a new instance for the same eccentricity than the given projection.
      *
-     * @param projection the projection from which to take the eccentricity.
+     * @param  projection  the projection from which to take the eccentricity.
      */
     public MercatorMethodComparison(final NormalizedProjection projection) {
         this(projection.eccentricitySquared);
@@ -115,8 +115,8 @@ public final class MercatorMethodCompari
      * Computes φ using the series expansion given by Geomatics Guidance Note number 7, part 2.
      * This is the first part of the {@link ConformalProjection#φ(double)} method.
      *
-     * @param  t The {@code expOfSouthing} parameter value.
-     * @return The latitude (in radians) for the given parameter.
+     * @param  t  the {@code expOfSouthing} parameter value.
+     * @return the latitude (in radians) for the given parameter.
      */
     public double bySeriesExpansion(final double t) {
         final double χ = PI/2 - 2*atan(t);
@@ -136,8 +136,8 @@ public final class MercatorMethodCompari
      *   <li>sin(4⋅x) = (4 - 8⋅sin²(x))⋅sin(x)⋅cos(x)</li>
      * </ul>
      *
-     * @param  t The {@code expOfSouthing} parameter value.
-     * @return The latitude (in radians) for the given parameter.
+     * @param  t  the {@code expOfSouthing} parameter value.
+     * @return the latitude (in radians) for the given parameter.
      */
     public double usingTrigonometricIdentities(final double t) {
         final double χ = PI/2 - 2*atan(t);
@@ -154,8 +154,8 @@ public final class MercatorMethodCompari
      * Computes φ using the iterative method used by USGS.
      * This is the second part of the {@link ConformalProjection#φ(double)} method.
      *
-     * @param  t The {@code expOfSouthing} parameter value.
-     * @return The latitude (in radians) for the given parameter.
+     * @param  t  the {@code expOfSouthing} parameter value.
+     * @return the latitude (in radians) for the given parameter.
      * @throws ProjectionException if the iteration does not converge.
      */
     public double byIterativeMethod(final double t) throws ProjectionException {
@@ -171,7 +171,7 @@ public final class MercatorMethodCompari
         if (Double.isNaN(t)) {
             return Double.NaN;
         }
-        throw new ProjectionException(Errors.Keys.NoConvergence);
+        throw new ProjectionException(Resources.format(Resources.Keys.NoConvergence));
     }
 
     /**
@@ -187,7 +187,7 @@ public final class MercatorMethodCompari
      * values for random numbers. The result is printed to the standard output stream as the maximum and average errors,
      * in units of {@link NormalizedProjection#ITERATION_TOLERANCE} (about 0.25 cm on a planet of the size of Earth).
      *
-     * @param  numSamples Number of random sample values.
+     * @param  numSamples  number of random sample values.
      * @throws ProjectionException if an error occurred during the calculation of φ.
      */
     public void printAccuracyComparison(final int numSamples) throws ProjectionException {
@@ -265,8 +265,8 @@ public final class MercatorMethodCompari
      * The current threshold value is shown by inserting a horizontal line separator in the table when that threshold
      * is crossed.</p>
      *
-     * @param min The first eccentricity value to test.
-     * @param max The maximal eccentricity value to test.
+     * @param  min  the first eccentricity value to test.
+     * @param  max  the maximal eccentricity value to test.
      * @throws ProjectionException if an error occurred in {@link #φ(double)}.
      */
     public static void printErrorForExcentricities(final double min, final double max) throws ProjectionException {
@@ -334,7 +334,7 @@ public final class MercatorMethodCompari
     /**
      * The result is printed to the standard output stream.
      *
-     * @param  args ignored.
+     * @param  args  ignored.
      * @throws ProjectionException if an error occurred in {@link #φ(double)}.
      * @throws InterruptedException if the thread has been interrupted between two benchmarks.
      */

Modified: sis/branches/JDK7/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/pom.xml?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/pom.xml (original)
+++ sis/branches/JDK7/core/sis-utility/pom.xml Fri Oct  7 21:35:43 2016
@@ -114,20 +114,6 @@ Miscellaneous utilities.
   <build>
     <plugins>
 
-      <!-- Compile properties files into resources UTF files. -->
-      <plugin>
-        <groupId>org.apache.sis.core</groupId>
-        <artifactId>sis-build-helper</artifactId>
-        <version>${sis.plugin.version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile-resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Package as OSGi bundle -->
       <plugin>
         <groupId>org.apache.felix</groupId>

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeType.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeType.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jaxb/gml/CodeType.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -79,7 +79,7 @@ public class CodeType {
     /**
      * Sets the value from the given name.
      *
-     * @param name The name to marshal.
+     * @param name  the name to marshal.
      */
     public final void setName(final GenericName name) {
         this.value = name.toString();
@@ -92,10 +92,10 @@ public class CodeType {
     /**
      * Returns the name from the current value.
      *
-     * @return The unmarshalled name.
+     * @return the unmarshalled name.
      */
     public GenericName getName() {
-        return Names.parseGenericName(codeSpace, ":", value);
+        return Names.parseGenericName(codeSpace, null, value);
     }
 
     /**
@@ -104,7 +104,7 @@ public class CodeType {
     @XmlRootElement(name = "LocalName", namespace = Namespaces.GCO)
     public static final class LocalName extends CodeType {
         @Override public GenericName getName() {
-            return Names.createLocalName(codeSpace, ":", value);
+            return Names.createLocalName(codeSpace, null, value);
         }
     }
 

Added: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/IntSupplier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/IntSupplier.java?rev=1763840&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/IntSupplier.java (added)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/IntSupplier.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.internal.jdk8;
+
+
+/**
+ * Placeholder for the {@link java.util.function.IntSupplier} interface.
+ */
+public interface IntSupplier {
+    /**
+     * Computes the next result.
+     *
+     * @return next result.
+     */
+    int getAsInt();
+}

Propchange: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/IntSupplier.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/IntSupplier.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/jdk8/JDK8.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -36,6 +36,7 @@ import javax.xml.bind.DatatypeConverter;
 import java.util.Objects;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.math.BigInteger;
 
 
 /**
@@ -62,6 +63,19 @@ public final class JDK8 {
     }
 
     /**
+     * Compares two numbers as unsigned long.
+     *
+     * @param  x  first unsigned value.
+     * @param  y  second unsigned value.
+     * @return comparison result.
+     *
+     * @since 0.8
+     */
+    public static int compareUnsigned(final long x, final long y) {
+        return Long.compare(x + Long.MIN_VALUE, y + Long.MIN_VALUE);
+    }
+
+    /**
      * Compares two numbers as unsigned.
      *
      * @param  x  first unsigned value.
@@ -76,7 +90,7 @@ public final class JDK8 {
 
     /**
      * Returns the given value as an unsigned string.
-     * This implementation does not support values larger than {@link Long#MAX_VALUE}.
+     * This implementation is inefficient.
      * This is only a placeholder; JDK8 provides a better implementation.
      *
      * @param  x  the value to format.
@@ -86,19 +100,19 @@ public final class JDK8 {
      */
     public static String toUnsignedString(final long x) {
         if (x >= 0) return Long.toString(x);
-        throw new ArithmeticException();
+        return new BigInteger(Long.toHexString(x), 16).toString();
     }
 
     /**
-     * Returns the given integer as an unsigned long.
+     * Returns the given byte as an unsigned long.
      *
-     * @param  x  the integer to return as an unsigned long.
-     * @return the unsigned value of the given integer.
+     * @param  x  the byte to return as an unsigned long.
+     * @return the unsigned value of the given byte.
      *
      * @since 0.8
      */
-    public static int toUnsignedLong(final int x) {
-        return x & 0xFFFFFFFF;
+    public static long toUnsignedLong(final byte x) {
+        return x & 0xFFL;
     }
 
     /**
@@ -113,17 +127,8 @@ public final class JDK8 {
         return x & 0xFF;
     }
 
-    /**
-     * Returns the given short as an unsigned integer.
-     *
-     * @param  x  the short to return as an unsigned integer.
-     * @return the unsigned value of the given short.
-     *
-     * @since 0.7
-     */
-    public static int toUnsignedInt(final short x) {
-        return x & 0xFFFF;
-    }
+    // Do not provide overloaded 'toUnsigned' methods for the short and int types.
+    // This is a cause confusion since the mask to apply depends on the type.
 
     /**
      * Safe cast of the given long to integer.
@@ -157,6 +162,22 @@ public final class JDK8 {
         if (((x ^ r) & (y ^ r)) >= 0) return r;
         throw new ArithmeticException();
     }
+
+    /**
+     * Safe subtraction of the given numbers.
+     *
+     * @param  x  first value.
+     * @param  y  second value to subtract.
+     * @return the difference.
+     * @throws ArithmeticException if the result overflows.
+     *
+     * @since 0.8
+     */
+    public static long subtractExact(final long x, final long y) {
+        final long r = x - y;
+        if (((x ^ r) & (y ^ r)) >= 0) return r;
+        throw new ArithmeticException();
+    }
 
     /**
      * Safe product of the arguments.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/system/Loggers.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -52,6 +52,11 @@ public final class Loggers extends Stati
     public static final String SYSTEM = "org.apache.sis.system";
 
     /**
+     * The logger for operations related to mathematical operations.
+     */
+    public static final String MATH = "org.apache.sis.math";
+
+    /**
      * The logger for operations related to JDBC operations.
      */
     public static final String SQL = "org.apache.sis.sql";

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/CollectionsExt.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -28,7 +28,7 @@ import org.opengis.parameter.InvalidPara
 import static org.apache.sis.util.collection.Containers.hashMapCapacity;
 
 // Branch-dependent imports
-import org.apache.sis.internal.jdk8.Function;
+import org.apache.sis.internal.jdk8.JDK8;
 
 
 /**
@@ -698,19 +698,50 @@ public final class CollectionsExt extend
         final List<V> singleton = Collections.singletonList(value);
         List<V> values = map.put(key, singleton);
         if (values == null) {
-            return singleton;
+            return singleton;               // This is the most common case.
         }
         if (values.size() <= 1) {
             values = new ArrayList<>(values);
-            if (map.put(key, values) != singleton) {
-                throw new ConcurrentModificationException();
-            }
+        }
+        if (map.put(key, values) != singleton) {
+            throw new ConcurrentModificationException();
         }
         values.add(value);
         return values;
     }
 
     /**
+     * Removes a value in a pseudo multi-values map. The multi-values map is simulated by a map of lists.
+     * If more than one occurrence of the given value is found in the list, only the first occurrence is
+     * removed. If the list become empty after this method call, that list is removed from the map.
+     *
+     * @param  <K>    the type of key elements in the map.
+     * @param  <V>    the type of value elements in the lists.
+     * @param  map    the multi-values map where to remove an element.
+     * @param  key    the key of the element to remove. Can be null if the given map supports null keys.
+     * @param  value  the value of the element to remove. Can be null.
+     * @return list of remaining elements after the removal, or {@code null} if no list is mapped to the given key.
+     */
+    public static <K,V> List<V> removeFromMultiValuesMap(final Map<K,List<V>> map, final K key, final V value) {
+        List<V> values = map.get(key);
+        if (values != null) {
+            final boolean isEmpty;
+            switch (values.size()) {
+                case 0:  isEmpty = true; break;
+                case 1:  isEmpty = Objects.equals(value, values.get(0)); break;
+                default: isEmpty = values.remove(value) && values.isEmpty(); break;
+            }
+            if (isEmpty) {
+                if (map.remove(key) != values) {
+                    throw new ConcurrentModificationException();
+                }
+                values = Collections.emptyList();
+            }
+        }
+        return values;
+    }
+
+    /**
      * Creates a (<cite>name</cite>, <cite>element</cite>) mapping for the given collection of elements.
      * If the name of an element is not all lower cases, then this method also adds an entry for the
      * lower cases version of that name in order to allow case-insensitive searches.
@@ -719,60 +750,46 @@ public final class CollectionsExt extend
      * <strong>before</strong> to ask for the lower-cases version of that name.</p>
      *
      * @param  <E>           the type of elements.
-     * @param  elements      the elements to store in the map, or {@code null} if none.
-     * @param  nameFunction  the function for computing a name from an element.
+     * @param  entries       the entries to store in the map, or {@code null} if none.
      * @param  namesLocale   the locale to use for creating the "all lower cases" names.
      * @return a (<cite>name</cite>, <cite>element</cite>) mapping with lower cases entries where possible.
      * @throws InvalidParameterCardinalityException if the same name is used for more than one element.
      */
-    public static <E> Map<String,E> toCaseInsensitiveNameMap(final Collection<? extends E> elements,
-            final Function<E,String> nameFunction, final Locale namesLocale)
+    public static <E> Map<String,E> toCaseInsensitiveNameMap(
+            final Collection<Map.Entry<String,E>> entries, final Locale namesLocale)
     {
-        if (elements == null) {
+        if (entries == null) {
             return Collections.emptyMap();
         }
-        final Map<String,E> map = new HashMap<>(hashMapCapacity(elements.size()));
-        Set<String> excludes = null;
-        for (final E e : elements) {
-            final String name = nameFunction.apply(e);
-            E old = map.put(name, e);
-            if (old != null) {
+        final Map<String,E> map = new HashMap<>(hashMapCapacity(entries.size()));
+        final Set<String> generated = new HashSet<>();
+        for (final Map.Entry<String, ? extends E> entry : entries) {
+            final String name = entry.getKey();
+            final E value = entry.getValue();
+            E old = map.put(name, value);
+            if (old != null && !generated.remove(name)) {
                 /*
                  * If two elements use exactly the same name, this is considered an error. Otherwise the previous
                  * mapping was using a lower case name version of its original name, so we can discard that lower
                  * case version (the original name is still present in the map).
                  */
-                final String oldName = nameFunction.apply(old);
-                if (Objects.equals(name, oldName)) {
-                    throw new InvalidParameterCardinalityException(Errors.format(Errors.Keys.ValueAlreadyDefined_1, name), name);
-                }
+                throw new InvalidParameterCardinalityException(Errors.format(Errors.Keys.ValueAlreadyDefined_1, name), name);
             }
             /*
              * Add lower-cases versions of the above element names, only if that name is not already used.
              * If a name was already used, then the original mapping will have precedence.
              */
             final String lower = name.toLowerCase(namesLocale);
-            if (!name.equals(lower) && (excludes == null || !excludes.contains(lower))) {
-                old = map.put(lower, e);
-                if (old != null) {
-                    final String oldName = nameFunction.apply(old);
-                    if (lower.equals(oldName)) {
-                        /*
-                         * An entry already exists with a lower case name. Keep that previous entry unchanged.
-                         */
-                        map.put(oldName, old);
-                    } else {
-                        /*
-                         * Two entries having non-lower case names got the same name after conversion to
-                         * lower cases. Retains none of them, since doing so would introduce an ambiguity.
-                         * Remember that we can not use that lower cases name for any other entries.
-                         */
-                        map.remove(lower);
-                        if (excludes == null) {
-                            excludes = new HashSet<>();
-                        }
-                        excludes.add(lower);
-                    }
+            if (!name.equals(lower)) {
+                if (generated.add(lower)) {
+                    JDK8.putIfAbsent(map, lower, value);
+                } else {
+                    /*
+                     * Two entries having non-lower case names got the same name after conversion to
+                     * lower cases. Retains none of them, since doing so would introduce an ambiguity.
+                     * Remember that we can not use that lower cases name for any other entries.
+                     */
+                    map.remove(lower);
                 }
             }
         }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/Constants.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -32,7 +32,7 @@ import org.apache.sis.util.Static;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.5
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public final class Constants extends Static {
@@ -199,6 +199,11 @@ public final class Constants extends Sta
     public static final short EPSG_AXIS_DEGREES = 9122;
 
     /**
+     * The EPSG code for the Greenwich prime meridian.
+     */
+    public static final short EPSG_GREENWICH = 8901;
+
+    /**
      * EPSG code of "WGS 84 / Arctic Polar Stereographic" projection.
      * Latitude of standard parallel is 71°N. All other parameters are zero.
      */

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -45,7 +45,7 @@ public interface LocalizedException {
     /**
      * Returns the message in the {@linkplain Locale#getDefault() default locale}.
      *
-     * @return The exception message in the default locale.
+     * @return the exception message in the default locale.
      */
     String getMessage();
 
@@ -57,15 +57,15 @@ public interface LocalizedException {
      * the {@link Localized} interface and the context locale can be obtained by a call to
      * {@link Localized#getLocale()}.</p>
      *
-     * @return The localized exception message.
+     * @return the localized exception message.
      */
     String getLocalizedMessage();
 
     /**
      * Returns the message in the given locale.
      *
-     * @param  locale The locale of the message to produce, or {@code null} for the default locale.
-     * @return The exception message in the given locale.
+     * @param  locale  the locale of the message to produce, or {@code null} for the default locale.
+     * @return the exception message in the given locale.
      */
     String getLocalizedMessage(Locale locale);
 }

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -68,10 +68,10 @@ public final class LocalizedParseExcepti
      * Constructs a {@code ParseException} with a message formatted from the given resource key
      * and message arguments. This is the most generic constructor.
      *
-     * @param locale      The locale for {@link #getLocalizedMessage()}, or {@code null} for the default.
-     * @param key         The resource key as one of the {@code Errors.Keys} constant.
-     * @param arguments   The values to be given to {@link Errors#getString(short, Object)}.
-     * @param errorOffset The position where the error is found while parsing.
+     * @param  locale       the locale for {@link #getLocalizedMessage()}, or {@code null} for the default.
+     * @param  key          the resource key as one of the {@code Errors.Keys} constant.
+     * @param  arguments    the values to be given to {@link Errors#getString(short, Object)}.
+     * @param  errorOffset  the position where the error is found while parsing.
      */
     public LocalizedParseException(final Locale locale, final short key, final Object[] arguments, final int errorOffset) {
         super(Errors.format(key, arguments), errorOffset);
@@ -85,10 +85,10 @@ public final class LocalizedParseExcepti
      * and unparsable string. This convenience constructor fetches the word starting at the error
      * index, and uses that word as the single argument associated to the resource key.
      *
-     * @param locale      The locale for {@link #getLocalizedMessage()}, or {@code null} for the default.
-     * @param key         The resource key as one of the {@code Errors.Keys} constant.
-     * @param text        The full text that {@code Format} failed to parse.
-     * @param errorOffset The position where the error is found while parsing.
+     * @param  locale       the locale for {@link #getLocalizedMessage()}, or {@code null} for the default.
+     * @param  key          the resource key as one of the {@code Errors.Keys} constant.
+     * @param  text         the full text that {@code Format} failed to parse.
+     * @param  errorOffset  the position where the error is found while parsing.
      */
     public LocalizedParseException(final Locale locale, final short key, final CharSequence text, final int errorOffset) {
         this(locale, key, new Object[] {CharSequences.token(text, errorOffset)}, errorOffset);
@@ -99,12 +99,12 @@ public final class LocalizedParseExcepti
      * information. This convenience constructor creates a message of the kind <cite>"Can not
      * parse string "text" as an object of type 'type'"</cite>.
      *
-     * @param  locale The locale for {@link #getLocalizedMessage()}, or {@code null} for the default.
-     * @param  type   The type of objects parsed by the {@link java.text.Format}.
-     * @param  text   The full text that {@code Format} failed to parse.
-     * @param  pos    Index of the {@linkplain ParsePosition#getIndex() first parsed character},
-     *                together with the {@linkplain ParsePosition#getErrorIndex() error index}.
-     *                Can be {@code null} if index and error index are zero.
+     * @param  locale  the locale for {@link #getLocalizedMessage()}, or {@code null} for the default.
+     * @param  type    the type of objects parsed by the {@link java.text.Format}.
+     * @param  text    the full text that {@code Format} failed to parse.
+     * @param  pos     index of the {@linkplain ParsePosition#getIndex() first parsed character},
+     *                 together with the {@linkplain ParsePosition#getErrorIndex() error index}.
+     *                 Can be {@code null} if index and error index are zero.
      */
     public LocalizedParseException(final Locale locale, final Class<?> type, final CharSequence text, final ParsePosition pos) {
         this(locale, type, text, (pos != null) ? pos.getIndex() : 0, (pos != null) ? pos.getErrorIndex() : 0);
@@ -134,11 +134,11 @@ public final class LocalizedParseExcepti
      * Workaround for RFE #4093999
      * ("Relax constraint on placement of this()/super() call in constructors").
      *
-     * @param  type        The type of objects parsed by the {@link java.text.Format}.
-     * @param  text        The text that {@code Format} failed to parse.
-     * @param  offset      Index of the first character to parse in {@code text}.
-     * @param  errorOffset The position where the error is found while parsing.
-     * @return The {@code arguments} value to give to the constructor.
+     * @param  type         the type of objects parsed by the {@link java.text.Format}.
+     * @param  text         the text that {@code Format} failed to parse.
+     * @param  offset       index of the first character to parse in {@code text}.
+     * @param  errorOffset  the position where the error is found while parsing.
+     * @return the {@code arguments} value to give to the constructor.
      */
     @Workaround(library="JDK", version="1.7")
     private static Object[] arguments(final Class<?> type, CharSequence text, final int offset, final int errorOffset) {



Mime
View raw message