sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1762880 [1/2] - in /sis/branches/JDK8: core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/ core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/ core/sis-referencing/src/main/java/org/apache/sis/i...
Date Fri, 30 Sep 2016 10:49:49 GMT
Author: desruisseaux
Date: Fri Sep 30 10:49:48 2016
New Revision: 1762880

URL: http://svn.apache.org/viewvc?rev=1762880&view=rev
Log:
Moved more resources to the sis-referencing module.

Modified:
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/MultiAuthoritiesFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/sql/EPSGDataAccess.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationFinder.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/CoordinateOperationRegistry.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultConversion.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/DefaultCoordinateOperationFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
    sis/branches/JDK8/storage/sis-earth-observation/src/main/java/org/apache/sis/storage/earthobservation/LandsatReader.java

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/jaxb/referencing/CC_OperationParameterGroup.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -24,10 +24,10 @@ import org.opengis.parameter.ParameterDe
 import org.opengis.parameter.ParameterDescriptorGroup;
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.apache.sis.internal.jaxb.gco.PropertyType;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.parameter.DefaultParameterDescriptorGroup;
 import org.apache.sis.util.CorruptedObjectException;
 import org.apache.sis.util.collection.Containers;
-import org.apache.sis.util.resources.Errors;
 
 
 /**
@@ -215,7 +215,7 @@ public final class CC_OperationParameter
      */
     private static void verifyEquivalence(final String name, final boolean condition) {
         if (!condition) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.MismatchedParameterDescriptor_1, name));
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.MismatchedParameterDescriptor_1, name));
         }
     }
 }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -78,6 +78,16 @@ public final class Resources extends Ind
         public static final short CanNotConcatenateTransforms_2 = 15;
 
         /**
+         * Can not create an object of group “{1}” as an instance of class ‘{0}’.
+         */
+        public static final short CanNotCreateObjectAsInstanceOf_2 = 57;
+
+        /**
+         * Can not instantiate geodetic object for “{0}”.
+         */
+        public static final short CanNotInstantiateGeodeticObject_1 = 58;
+
+        /**
          * Can not map an axis from the specified coordinate system to the “{0}” direction.
          */
         public static final short CanNotMapAxisToDirection_1 = 16;
@@ -129,6 +139,11 @@ public final class Resources extends Ind
         public static final short DeprecatedCode_3 = 3;
 
         /**
+         * Name or alias for parameter “{0}” at index {1} conflict with name “{2}” at index {3}.
+         */
+        public static final short DuplicatedParameterName_4 = 59;
+
+        /**
          * There is no factory for version {1} of “{0}” authority. Fallback on default version for
          * objects creation.
          */
@@ -161,6 +176,22 @@ public final class Resources extends Ind
         public static final short IllegalOperationForValueClass_1 = 25;
 
         /**
+         * Parameter “{0}” can not be of type ‘{1}’.
+         */
+        public static final short IllegalParameterType_2 = 60;
+
+        /**
+         * Parameter “{0}” does not accept values of ‘{2}’ type. Expected an instance of ‘{1}’ or
+         * derived type.
+         */
+        public static final short IllegalParameterValueClass_3 = 61;
+
+        /**
+         * Parameter “{0}” can not take the “{1}” value.
+         */
+        public static final short IllegalParameterValue_2 = 62;
+
+        /**
          * Unit of measurement “{1}” is not valid for “{0}” values.
          */
         public static final short IllegalUnitFor_2 = 26;
@@ -207,6 +238,11 @@ public final class Resources extends Ind
         public static final short MismatchedOperationFactories_2 = 11;
 
         /**
+         * Mismatched descriptor for “{0}” parameter.
+         */
+        public static final short MismatchedParameterDescriptor_1 = 63;
+
+        /**
          * Expected the “{0}” prime meridian but found “{1}”.
          */
         public static final short MismatchedPrimeMeridian_2 = 30;
@@ -249,6 +285,11 @@ public final class Resources extends Ind
         public static final short MissingTemporalDimension_1 = 36;
 
         /**
+         * Missing value for “{0}” parameter.
+         */
+        public static final short MissingValueForParameter_1 = 64;
+
+        /**
          * No vertical dimension found in “{0}”
          */
         public static final short MissingVerticalDimension_1 = 37;
@@ -325,6 +366,16 @@ public final class Resources extends Ind
         public static final short NotFormalProjectionParameter_1 = 13;
 
         /**
+         * No parameter named “{1}” has been found in “{0}”.
+         */
+        public static final short ParameterNotFound_2 = 65;
+
+        /**
+         * Recursive call while creating an object of type ‘{0}’ for code “{1}”.
+         */
+        public static final short RecursiveCreateCallForCode_2 = 66;
+
+        /**
          * Matrix is singular.
          */
         public static final short SingularMatrix = 51;
@@ -335,6 +386,11 @@ public final class Resources extends Ind
         public static final short UnexpectedDimensionForCS_1 = 52;
 
         /**
+         * Parameter “{0}” does not expect unit.
+         */
+        public static final short UnitlessParameter_1 = 67;
+
+        /**
          * Authority “{0}” is unknown.
          */
         public static final short UnknownAuthority_1 = 53;
@@ -353,6 +409,11 @@ public final class Resources extends Ind
          * Dimensions have not been specified.
          */
         public static final short UnspecifiedDimensions = 56;
+
+        /**
+         * Parameter values have not been specified.
+         */
+        public static final short UnspecifiedParameterValues = 68;
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources.properties [ISO-8859-1] Fri Sep 30 10:49:48 2016
@@ -41,6 +41,8 @@ NotFormalProjectionParameter_1    = This
 #
 CanNotConcatenateTransforms_2     = Can not concatenate transforms \u201c{0}\u201d and \u201c{1}\u201d.
 CanNotComputeDerivative           = Can not compute the coordinate operation derivative.
+CanNotCreateObjectAsInstanceOf_2  = Can not create an object of group \u201c{1}\u201d as an instance of class \u2018{0}\u2019.
+CanNotInstantiateGeodeticObject_1 = Can not instantiate geodetic object for \u201c{0}\u201d.
 CanNotMapAxisToDirection_1        = Can not map an axis from the specified coordinate system to the \u201c{0}\u201d direction.
 CanNotSeparateTargetDimension_1   = Target dimension {0} depends on excluded source dimensions.
 CanNotTransformEnvelopeToGeodetic = Can not transform envelope to a geodetic reference system.
@@ -48,13 +50,18 @@ CanNotUseGeodeticParameters_2     = Can
 ColinearAxisDirections_2          = Axis directions {0} and {1} are colinear.
 CoordinateOperationNotFound_2     = Coordinate conversion of transformation from system \u201c{0}\u201d to \u201c{1}\u201d has not been found.
 DatumOriginShallBeDate            = Origin of temporal datum shall be a date.
+DuplicatedParameterName_4         = Name or alias for parameter \u201c{0}\u201d at index {1} conflict with name \u201c{2}\u201d at index {3}.
 IllegalAxisDirection_2            = Coordinate system of class \u2018{0}\u2019 can not have axis in the {1} direction.
 IllegalOperationDimension_3       = Dimensions of \u201c{0}\u201d operation can not be ({1} \u2192 {2}).
 IllegalOperationForValueClass_1   = This operation can not be applied to values of class \u2018{0}\u2019.
+IllegalParameterType_2            = Parameter \u201c{0}\u201d can not be of type \u2018{1}\u2019.
+IllegalParameterValue_2           = Parameter \u201c{0}\u201d can not take the \u201c{1}\u201d value.
+IllegalParameterValueClass_3      = Parameter \u201c{0}\u201d does not accept values of \u2018{2}\u2019 type. Expected an instance of \u2018{1}\u2019 or derived type.
 IllegalUnitFor_2                  = Unit of measurement \u201c{1}\u201d is not valid for \u201c{0}\u201d values.
 IncompatibleCoordinateSystemTypes = Incompatible coordinate system types.
 IncompatibleDatum_2               = Datum of \u201c{1}\u201d shall be \u201c{0}\u201d.
 LatitudesAreOpposite_2            = Latitudes {0} and {1} are opposite.
+MismatchedParameterDescriptor_1   = Mismatched descriptor for \u201c{0}\u201d parameter.
 MismatchedPrimeMeridian_2         = Expected the \u201c{0}\u201d prime meridian but found \u201c{1}\u201d.
 MismatchedTransformDimension_3    = The transform has {2} {0,choice,0#source|1#target} dimension{2,choice,1#|2#s}, while {1} was expected.
 MissingAuthority_1                = No authority was specified for code \u201c{0}\u201d. The expected syntax is \u201cAUTHORITY:CODE\u201d.
@@ -63,6 +70,7 @@ MissingHorizontalDimension_1      = No h
 MissingVerticalDimension_1        = No vertical dimension found in \u201c{0}\u201d
 MissingTemporalDimension_1        = No temporal dimension found in \u201c{0}\u201d
 MissingSpatioTemporalDimension_1  = No spatial or temporal dimension found in \u201c{0}\u201d
+MissingValueForParameter_1        = Missing value for \u201c{0}\u201d parameter.
 NoConvergence                     = No convergence.
 NoConvergenceForPoints_2          = No convergence for points {0} and {1}.
 NonInvertibleMatrix_2             = Non invertible {0}\u00d7{1} matrix.
@@ -76,9 +84,13 @@ NotAnAffineTransform              = Tran
 NotASkewSymmetricMatrix           = Matrix is not skew-symmetric.
 NoSuchAuthorityCode_3             = No code \u201c{2}\u201d from authority \u201c{0}\u201d found for object of type \u2018{1}\u2019.
 NoSuchOperationMethod_1           = No operation method found for name or identifier \u201c{0}\u201d.
+ParameterNotFound_2               = No parameter named \u201c{1}\u201d has been found in \u201c{0}\u201d.
+RecursiveCreateCallForCode_2      = Recursive call while creating an object of type \u2018{0}\u2019 for code \u201c{1}\u201d.
 SingularMatrix                    = Matrix is singular.
 UnexpectedDimensionForCS_1        = Unexpected dimension for a coordinate system of type \u2018{0}\u2019.
+UnitlessParameter_1               = Parameter \u201c{0}\u201d does not expect unit.
 UnknownAuthority_1                = Authority \u201c{0}\u201d is unknown.
 UnknownAxisDirection_1            = Axis direction \u201c{0}\u201d is unknown.
 UnmodifiableAffineTransform       = This affine transform is unmodifiable.
 UnspecifiedDimensions             = Dimensions have not been specified.
+UnspecifiedParameterValues        = Parameter values have not been specified.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/Resources_fr.properties [ISO-8859-1] Fri Sep 30 10:49:48 2016
@@ -46,6 +46,8 @@ NotFormalProjectionParameter_1    = Ce p
 #
 CanNotConcatenateTransforms_2     = Les transformations \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb ne peuvent pas \u00eatre combin\u00e9es.
 CanNotComputeDerivative           = La d\u00e9riv\u00e9 de l\u2019op\u00e9ration sur les coordonn\u00e9es ne peut pas \u00eatre calcul\u00e9e.
+CanNotCreateObjectAsInstanceOf_2  = Ne peut pas cr\u00e9er un objet du groupe \u00ab\u202f{1}\u202f\u00bb comme une instance de la classe \u2018{0}\u2019.
+CanNotInstantiateGeodeticObject_1 = Ne peut pas cr\u00e9er l\u2019objet g\u00e9od\u00e9tique pour \u00ab\u202f{0}\u202f\u00bb.
 CanNotMapAxisToDirection_1        = Aucun axe du syst\u00e8me de coordonn\u00e9es sp\u00e9cifi\u00e9 n\u2019a pu \u00eatre associ\u00e9 \u00e0 la direction \u00ab\u202f{0}\u202f\u00bb.
 CanNotSeparateTargetDimension_1   = La dimension de destination {0} d\u00e9pend de dimensions sources qui ont \u00e9t\u00e9 exclues.
 CanNotTransformEnvelopeToGeodetic = Ne peut pas transformer l\u2019enveloppe vers un r\u00e9f\u00e9rentiel g\u00e9od\u00e9sique.
@@ -53,13 +55,18 @@ CanNotUseGeodeticParameters_2     = Ne p
 ColinearAxisDirections_2          = Les directions d\u2019axes {0} et {1} sont colin\u00e9aires.
 CoordinateOperationNotFound_2     = La conversion ou transformation des coordonn\u00e9es du syst\u00e8me \u00ab\u202f{0}\u202f\u00bb vers \u00ab\u202f{1}\u202f\u00bb n\u2019a pas \u00e9t\u00e9 trouv\u00e9e.
 DatumOriginShallBeDate            = L\u2019origine d\u2019un r\u00e9f\u00e9rentiel temporel doit \u00eatre une date.
+DuplicatedParameterName_4         = Le nom ou un alias pour le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb \u00e0 l\u2019index {1} duplique le nom \u00ab\u202f{2}\u202f\u00bb \u00e0 l\u2019index {3}.
 IllegalAxisDirection_2            = Les syst\u00e8mes de coordonn\u00e9es de classe \u2018{0}\u2019 ne peuvent pas avoir d\u2019axe dans la direction \u00ab\u202f{1}\u202f\u00bb.
 IllegalOperationDimension_3       = Les dimensions de l\u2019op\u00e9ration \u00ab\u202f{0}\u202f\u00bb ne peuvent pas \u00eatre ({1} \u2192 {2}).
 IllegalOperationForValueClass_1   = Cette op\u00e9ration ne peut pas s\u2019appliquer aux valeurs de classe \u2018{0}\u2019.
+IllegalParameterType_2            = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre du type \u2018{1}\u2019.
+IllegalParameterValue_2           = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb n\u2019accepte pas la valeur \u00ab\u202f{1}\u202f\u00bb.
+IllegalParameterValueClass_3      = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb n\u2019accepte pas les valeurs de type \u2018{2}\u2019. Une instance de \u2018{1}\u2019 ou d\u2019un type d\u00e9riv\u00e9 \u00e9tait attendue.
 IllegalUnitFor_2                  = L\u2019unit\u00e9 de mesure \u00ab\u202f{1}\u202f\u00bb n\u2019est pas valide pour les valeurs de \u00ab\u202f{0}\u202f\u00bb.
 IncompatibleCoordinateSystemTypes = Types de syst\u00e8mes de coordonn\u00e9es incompatibles.
 IncompatibleDatum_2               = Le r\u00e9f\u00e9rentiel de \u00ab\u202f{1}\u202f\u00bb doit \u00eatre \u00ab\u202f{0}\u202f\u00bb.
 LatitudesAreOpposite_2            = Les latitudes {0} et {1} sont oppos\u00e9es.
+MismatchedParameterDescriptor_1   = Le descripteur du param\u00e8tre \u00ab\u202f{0}\u202f\u00bb ne correspond pas.
 MismatchedPrimeMeridian_2         = Le m\u00e9ridien d\u2019origine \u00ab\u202f{0}\u202f\u00bb \u00e9tait attendu, mais \u00ab\u202f{1}\u202f\u00bb a \u00e9t\u00e9 trouv\u00e9.
 MismatchedTransformDimension_3    = La {0,choice,0#source|1#destination} de la transformation a {2} dimension{2,choice,1#|2#s}, alors qu\u2019on en attendait {1}.
 MissingAuthority_1                = Aucune autorit\u00e9 n\u2019a \u00e9t\u00e9 sp\u00e9cifi\u00e9e pour le code \u00ab\u202f{0}\u202f\u00bb. Le format attendu est \u00ab\u202fAUTORIT\u00c9:CODE\u202f\u00bb.
@@ -68,6 +75,7 @@ MissingHorizontalDimension_1      = Aucu
 MissingVerticalDimension_1        = Aucune dimension verticale n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
 MissingTemporalDimension_1        = Aucune dimension temporelle n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
 MissingSpatioTemporalDimension_1  = Aucune dimension spatiale ou temporelle n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
+MissingValueForParameter_1        = Aucune valeur n\u2019a \u00e9t\u00e9 d\u00e9finie pour le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb.
 NoConvergence                     = Le calcul ne converge pas.
 NoConvergenceForPoints_2          = Le calcul ne converge pas pour les points {0} et {1}.
 NonInvertibleMatrix_2             = Matrice {0}\u00d7{1} non inversible.
@@ -81,9 +89,13 @@ NotAnAffineTransform              = La t
 NotASkewSymmetricMatrix           = La matrice n\u2019est pas antisym\u00e9trique.
 NoSuchAuthorityCode_3             = Aucun code \u00ab\u202f{2}\u202f\u00bb de l\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9 pour un objet de type \u2018{1}\u2019.
 NoSuchOperationMethod_1           = Aucune m\u00e9thode n\u2019a \u00e9t\u00e9 trouv\u00e9e pour le nom ou l\u2019identifiant \u00ab\u202f{0}\u202f\u00bb.
+ParameterNotFound_2               = Aucun param\u00e8tre nomm\u00e9 \u00ab\u202f{1}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9 dans \u00ab\u202f{0}\u202f\u00bb.
+RecursiveCreateCallForCode_2      = Appels r\u00e9cursifs lors de la cr\u00e9ation d\u2019un objet de type \u2018{0}\u2019 pour le code \u00ab\u202f{1}\u202f\u00bb.
 SingularMatrix                    = La matrice est singuli\u00e8re.
 UnexpectedDimensionForCS_1        = Dimension inattendue pour un syst\u00e8me de coordonn\u00e9es de type \u2018{0}\u2019.
+UnitlessParameter_1               = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb n\u2019attend pas d\u2019unit\u00e9.
 UnknownAuthority_1                = L\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue.
 UnknownAxisDirection_1            = La direction d\u2019axe \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue.
 UnmodifiableAffineTransform       = Cette transformation affine n\u2019est pas modifiable.
 UnspecifiedDimensions             = Les dimensions n\u2019ont pas \u00e9t\u00e9 sp\u00e9cifi\u00e9es.
+UnspecifiedParameterValues        = Les valeurs des param\u00e8tres n\u2019ont pas \u00e9t\u00e9 sp\u00e9cifi\u00e9es.

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/provider/MapProjection.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -159,7 +159,7 @@ public abstract class MapProjection exte
             throws IllegalArgumentException
     {
         if (Double.isNaN(value) || Double.isInfinite(value)) {
-            throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalParameterValue_2,
+            throw new IllegalArgumentException(Resources.format(Resources.Keys.IllegalParameterValue_2,
                     descriptor.getName(), value));
         }
         final Comparable<? extends Number> min = descriptor.getMinimumValue();

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterDescriptorGroup.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -32,6 +32,7 @@ import org.opengis.parameter.ParameterNo
 import org.opengis.parameter.InvalidParameterNameException;
 import org.apache.sis.internal.jaxb.referencing.CC_OperationParameterGroup;
 import org.apache.sis.internal.metadata.MetadataUtilities;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.internal.util.UnmodifiableArrayList;
 import org.apache.sis.util.resources.Errors;
@@ -215,8 +216,8 @@ public class DefaultParameterDescriptorG
             final String name = parameter.getName().getCode();
             for (int j=0; j<i; j++) {
                 if (IdentifiedObjects.isHeuristicMatchForName(parameters[j], name)) {
-                    throw new InvalidParameterNameException(Errors.getResources(properties).getString(
-                            Errors.Keys.DuplicatedParameterName_4, Verifier.getDisplayName(parameters[j]), j, name, i),
+                    throw new InvalidParameterNameException(Resources.getResources(properties).getString(
+                            Resources.Keys.DuplicatedParameterName_4, Verifier.getDisplayName(parameters[j]), j, name, i),
                             name);
                 }
             }
@@ -389,7 +390,7 @@ public class DefaultParameterDescriptorG
                 ? Errors.format(Errors.Keys.AmbiguousName_3,
                         IdentifiedObjects.toString(fallback.getName()),
                         IdentifiedObjects.toString(ambiguity.getName()), name)
-                : Errors.format(Errors.Keys.ParameterNotFound_2, Verifier.getDisplayName(this), name), name);
+                : Resources.format(Resources.Keys.ParameterNotFound_2, Verifier.getDisplayName(this), name), name);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValue.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -380,7 +380,7 @@ public class DefaultParameterValue<T> ex
     private UnitConverter getConverterTo(final Unit<?> unit) {
         final Unit<?> source = getUnit();
         if (source == null) {
-            throw new IllegalStateException(Errors.format(Errors.Keys.UnitlessParameter_1, Verifier.getDisplayName(descriptor)));
+            throw new IllegalStateException(Resources.format(Resources.Keys.UnitlessParameter_1, Verifier.getDisplayName(descriptor)));
         }
         ensureNonNull("unit", unit);
         final short expectedID = Verifier.getUnitMessageID(source);
@@ -505,7 +505,7 @@ public class DefaultParameterValue<T> ex
         if (value != null) {
             throw new InvalidParameterTypeException(getClassTypeError(), name);
         }
-        throw new IllegalStateException(Errors.format(Errors.Keys.MissingValueForParameter_1, cause, name));
+        throw new IllegalStateException(Resources.format(Resources.Keys.MissingValueForParameter_1, name), cause);
     }
 
     /**
@@ -537,7 +537,7 @@ public class DefaultParameterValue<T> ex
         if (value != null) {
             return new InvalidParameterTypeException(getClassTypeError(), name);
         }
-        return new IllegalStateException(Errors.format(Errors.Keys.MissingValueForParameter_1, name));
+        return new IllegalStateException(Resources.format(Resources.Keys.MissingValueForParameter_1, name));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/DefaultParameterValueGroup.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -35,6 +35,7 @@ import org.opengis.parameter.GeneralPara
 import org.opengis.parameter.ParameterNotFoundException;
 import org.opengis.parameter.InvalidParameterCardinalityException;
 import org.apache.sis.internal.metadata.MetadataUtilities;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.ComparisonMode;
@@ -259,7 +260,7 @@ public class DefaultParameterValueGroup
              */
             final GeneralParameterDescriptor descriptor = values.descriptor.descriptor(name);
             if (!(descriptor instanceof ParameterDescriptor<?>) || descriptor.getMaximumOccurs() == 0) {
-                throw new ParameterNotFoundException(Errors.format(Errors.Keys.ParameterNotFound_2,
+                throw new ParameterNotFoundException(Resources.format(Resources.Keys.ParameterNotFound_2,
                         Verifier.getDisplayName(values.descriptor), name), name);
             }
             /*
@@ -358,7 +359,7 @@ public class DefaultParameterValueGroup
         if (groups.isEmpty()) {
             final ParameterDescriptorGroup descriptor = values.descriptor;
             if (!(descriptor.descriptor(name) instanceof ParameterDescriptorGroup)) {
-                throw new ParameterNotFoundException(Errors.format(Errors.Keys.ParameterNotFound_2,
+                throw new ParameterNotFoundException(Resources.format(Resources.Keys.ParameterNotFound_2,
                         Verifier.getDisplayName(descriptor), name), name);
             }
         }
@@ -390,8 +391,8 @@ public class DefaultParameterValueGroup
         final ParameterDescriptorGroup descriptor = values.descriptor;
         final GeneralParameterDescriptor child = descriptor.descriptor(name);
         if (!(child instanceof ParameterDescriptorGroup)) {
-            throw new ParameterNotFoundException(Errors.format(
-                    Errors.Keys.ParameterNotFound_2, descriptor.getName(), name), name);
+            throw new ParameterNotFoundException(Resources.format(
+                    Resources.Keys.ParameterNotFound_2, descriptor.getName(), name), name);
         }
         final ParameterValueGroup value = ((ParameterDescriptorGroup) child).createValue();
         values.add(value);

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/ParameterValueList.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -35,6 +35,7 @@ import org.apache.sis.util.ArraysExt;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.resources.Errors;
 import org.apache.sis.referencing.IdentifiedObjects;
+import org.apache.sis.internal.referencing.Resources;
 
 
 /**
@@ -242,11 +243,11 @@ final class ParameterValueList extends A
             final String code = name.getCode();
             for (final GeneralParameterDescriptor descriptor : descriptors) {
                 if (IdentifiedObjects.isHeuristicMatchForName(descriptor, code)) {
-                    throw new IllegalArgumentException(Errors.format(
-                            Errors.Keys.MismatchedParameterDescriptor_1, name));
+                    throw new IllegalArgumentException(Resources.format(
+                            Resources.Keys.MismatchedParameterDescriptor_1, name));
                 }
             }
-            throw new InvalidParameterNameException(Errors.format(Errors.Keys.ParameterNotFound_2,
+            throw new InvalidParameterNameException(Resources.format(Resources.Keys.ParameterNotFound_2,
                     Verifier.getDisplayName(descriptor), name), code);
         }
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Parameters.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -27,6 +27,7 @@ import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.parameter.*; // We use almost all types from this package.
 import org.apache.sis.internal.jaxb.metadata.replace.ServiceParameter;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.measure.Range;
 import org.apache.sis.measure.NumberRange;
 import org.apache.sis.measure.MeasurementRange;
@@ -198,7 +199,7 @@ public abstract class Parameters impleme
             // We require a strict equality - not type.isAssignableFrom(actual) - because in
             // the later case we could have (to be strict) to return a <? extends T> type.
             if (!valueClass.equals(actual)) {
-                throw new ClassCastException(Errors.format(Errors.Keys.IllegalParameterType_2,
+                throw new ClassCastException(Resources.format(Resources.Keys.IllegalParameterType_2,
                         Verifier.getDisplayName(descriptor), actual));
             }
         }
@@ -228,7 +229,7 @@ public abstract class Parameters impleme
             final ParameterDescriptor<?> descriptor = parameter.getDescriptor();
             final Class<?> actual = descriptor.getValueClass();
             if (!valueClass.equals(actual)) {   // Same comment than cast(ParameterDescriptor).
-                throw new ClassCastException(Errors.format(Errors.Keys.IllegalParameterType_2,
+                throw new ClassCastException(Resources.format(Resources.Keys.IllegalParameterType_2,
                         Verifier.getDisplayName(descriptor), actual));
             }
         }
@@ -515,7 +516,7 @@ public abstract class Parameters impleme
         if (value != null) {
             return value;
         } else {
-            throw new IllegalStateException(Errors.format(Errors.Keys.MissingValueForParameter_1,
+            throw new IllegalStateException(Resources.format(Resources.Keys.MissingValueForParameter_1,
                     Verifier.getDisplayName(parameter)));
         }
     }
@@ -530,7 +531,7 @@ public abstract class Parameters impleme
         if (value != null) {
             return value;
         } else {
-            throw new IllegalStateException(Errors.format(Errors.Keys.MissingValueForParameter_1,
+            throw new IllegalStateException(Resources.format(Resources.Keys.MissingValueForParameter_1,
                     Verifier.getDisplayName(parameter)));
         }
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorParameters.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -39,6 +39,7 @@ import org.apache.sis.referencing.NamedI
 import org.apache.sis.referencing.IdentifiedObjects;
 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.Constants;
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.measure.NumberRange;
@@ -616,8 +617,8 @@ public class TensorParameters<E> impleme
                 return param;
             }
         }
-        throw (ParameterNotFoundException) new ParameterNotFoundException(Errors.format(
-                Errors.Keys.ParameterNotFound_2, caller.getName(), name), name).initCause(cause);
+        throw (ParameterNotFoundException) new ParameterNotFoundException(Resources.format(
+                Resources.Keys.ParameterNotFound_2, caller.getName(), name), name).initCause(cause);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/TensorValues.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -33,6 +33,7 @@ import org.opengis.parameter.GeneralPara
 import org.opengis.parameter.ParameterNotFoundException;
 import org.apache.sis.referencing.IdentifiedObjects;
 import org.apache.sis.referencing.operation.matrix.Matrices;
+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.internal.util.Numerics;
@@ -238,8 +239,8 @@ final class TensorValues<E> extends Abst
                 return dimensions[i];
             }
         }
-        throw (ParameterNotFoundException) new ParameterNotFoundException(Errors.format(
-                Errors.Keys.ParameterNotFound_2, getName(), name), name).initCause(cause);
+        throw (ParameterNotFoundException) new ParameterNotFoundException(Resources.format(
+                Resources.Keys.ParameterNotFound_2, getName(), name), name).initCause(cause);
     }
 
     /**
@@ -358,7 +359,7 @@ final class TensorValues<E> extends Abst
      */
     @Override
     public List<ParameterValueGroup> groups(final String name) throws ParameterNotFoundException {
-        throw new ParameterNotFoundException(Errors.format(Errors.Keys.ParameterNotFound_2, getName(), name), name);
+        throw new ParameterNotFoundException(Resources.format(Resources.Keys.ParameterNotFound_2, getName(), name), name);
     }
 
     /**
@@ -366,7 +367,7 @@ final class TensorValues<E> extends Abst
      */
     @Override
     public ParameterValueGroup addGroup(String name) throws ParameterNotFoundException, IllegalStateException {
-        throw new ParameterNotFoundException(Errors.format(Errors.Keys.ParameterNotFound_2, getName(), name), name);
+        throw new ParameterNotFoundException(Resources.format(Resources.Keys.ParameterNotFound_2, getName(), name), name);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/UnmodifiableParameterValueGroup.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -31,6 +31,7 @@ import org.apache.sis.util.ArgumentCheck
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.util.LenientComparable;
 import org.apache.sis.util.resources.Errors;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.UnmodifiableArrayList;
 
 // Branch-dependent imports
@@ -146,7 +147,7 @@ final class UnmodifiableParameterValueGr
         if (value != null) {
             return value;
         }
-        throw new ParameterNotFoundException(Errors.format(Errors.Keys.ParameterNotFound_2,
+        throw new ParameterNotFoundException(Resources.format(Resources.Keys.ParameterNotFound_2,
                 Verifier.getDisplayName(descriptor), name), name);
     }
 
@@ -166,7 +167,7 @@ final class UnmodifiableParameterValueGr
         }
         if (groups.isEmpty()) {
             if (!(descriptor.descriptor(name) instanceof ParameterDescriptorGroup)) {
-                throw new ParameterNotFoundException(Errors.format(Errors.Keys.ParameterNotFound_2,
+                throw new ParameterNotFoundException(Resources.format(Resources.Keys.ParameterNotFound_2,
                         Verifier.getDisplayName(descriptor), name), name);
             }
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/parameter/Verifier.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -29,6 +29,7 @@ import org.opengis.parameter.ParameterDe
 import org.opengis.parameter.GeneralParameterDescriptor;
 import org.opengis.parameter.InvalidParameterValueException;
 import org.apache.sis.internal.referencing.EPSGParameterDomain;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.system.Semaphores;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.measure.Range;
@@ -46,16 +47,22 @@ import org.apache.sis.util.resources.Voc
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.4
- * @version 0.7
+ * @version 0.8
  * @module
  */
 final class Verifier {
     /**
-     * The {@link Errors.Keys} value that describe the invalid value.
+     * The {@link Errors.Keys} or {@link Resources.Keys} value that describe the invalid value.
      */
     private final short errorKey;
 
     /**
+     * {@code false} if {@link #errorKey} is a {@code Errors.Keys} constants,
+     * or {@code true} if it is a {@code Resources.Keys} constant.
+     */
+    private final boolean internal;
+
+    /**
      * {@code true} if the last element in {@link #arguments} shall be set to the erroneous value.
      */
     private final boolean needsValue;
@@ -75,8 +82,9 @@ final class Verifier {
     /**
      * Stores information about an error.
      */
-    private Verifier(final short errorKey, final boolean needsValue, final Object... arguments) {
+    private Verifier(final boolean internal, final short errorKey, final boolean needsValue, final Object... arguments) {
         this.errorKey   = errorKey;
+        this.internal   = internal;
         this.needsValue = needsValue;
         this.arguments  = arguments;
     }
@@ -117,7 +125,7 @@ final class Verifier {
                 def = getCompatibleUnit(Parameters.getValueDomain(descriptor), unit);
                 if (def == null) {
                     final String name = getDisplayName(descriptor);
-                    throw new InvalidParameterValueException(Errors.format(Errors.Keys.UnitlessParameter_1, name), name, unit);
+                    throw new InvalidParameterValueException(Resources.format(Resources.Keys.UnitlessParameter_1, name), name, unit);
                 }
             }
             if (!unit.equals(def)) {
@@ -133,7 +141,7 @@ final class Verifier {
                     if (!valueClass.isInstance(value)) {
                         final String name = getDisplayName(descriptor);
                         throw new InvalidParameterValueException(
-                                Errors.format(Errors.Keys.IllegalParameterValueClass_3,
+                                Resources.format(Resources.Keys.IllegalParameterValueClass_3,
                                 name, valueClass, value.getClass()), name, value);
                     }
                     /*
@@ -241,7 +249,7 @@ final class Verifier {
                  */
                 assert valueDomain.getElementType() == valueClass : valueDomain;
                 if (!((Range) valueDomain).contains((Comparable<?>) convertedValue)) {
-                    return new Verifier(Errors.Keys.ValueOutOfRange_4, true, null,
+                    return new Verifier(false, Errors.Keys.ValueOutOfRange_4, true, null,
                             valueDomain.getMinValue(), valueDomain.getMaxValue(), convertedValue);
                 }
             } else {
@@ -253,7 +261,7 @@ final class Verifier {
                 for (int i=0; i<length; i++) {
                     final Object e = Array.get(convertedValue, i);
                     if (!((Range) valueDomain).contains((Comparable<?>) e)) {
-                        return new Verifier(Errors.Keys.ValueOutOfRange_4, true, i,
+                        return new Verifier(false, Errors.Keys.ValueOutOfRange_4, true, i,
                                 valueDomain.getMinValue(), valueDomain.getMaxValue(), e);
                     }
                 }
@@ -279,15 +287,16 @@ final class Verifier {
             final Comparable<T> minimum, final Comparable<T> maximum, final Object convertedValue)
     {
         if (!valueClass.isInstance(convertedValue)) {
-            return new Verifier(Errors.Keys.IllegalParameterValueClass_3, false, null, valueClass, convertedValue.getClass());
+            return new Verifier(true, Resources.Keys.IllegalParameterValueClass_3,
+                    false, null, valueClass, convertedValue.getClass());
         }
         if (validValues != null && !validValues.contains(convertedValue)) {
-            return new Verifier(Errors.Keys.IllegalParameterValue_2, true, null, convertedValue);
+            return new Verifier(true, Resources.Keys.IllegalParameterValue_2, true, null, convertedValue);
         }
         if ((minimum != null && minimum.compareTo((T) convertedValue) > 0) ||
             (maximum != null && maximum.compareTo((T) convertedValue) < 0))
         {
-            return new Verifier(Errors.Keys.ValueOutOfRange_4, true, null, minimum, maximum, convertedValue);
+            return new Verifier(false, Errors.Keys.ValueOutOfRange_4, true, null, minimum, maximum, convertedValue);
         }
         return null;
     }
@@ -300,7 +309,7 @@ final class Verifier {
      *        uses the inverse of that conversion for converting the given minimum and maximum values.
      */
     private void convertRange(UnitConverter converter) {
-        if (converter != null && errorKey == Errors.Keys.ValueOutOfRange_4) {
+        if (converter != null && !internal && errorKey == Errors.Keys.ValueOutOfRange_4) {
             converter = converter.inverse();
             Object minimumValue = arguments[1];
             Object maximumValue = arguments[2];
@@ -344,7 +353,7 @@ final class Verifier {
         if (needsValue) {
             arguments[arguments.length - 1] = value;
         }
-        return Errors.getResources(properties).getString(errorKey, arguments);
+        return (internal ? Resources.getResources(properties) : Errors.getResources(properties)).getString(errorKey, arguments);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/CommonCRS.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -65,11 +65,12 @@ import org.apache.sis.referencing.factor
 import org.apache.sis.metadata.iso.citation.Citations;
 import org.apache.sis.internal.referencing.provider.TransverseMercator;
 import org.apache.sis.internal.referencing.Formulas;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.system.SystemListener;
 import org.apache.sis.internal.system.Modules;
 import org.apache.sis.internal.system.Loggers;
+import org.apache.sis.internal.util.Constants;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.logging.Logging;
 import org.apache.sis.util.ArgumentChecks;
 import org.apache.sis.util.Exceptions;
@@ -1621,7 +1622,7 @@ public enum CommonCRS {
      * After invoking this method, the caller will fallback on hard-coded values.
      */
     static void failure(final Object caller, final String method, final FactoryException e, final int code) {
-        String message = Errors.format(Errors.Keys.CanNotInstantiate_1, "EPSG:" + code);
+        String message = Resources.format(Resources.Keys.CanNotInstantiateGeodeticObject_1, (Constants.EPSG + ':') + code);
         message = Exceptions.formatChainedMessages(null, message, e);
         final LogRecord record = new LogRecord(Level.WARNING, message);
         if (!(e instanceof UnavailableFactoryException) || !AuthorityFactories.failure((UnavailableFactoryException) e)) {

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=1762880&r1=1762879&r2=1762880&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] Fri Sep 30 10:49:48 2016
@@ -749,7 +749,7 @@ public class MultiAuthoritiesFactory ext
                 if (code == null) {
                     message = Errors.format(Errors.Keys.MissingComponentInElement_2, s, "code");
                 } else {
-                    message = Errors.format(Errors.Keys.CanNotCreateObjectAsInstanceOf_2, type,
+                    message = Resources.format(Resources.Keys.CanNotCreateObjectAsInstanceOf_2, type,
                             DefinitionURI.PREFIX + DefinitionURI.SEPARATOR + uri.type);
                 }
                 throw new NoSuchAuthorityCodeException(message, authority, code, s);

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=1762880&r1=1762879&r2=1762880&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] Fri Sep 30 10:49:48 2016
@@ -965,7 +965,7 @@ addURIs:    for (int i=0; ; i++) {
      */
     private void ensureNoCycle(final Class<?> type, final Integer code) throws FactoryException {
         if (safetyGuard.putIfAbsent(code, type) != null) {
-            throw new FactoryException(error().getString(Errors.Keys.RecursiveCreateCallForCode_2, type, code));
+            throw new FactoryException(resources().getString(Resources.Keys.RecursiveCreateCallForCode_2, type, code));
         }
     }
 

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=1762880&r1=1762879&r2=1762880&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] Fri Sep 30 10:49:48 2016
@@ -36,12 +36,12 @@ import org.apache.sis.internal.metadata.
 import org.apache.sis.internal.metadata.VerticalDatumTypes;
 import org.apache.sis.internal.metadata.ReferencingServices;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
-import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.referencing.provider.Geographic2Dto3D;
 import org.apache.sis.internal.referencing.provider.Geographic3Dto2D;
 import org.apache.sis.internal.referencing.provider.GeographicToGeocentric;
 import org.apache.sis.internal.referencing.provider.GeocentricToGeographic;
 import org.apache.sis.internal.referencing.provider.GeocentricAffine;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.util.Constants;
 import org.apache.sis.measure.Units;
 import org.apache.sis.metadata.iso.citation.Citations;
@@ -57,7 +57,6 @@ import org.apache.sis.referencing.datum.
 import org.apache.sis.referencing.operation.matrix.Matrices;
 import org.apache.sis.referencing.operation.transform.DefaultMathTransformFactory;
 import org.apache.sis.util.ArgumentChecks;
-import org.apache.sis.util.resources.Errors;
 import org.apache.sis.util.resources.Vocabulary;
 
 import static org.apache.sis.util.Utilities.equalsIgnoreMetadata;
@@ -201,7 +200,7 @@ public class CoordinateOperationFinder e
             return createFromAffineTransform(AXIS_CHANGES, sourceCRS, targetCRS,
                     CoordinateSystems.swapAndScaleAxes(sourceCRS.getCoordinateSystem(), targetCRS.getCoordinateSystem()));
         } catch (IllegalArgumentException | ConversionException e) {
-            throw new FactoryException(Errors.format(Errors.Keys.CanNotInstantiate_1, new CRSPair(sourceCRS, targetCRS)), e);
+            throw new FactoryException(Resources.format(Resources.Keys.CanNotInstantiateGeodeticObject_1, new CRSPair(sourceCRS, targetCRS)), e);
         }
         /*
          * If this method is invoked recursively, verify if the requested operation is already in the cache.
@@ -216,7 +215,7 @@ public class CoordinateOperationFinder e
             if (op != null) return op;
         }
         if (previousSearches.put(key, Boolean.TRUE) != null) {
-            throw new FactoryException(Errors.format(Errors.Keys.RecursiveCreateCallForCode_2, CoordinateOperation.class, key));
+            throw new FactoryException(Resources.format(Resources.Keys.RecursiveCreateCallForCode_2, CoordinateOperation.class, key));
         }
         /*
          * If the user did not specified an area of interest, use the domain of validity of the CRS.

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=1762880&r1=1762879&r2=1762880&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] Fri Sep 30 10:49:48 2016
@@ -61,6 +61,7 @@ import org.apache.sis.internal.referenci
 import org.apache.sis.internal.referencing.PositionalAccuracyConstant;
 import org.apache.sis.internal.referencing.ReferencingUtilities;
 import org.apache.sis.internal.referencing.provider.Affine;
+import org.apache.sis.internal.referencing.Resources;
 import org.apache.sis.internal.metadata.ReferencingServices;
 import org.apache.sis.internal.system.Loggers;
 import org.apache.sis.internal.util.Citations;
@@ -73,7 +74,6 @@ import org.apache.sis.util.logging.Loggi
 import org.apache.sis.util.collection.Containers;
 import org.apache.sis.util.collection.BackingStoreException;
 import org.apache.sis.util.resources.Vocabulary;
-import org.apache.sis.util.resources.Errors;
 
 // Branch-dependent imports
 import java.util.Objects;
@@ -335,7 +335,7 @@ class CoordinateOperationRegistry {
                     return operation;
                 }
             } catch (IllegalArgumentException | ConversionException e) {
-                String message = Errors.format(Errors.Keys.CanNotInstantiate_1, new CRSPair(sourceCRS, targetCRS));
+                String message = Resources.format(Resources.Keys.CanNotInstantiateGeodeticObject_1, new CRSPair(sourceCRS, targetCRS));
                 String details = e.getLocalizedMessage();
                 if (details != null) {
                     message = message + ' ' + details;

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=1762880&r1=1762879&r2=1762880&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] Fri Sep 30 10:49:48 2016
@@ -210,8 +210,8 @@ public class DefaultConversion extends A
             this.transform = transform;
             checkDimensions(method, 0, transform, properties);
         } else if (parameters == null) {
-            throw new IllegalArgumentException(Errors.getResources(properties)
-                    .getString(Errors.Keys.UnspecifiedParameterValues));
+            throw new IllegalArgumentException(Resources.getResources(properties)
+                    .getString(Resources.Keys.UnspecifiedParameterValues));
         }
         if (parameters != null) {
             this.parameters = Parameters.unmodifiable(parameters);
@@ -246,7 +246,7 @@ public class DefaultConversion extends A
              * thanks to the 'sourceCRS' argument, we can complete the parameters.
              */
             if (parameters == null) {
-                throw new IllegalArgumentException(Errors.format(Errors.Keys.UnspecifiedParameterValues));
+                throw new IllegalArgumentException(Resources.format(Resources.Keys.UnspecifiedParameterValues));
             }
             if (factory instanceof DefaultMathTransformFactory) {
                 /*

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=1762880&r1=1762879&r2=1762880&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] Fri Sep 30 10:49:48 2016
@@ -601,7 +601,7 @@ next:   for (int i=components.size(); --
             op = new AbstractSingleOperation(properties, sourceCRS, targetCRS, interpolationCRS, method, transform);
         }
         if (!baseType.isInstance(op)) {
-            throw new FactoryException(Errors.format(Errors.Keys.CanNotCreateObjectAsInstanceOf_2, baseType, op.getName()));
+            throw new FactoryException(Resources.format(Resources.Keys.CanNotCreateObjectAsInstanceOf_2, baseType, op.getName()));
         }
         return pool.unique(op);
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/projection/PolarStereographic.java [UTF-8] Fri Sep 30 10:49:48 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/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ContextualParameters.java [UTF-8] Fri Sep 30 10:49:48 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/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/DefaultMathTransformFactory.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -677,7 +677,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));
         }
 
         /**

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/InterpolatedTransform.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -141,8 +141,8 @@ 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()) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedException.java [UTF-8] Fri Sep 30 10:49:48 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/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/util/LocalizedParseException.java [UTF-8] Fri Sep 30 10:49:48 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) {

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/ArrayVector.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -90,7 +90,7 @@ abstract class ArrayVector<E extends Num
         if (array instanceof String[]) {
             return new ArrayVector.ASCII((String[]) array);
         }
-        throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalParameterType_2, "array", array.getClass()));
+        throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalArgumentClass_2, "array", array.getClass()));
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java?rev=1762880&r1=1762879&r2=1762880&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/math/Vector.java [UTF-8] Fri Sep 30 10:49:48 2016
@@ -119,7 +119,7 @@ public abstract class Vector extends Abs
         if (array instanceof Vector) {
             return (Vector) array;
         }
-        throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalParameterType_2, "array", array.getClass()));
+        throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalArgumentClass_2, "array", array.getClass()));
     }
 
     /**



Mime
View raw message