sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1763840 [9/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-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Fri Oct  7 21:35:43 2016
@@ -21,51 +21,34 @@
 #   U+202F NARROW NO-BREAK SPACE  before  ; ! and ?
 #   U+00A0 NO-BREAK SPACE         before  :
 #
-AbstractType_1                    = Le type \u2018{0}\u2019 est abstrait.
 AmbiguousName_3                   = Le nom \u00ab\u202f{2}\u202f\u00bb est ambigu\u00eb car il peut \u00eatre interpr\u00e9t\u00e9 comme \u00ab\u202f{0}\u202f\u00bb ou \u00ab\u202f{1}\u202f\u00bb.
 CanNotAddToExclusiveSet_2         = Aucun \u00e9l\u00e9ment ne peut \u00eatre ajout\u00e9 \u00e0 cet ensemble car les propri\u00e9t\u00e9s \u2018{0}\u2019 et \u2018{1}\u2019 sont mutuellement exclusives.
 CanNotAssign_2                    = Ne peut pas assigner \u00ab\u202f{1}\u202f\u00bb \u00e0 \u00ab\u202f{0}\u202f\u00bb.
-CanNotAssignCharacteristics_1     = Ne peut pas assigner des caract\u00e9ristiques \u00e0 la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb.
 CanNotAssignUnitToDimension_2     = Ne peut pas assigner les unit\u00e9s \u00ab\u202f{1}\u202f\u00bb \u00e0 la dimension \u00ab\u202f{0}\u202f\u00bb.
-CanNotConcatenateTransforms_2     = Les transformations \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb ne peuvent pas \u00eatre combin\u00e9es.
 CanNotConnectTo_1                 = Ne peut pas se connecter \u00e0 \u00ab\u202f{0}\u202f\u00bb.
 CanNotConvertFromType_2           = Ne peut pas convertir du type \u2018{0}\u2019 vers le type \u2018{1}\u2019.
 CanNotConvertValue_2              = La valeur \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre convertie vers le type \u2018{1}\u2019.
 CanNotCompute_1                   = Ne peut pas calculer \u00ab\u202f{0}\u202f\u00bb.
-CanNotComputeDerivative           = La d\u00e9riv\u00e9 ne peut pas \u00eatre calcul\u00e9e.
-CanNotCreateObjectAsInstanceOf_2  = Ne peut pas cr\u00e9er un objet de type \u00ab\u202f{1}\u202f\u00bb comme une instance de la classe \u2018{0}\u2019.
-CanNotInstantiate_1               = Ne peut pas cr\u00e9er \u00ab\u202f{0}\u202f\u00bb.
-CanNotMapAxisToDirection_2        = Aucun axe de \u00ab\u202f{0}\u202f\u00bb n\u2019a pu \u00eatre associ\u00e9 \u00e0 la direction \u00ab\u202f{1}\u202f\u00bb.
 CanNotOpen_1                      = Ne peut pas ouvrir \u00ab\u202f{0}\u202f\u00bb.
 CanNotParseFile_2                 = Ne peut pas lire \u00ab\u202f{1}\u202f\u00bb comme un fichier au format {0}.
 CanNotRead_1                      = Ne peut pas lire \u00ab\u202f{0}\u202f\u00bb.
 CanNotReadPropertyInFile_2        = Ne peut pas lire la propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb dans le fichier \u00ab\u202f{0}\u202f\u00bb.
 CanNotRepresentInFormat_2         = Ne peut pas repr\u00e9senter \u00ab\u202f{1}\u202f\u00bb dans un format {0} strictement conforme.
-CanNotSeparateTargetDimension_1   = La dimension de destination {0} d\u00e9pend de dimensions sources qui ont \u00e9t\u00e9 exclues.
 CanNotSetParameterValue_1         = Ne peut pas d\u00e9finir une valeur pour le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb.
 CanNotSetPropertyValue_1          = Ne peut pas d\u00e9finir une valeur pour la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb.
 CanNotTransformEnvelope           = Ne peut pas transformer l\u2019enveloppe.
-CanNotTransformEnvelopeToGeodetic = Ne peut pas transformer l\u2019enveloppe vers un syst\u00e8me g\u00e9od\u00e9sique.
-CanNotUseGeodeticParameters_2     = Ne peut pas utiliser les param\u00e8tres g\u00e9od\u00e9siques {0}\u202f: {1}
 CircularReference                 = R\u00e9f\u00e9rence circulaire.
 ClassNotFinal_1                   = La classe \u2018{0}\u2019 n\u2019est pas finale.
 CloneNotSupported_1               = Un objet de type \u2018{0}\u2019 ne peut pas \u00eatre clon\u00e9.
 ClosedReader_1                    = Ce lecteur {0} est ferm\u00e9.
-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.
 DatabaseError_2                   = Erreur de base de donn\u00e9es lors de la cr\u00e9ation d\u2019un objet \u2018{0}\u2019 pour le code \u00ab\u202f{1}\u202f\u00bb.
-DatumOriginShallBeDate            = L\u2019origine d\u2019un r\u00e9f\u00e9rentiel temporel doit \u00eatre une date.
 DeadThread_1                      = La t\u00e2che \u00ab\u202f{0}\u202f\u00bb est morte.
-DependencyNotFound_3              = L\u2019op\u00e9ration \u00ab\u202f{0}\u202f\u00bb n\u00e9cessite une propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb, mais cette propri\u00e9t\u00e9 n\u2019a pas \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{2}\u202f\u00bb.
-DirectoryNotExpected_1            = Le fichier \u00ab\u202f{0}\u202f\u00bb d\u00e9signe un r\u00e9pertoire plut\u00f4t qu\u2019un fichier r\u00e9gulier.
 DisposedInstanceOf_1              = Cette instance de \u2018{0}\u2019 a \u00e9t\u00e9 dispos\u00e9e.
 DuplicatedElement_1               = L\u2019\u00e9lement \u00ab\u202f{0}\u202f\u00bb est dupliqu\u00e9.
 DuplicatedIdentifier_1            = Le nom ou l\u2019identifiant \u00ab\u202f{0}\u202f\u00bb est utilis\u00e9 plus d\u2019une fois.
 DuplicatedOption_1                = L\u2019option \u00ab\u202f{0}\u202f\u00bb est dupliqu\u00e9e.
-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}.
 ElementAlreadyPresent_1           = L\u2019\u00e9lement \u00ab\u202f{0}\u202f\u00bb est d\u00e9j\u00e0 pr\u00e9sent.
 ElementNotFound_1                 = L\u2019\u00e9lement \u00ab\u202f{0}\u202f\u00bb n\u2019a pas \u00e9t\u00e9 trouv\u00e9.
-EllipticalNotSupported            = Projection elliptique non-support\u00e9e.
 EmptyArgument_1                   = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre vide.
 EmptyDictionary                   = Le dictionnaire doit contenir au moins une entr\u00e9e.
 EmptyEnvelope2D                   = L\u2019enveloppe doit avoir au moins deux dimensions et ne pas \u00eatre vide.
@@ -75,7 +58,6 @@ ErrorInFileAtLine_2               = Une
 ExcessiveArgumentSize_3           = L\u2019argument \u2018{0}\u2019 ne peut pas contenir plus de {1} \u00e9l\u00e9ments. Un nombre de {2} est excessif.
 ExcessiveListSize_2               = Une taille de {1} \u00e9l\u00e9ments est excessive pour la liste \u00ab\u202f{0}\u202f\u00bb.
 ExcessiveNumberOfDimensions_1     = Pour cet algorithme, {0} est un trop grand nombre de dimensions.
-ExcessiveStringSize               = La cha\u00eene de caract\u00e8res est trop longue.
 FactoryNotFound_1                 = Aucune fabrique de type \u2018{0}\u2019 n\u2019a \u00e9t\u00e9 trouv\u00e9e.
 FileNotFound_1                    = Le fichier \u00ab\u202f{0}\u202f\u00bb n\u2019a pas \u00e9t\u00e9 trouv\u00e9.
 ForbiddenAttribute_2              = L\u2019attribut \u00ab\u202f{0}\u202f\u00bb n\u2019est pas autoris\u00e9 pour un objet de type \u2018{1}\u2019.
@@ -84,7 +66,6 @@ IllegalArgumentClass_2            = L\u2
 IllegalArgumentClass_3            = L\u2019argument \u2018{0}\u2019 ne peut pas \u00eatre de type \u2018{2}\u2019. Une instance de \u2018{1}\u2019 ou d\u2019un type d\u00e9riv\u00e9 \u00e9tait attendue.
 IllegalArgumentField_4            = L\u2019argument \u2018{0}\u2019 n\u2019accepte pas la valeur \u00ab\u202f{1}\u202f\u00bb parce que le champs \u2018{2}\u2019 ne peut pas prendre la valeur \u00ab\u202f{3}\u202f\u00bb.
 IllegalArgumentValue_2            = L\u2019argument \u2018{0}\u2019 n\u2019accepte pas la valeur \u00ab\u202f{1}\u202f\u00bb.
-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.
 IllegalBitsPattern_1              = Pattern de bits invalide: {0}.
 IllegalClass_2                    = La classe \u2018{1}\u2019 est ill\u00e9gale. Il doit s\u2019agir d\u2019une classe \u2018{0}\u2019 ou d\u00e9riv\u00e9e.
 IllegalCharacter_2                = Le caract\u00e8re \u00ab\u202f{1}\u202f\u00bb ne peut pas \u00eatre utilis\u00e9 dans \u00ab\u202f{0}\u202f\u00bb.
@@ -96,21 +77,12 @@ IllegalIdentifierForCodespace_2   = \u00
 IllegalInputTypeForReader_2       = Le lecteur {0} n\u2019accepte pas des entr\u00e9s de type \u2018{1}\u2019.
 IllegalLanguageCode_1             = Le code de langue \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnu.
 IllegalMemberType_2               = Le membre \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre associ\u00e9 au type \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.
 IllegalOptionValue_2              = L\u2019option \u2018{0}\u2019 n\u2019accepte pas la valeur \u00ab\u202f{1}\u202f\u00bb.
 IllegalOrdinateRange_3            = La plage de valeurs de coordonn\u00e9es [{0} \u2026 {1}] n\u2019est pas valide pour l\u2019axe \u00ab\u202f{2}\u202f\u00bb.
-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.
-IllegalPropertyType_2             = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre du type \u2018{1}\u2019.
 IllegalPropertyValueClass_2       = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019accepte pas les valeurs de type \u2018{1}\u2019.
 IllegalPropertyValueClass_3       = Une instance \u2018{1}\u2019 \u00e9tait attendue pour la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb, mais la valeur donn\u00e9e est une instance de \u2018{2}\u2019.
 IllegalRange_2                    = La plage [{0} \u2026 {1}] n\u2019est pas valide.
 IllegalUnicodeCodePoint_2         = La valeur {1} de \u00ab\u202f{0}\u202f\u00bb n\u2019est pas un code Unicode valide.
-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.
 IncompatibleFormat_2              = Le format \u00ab\u202f{1}\u202f\u00bb ne s\u2019applique pas \u00e0 \u00ab\u202f{0}\u202f\u00bb.
 IncompatiblePropertyValue_1       = La valeur de la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas compatible.
 IncompatibleUnit_1                = L\u2019unit\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas compatible avec la valeur actuelle.
@@ -119,13 +91,11 @@ InconsistentAttribute_2           = La v
 InconsistentNamespace_2           = L\u2019espace de nom \u201c{0}\u201d \u00e9tait attendu pour \u201c{1}\u201d.
 InconsistentTableColumns          = Les colonnes des tables ne sont pas coh\u00e9rentes.
 InconsistentUnitsForCS_1          = L\u2019unit\u00e9 de mesure \u00ab\u202f{0}\u202f\u00bb n\u2019est pas coh\u00e9rente avec les axes du syst\u00e8me de coordonn\u00e9es.
-IdentifierAlreadyBound_1          = L\u2019identifiant \u00ab\u202f{0}\u202f\u00bb est d\u00e9j\u00e0 associ\u00e9 \u00e0 un autre objet.
 IndexOutOfBounds_1                = L\u2019index {0} est en dehors des limites permises.
 IndicesOutOfBounds_2              = Les index ({0}, {1}) sont en dehors des limites permises.
 InfiniteArgumentValue_1           = L\u2019argument \u2018{0}\u2019 ne peut pas prendre une valeur infinie.
 InsufficientArgumentSize_3        = L\u2019argument \u2018{0}\u2019 doit contenir au moins {1} \u00e9l\u00e9ments. Un nombre de {2} est insuffisant.
 KeyCollision_1                    = Une valeur diff\u00e9rente est d\u00e9j\u00e0 associ\u00e9e \u00e0 la cl\u00e9 \u00ab\u202f{0}\u202f\u00bb.
-LatitudesAreOpposite_2            = Les latitudes {0} et {1} sont oppos\u00e9es.
 MandatoryAttribute_2              = L\u2019attribut \u00ab\u202f{0}\u202f\u00bb est obligatoire pour un objet de type \u2018{1}\u2019.
 MismatchedArrayLengths            = Les dimensions des tableaux ne correspondent pas.
 MismatchedCRS                     = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es doit \u00eatre le m\u00eame pour tous les objets.
@@ -134,62 +104,31 @@ MismatchedDimension_3             = L\u2
 MismatchedDimensionForCRS_3       = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es \u00ab\u202f{0}\u202f\u00bb a {1} dimension{1,choice,1#|2#s}, mais la g\u00e9om\u00e9trie donn\u00e9e en a {2}.
 MismatchedGridGeometry_2          = La g\u00e9om\u00e9trie de la grille doit \u00eatre la m\u00eame pour \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb.
 MismatchedMatrixSize_4            = Une matrice de taille de {0}\u00d7{1} \u00e9tait attendue mais la matrice donn\u00e9e est de taille {2}\u00d7{3}.
-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.
-MismatchedPropertyType_1          = Le type de la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb ne correspond pas.
-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}.
-MismatchedValueClass_3            = Les valeurs de \u00ab\u202f{0}\u202f\u00bb sont de la classe \u2018{2}\u2019, alors que le type demand\u00e9 \u00e9tait \u2018{1}\u2019.
-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.
 MissingCharacterInElement_2       = Un caract\u00e8re \u2018{1}\u2019 est manquant dans l\u2019\u00e9l\u00e9ment \u00ab\u202f{0}\u202f\u00bb.
 MissingComponentInElement_2       = Il manque une composante \u00ab\u202f{1}\u202f\u00bb dans l\u2019\u00e9l\u00e9ment \u00ab\u202f{0}\u202f\u00bb.
-MissingInterpolationOrdinates     = La dimension des coordonn\u00e9es en entr\u00e9 ou en sortie du \u2018MathTransform\u2019 n\u2019est pas suffisante pour contenir les points d\u2019interpolation.
-MissingNamespace_1                = \u201c{0}\u201d est d\u00e9fini sans espace de noms.
 MissingRequiredModule_1           = Cette op\u00e9ration requiert le module \u00ab\u202f{0}\u202f\u00bb.
-MissingSchemeInURI                = Il manque le sch\u00e9ma d\u2019URI.
 MissingValueForOption_1           = Aucune valeur n\u2019a \u00e9t\u00e9 d\u00e9finie pour l\u2019option \u00ab\u202f{0}\u202f\u00bb.
-MissingValueForParameter_1        = Aucune valeur n\u2019a \u00e9t\u00e9 d\u00e9finie pour le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb.
 MissingValueForProperty_1         = Aucune valeur n\u2019a \u00e9t\u00e9 d\u00e9finie pour la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb.
 MissingValueInColumn_1            = Il manque une valeur dans la colonne \u00ab\u202f{0}\u202f\u00bb.
-MissingHorizontalDimension_1      = Aucune dimension horizontale n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
-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.
 MutuallyExclusiveOptions_2        = Les options \u00ab\u202f{0}\u202f\u00bb et \u00ab\u202f{1}\u202f\u00bb sont mutuellement exclusives.
 NegativeArgument_2                = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre n\u00e9gatif. La valeur donn\u00e9e \u00e9tait {1}.
 NegativeArrayLength_1             = Ne peut pas cr\u00e9er un tableau \u00ab\u202f{0}\u202f\u00bb de longueur n\u00e9gative.
-NoConvergence                     = Le calcul ne converge pas.
-NoConvergenceForPoints_2          = Le calcul ne converge pas pour les points {0} et {1}.
 NodeChildOfItself_1               = Le n\u0153ud \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre un enfant de lui-m\u00eame.
 NodeHasAnotherParent_1            = Le n\u0153ud \u00ab\u202f{0}\u202f\u00bb a d\u00e9j\u00e0 un autre parent.
 NodeHasNoParent_1                 = Le n\u0153ud \u00ab\u202f{0}\u202f\u00bb n\u2019a pas de parent.
 NodeIsLeaf_1                      = Le n\u0153ud \u00ab\u202f{0}\u202f\u00bb est une feuille.
-NodeNotFound_1                    = Aucun n\u0153ud \u00ab\u202f{0}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9.
 NonEquilibratedParenthesis_2      = Il manque une parenth\u00e8se \u2018{1}\u2019 dans \u00ab\u202f{0}\u202f\u00bb.
 NonInvertibleConversion           = La conversion n\u2019est pas inversible.
-NonInvertibleMatrix_2             = Matrice {0}\u00d7{1} non inversible.
-NonInvertibleOperation_1          = Ne peut pas inverser l\u2019op\u00e9ration \u00ab\u202f{0}\u202f\u00bb.
-NonInvertibleTransform            = La transformation n\u2019est pas inversible.
 NonAngularUnit_1                  = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une unit\u00e9 d\u2019angles.
 NonLinearUnit_1                   = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une unit\u00e9 de longueurs.
-NonLinearUnitConversion_2         = La conversion des unit\u00e9s \u00ab\u202f{0}\u202f\u00bb vers \u00ab\u202f{1}\u202f\u00bb n\u2019est pas lin\u00e9aire.
-NonMonotonicSequence_1            = La s\u00e9quence \u00ab\u202f{0}\u202f\u00bb n\u2019est pas monotone.
-NonPerpendicularDirections_2      = Les directions {0} et {1} ne sont pas perpendiculaires.
 NonScaleUnit_1                    = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une unit\u00e9 d\u2019\u00e9chelles.
 NonTemporalUnit_1                 = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une unit\u00e9 de temps.
-NonUniformScale                   = L\u2019\u00e9chelle n\u2019est pas uniforme.
 NotABackwardReference_1           = Il n\u2019y a pas d\u2019\u00e9l\u00e9ment pour l\u2019identifiant \u201c{0}\u201d, ou l\u2019identifiant est une r\u00e9f\u00e9rence vers l\u2019avant.
-NotAnAffineTransform              = La transformation n\u2019est pas affine.
 NotAKeyValuePair_1                = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une paire cl\u00e9-valeur.
 NotANumber_1                      = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre NaN (Not-a-Number).
 NotAPrimitiveWrapper_1            = La classe \u2018{0}\u2019 n\u2019est pas un adaptateur d\u2019un type primitif.
-NotASingleton_1                   = La collection de \u00ab\u202f{0}\u202f\u00bb n\u2019est pas un singleton.
-NotASkewSymmetricMatrix           = La matrice n\u2019est pas antisym\u00e9trique.
 NotAUnicodeIdentifier_1           = Le texte \u00ab\u202f{0}\u202f\u00bb n\u2019est pas un identifiant Unicode.
-NotComparableClass_1              = La classe \u2018{0}\u2019 n\u2019est pas comparable.
-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.
 NoSuchValue_1                     = Aucune valeur n\u2019est associ\u00e9e \u00e0 \u00ab\u202f{0}\u202f\u00bb.
-NoUnit                            = Aucune unit\u00e9 de mesure n\u2019a \u00e9t\u00e9 sp\u00e9cifi\u00e9e.
 NullArgument_1                    = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre nul.
 NullCollectionElement_1           = La collection \u2018{0}\u2019 n\u2019accepte pas les valeurs nulles.
 NullMapKey                        = La cl\u00e9 nulle n\u2019est pas autoris\u00e9e dans ce dictionnaire.
@@ -197,16 +136,11 @@ NullMapValue                      = Les
 NullValueInTable_3                = Dans la table \u00ab\u202f{0}\u202f\u00bb, la colonne \u00ab\u202f{1}\u202f\u00bb de l\u2019enregistrement \u00ab\u202f{2}\u202f\u00bb ne devrait pas contenir de valeur nulle.
 OddArrayLength_1                  = La longueur du tableau est {0}, alors qu\u2019on attendait une longueur paire.
 OutsideDomainOfValidity           = La coordonn\u00e9e est en dehors du domaine de validit\u00e9.
-PropertyAlreadyExists_2           = La propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb existe d\u00e9j\u00e0 dans \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.
 PropertyNotFound_2                = Aucune propri\u00e9t\u00e9 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb n\u2019a \u00e9t\u00e9 trouv\u00e9e dans \u00ab\u202f{0}\u202f\u00bb.
 RecordAlreadyDefined_2            = L\u2019enregistrement \u00ab\u202f{1}\u202f\u00bb est d\u00e9j\u00e0 d\u00e9finit dans le sch\u00e9ma \u00ab\u202f{0}\u202f\u00bb.
 RecursiveCreateCallForKey_1       = Appel r\u00e9cursif lors de la cr\u00e9ation d\u2019un objet pour la cl\u00e9 \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.
 RequireDecimalSeparator           = Un s\u00e9parateur d\u00e9cimal est requis.
-SingularMatrix                    = La matrice est singuli\u00e8re.
 StalledThread_1                   = La t\u00e2che \u00ab\u202f{0}\u202f\u00bb semble bloqu\u00e9e.
-StreamIsForwardOnly_1             = Ne peut pas reculer dans le flux de donn\u00e9es \u00ab\u202f{0}\u202f\u00bb.
 TableNotFound_1                   = La table \u00ab\u202f{0}\u202f\u00bb n\u2019a pas \u00e9t\u00e9 trouv\u00e9e.
 TooFewArguments_2                 = Au moins {0} argument{0,choice,1# \u00e9tait attendu|2#s \u00e9taient attendus}, mais seulement {1} {1,choice,1#a \u00e9t\u00e9 sp\u00e9cifi\u00e9|2#ont \u00e9t\u00e9 sp\u00e9cifi\u00e9s}.
 TooFewOccurrences_2               = Trop peu d\u2019occurrences de \u00ab\u202f{1}\u202f\u00bb. Il en faut au moins {0}.
@@ -218,44 +152,33 @@ UnexpectedArrayLength_2           = Un t
 UnexpectedChange_1                = Changement inattendu dans \u2018{0}\u2019.
 UnexpectedCharactersAfter_2       = Les caract\u00e8res \u00ab\u202f{1}\u202f\u00bb apr\u00e8s \u00ab\u202f{0}\u202f\u00bb sont inattendus.
 UnexpectedCharactersAtBound_4     = Le texte pour \u2018{0}\u2019 devait {1,choice,0#commencer|1#finir} par \u00ab\u202f{2}\u202f\u00bb, mais on a trouv\u00e9 \u00ab\u202f{3}\u202f\u00bb.
-UnexpectedDimensionForCS_1        = Dimension inattendue pour un syst\u00e8me de coordonn\u00e9es de type \u2018{0}\u2019.
 UnexpectedEndOfFile_1             = Fin de fichier inattendue lors de la lecture de \u00ab\u202f{0}\u202f\u00bb.
 UnexpectedEndOfString_1           = D\u2019autres caract\u00e8res \u00e9taient attendus \u00e0 la fin du texte \u00ab\u202f{0}\u202f\u00bb.
-UnexpectedNumberOfComponents_3    = Il y a {2} composantes dans \u00ab\u202f{0}\u202f\u00bb alors qu\u2019on en attendait {1}.
 UnexpectedFileFormat_2            = Le fichier \u00ab\u202f{1}\u202f\u00bb semble \u00eatre encod\u00e9 dans un autre format que {0}.
 UnexpectedParameter_1             = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb est inattendu.
+UnexpectedProperty_2              = La propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb est inattendue dans \u00ab\u202f{0}\u202f\u00bb.
 UnexpectedScaleFactorForUnit_2    = Le facteur d\u2019\u00e9chelle {1} est inattendu pour l\u2019unit\u00e9 de mesure \u00ab\u202f{0}\u202f\u00bb.
 UnexpectedTypeForReference_3      = L\u2019identifiant \u201c{0}\u201d r\u00e9f\u00e9rence une instance de \u2018{2}\u2019 alors qu\u2019on attendait une instance de \u2018{1}\u2019.
 UnexpectedValueInElement_2        = La valeur \u00ab\u202f{1}\u202f\u00bb dans  l\u2019\u00e9l\u00e9ment \u00ab\u202f{0}\u202f\u00bb est inattendue.
-UnitlessParameter_1               = Le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb n\u2019a 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.
 UnknownCommand_1                  = La commande \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue.
 UnknownEnumValue_2                = \u00ab\u202f{1}\u202f\u00bb n\u2019est pas une valeur connue ou support\u00e9e pour l\u2019\u00e9num\u00e9ration \u2018{0}\u2019.
-UnknownFormatFor_1                = Le format de \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnu.
 UnknownKeyword_1                  = Le mot-cl\u00e9 \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnu.
 UnknownOption_1                   = L\u2019option \u00ab\u202f{0}\u202f\u00bb n\u2019est pas reconnue.
 UnknownType_1                     = Le type \u2018{0}\u2019 n\u2019est pas reconnu dans ce contexte.
-UnknownTypeForProperty_1          = Le type de la propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb est inconnu.
 UnknownUnit_1                     = Les unit\u00e9s \u00ab\u202f{0}\u202f\u00bb ne sont pas reconnues.
-UnmodifiableAffineTransform       = Cette transformation affine n\u2019est pas modifiable.
 UnmodifiableCellValue_2           = La cellule \u00e0 la colonne \u00ab\u202f{1}\u202f\u00bb de la ligne \u00ab\u202f{0}\u202f\u00bb n\u2019est pas modifiable.
-UnmodifiableGeometry              = Cette g\u00e9om\u00e9trie n\u2019est pas modifiable.
 UnmodifiableMetadata              = Cette m\u00e9ta-donn\u00e9e n\u2019est pas modifiable.
 UnmodifiableObject_1              = Cette instance de \u2018{0}\u2019 n\u2019est pas modifiable.
 UnspecifiedCRS                    = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es n\u2019a pas \u00e9t\u00e9 sp\u00e9cifi\u00e9.
-UnspecifiedDimensions             = Les dimensions n\u2019ont pas \u00e9t\u00e9 sp\u00e9cifi\u00e9es.
 UnspecifiedFormatForClass_1       = Aucun format n\u2019est sp\u00e9cifi\u00e9 pour les objets de classe \u2018{0}\u2019.
-UnspecifiedParameterValues        = Les valeurs des param\u00e8tres n\u2019ont pas \u00e9t\u00e9 sp\u00e9cifi\u00e9es.
 UnparsableStringForClass_2        = Le texte \u00ab\u202f{1}\u202f\u00bb n\u2019est pas reconnu comme un objet de type \u2018{0}\u2019.
 UnparsableStringForClass_3        = Le texte \u00ab\u202f{1}\u202f\u00bb n\u2019est pas reconnu comme un objet de type \u2018{0}\u2019, \u00e0 cause des caract\u00e8res \u00ab\u202f{2}\u202f\u00bb.
 UnparsableStringInElement_2       = Le texte \u00ab\u202f{1}\u202f\u00bb dans l\u2019\u00e9l\u00e9ment \u00ab\u202f{0}\u202f\u00bb ne peut pas \u00eatre lu.
-UnresolvedFeatureName_1           = L\u2019entit\u00e9 nomm\u00e9e \u00ab\u202f{0}\u202f\u00bb n\u2019a pas encore \u00e9t\u00e9 r\u00e9solue.
+UnsupportedFormatVersion_2        = La version {1} du format {0} n\u2019est pas support\u00e9e.
 UnsupportedImplementation_1       = Cette instance de \u2018{0}\u2019 ne peut pas \u00eatre g\u00e9r\u00e9e parce que les impl\u00e9mentations arbitraires ne sont pas encore support\u00e9es.
 UnsupportedInterpolation_1        = L\u2019interpolation \u201c{0}\u201d n\u2019est pas support\u00e9e.
 UnsupportedOperation_1            = L\u2019op\u00e9ration \u2018{0}\u2019 n\u2019est pas support\u00e9e.
 UnsupportedType_1                 = Le type \u2018{0}\u2019 n\u2019est pas support\u00e9.
-UnsupportedVersion_1              = La version {0} n\u2019est pas support\u00e9e.
 ValueAlreadyDefined_1             = Une valeur est d\u00e9j\u00e0 d\u00e9finie pour \u00ab\u202f{0}\u202f\u00bb.
 ValueNotGreaterThanZero_2         = La valeur \u2018{0}\u2019 = {1} n\u2019est pas valide. On attendait un nombre positif non-nul.
 ValueOutOfRange_4                 = La valeur \u2018{0}\u2019 = {3} est invalide. Une valeur dans la plage [{1} \u2026 {2}] \u00e9tait attendue.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/IndexedResourceBundle.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -72,7 +72,7 @@ import org.apache.sis.internal.util.Patc
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
- * @version 0.7
+ * @version 0.8
  * @module
  */
 public class IndexedResourceBundle extends ResourceBundle implements Localized {
@@ -127,8 +127,8 @@ public class IndexedResourceBundle exten
     /**
      * Constructs a new resource bundle loading data from the given UTF file.
      *
-     * @param resources The path of the binary file containing resources, or {@code null} if
-     *        there is no resources. The resources may be a file or an entry in a JAR file.
+     * @param  resources  the path of the binary file containing resources, or {@code null} if
+     *         there is no resources. The resources may be a file or an entry in a JAR file.
      */
     protected IndexedResourceBundle(final URL resources) {
         this.resources = resources;
@@ -137,10 +137,10 @@ public class IndexedResourceBundle exten
     /**
      * Returns a resource bundle of the specified class.
      *
-     * @param  <T>     The resource bundle class.
-     * @param  base    The resource bundle class.
-     * @param  locale  The locale, or {@code null} for the default locale.
-     * @return Resources in the given locale.
+     * @param  <T>      the resource bundle class.
+     * @param  base     the resource bundle class.
+     * @param  locale   the locale, or {@code null} for the default locale.
+     * @return resources in the given locale.
      * @throws MissingResourceException if resources can't be found.
      *
      * @see Vocabulary#getResources(Locale)
@@ -158,13 +158,11 @@ public class IndexedResourceBundle exten
 
     /**
      * Returns a handler for the constants declared in the inner {@code Keys} class.
-     * Subclasses defined in the {@code org.apache.sis.util.resources} package
-     * override this method for efficiency. However the default implementation
-     * should work for other cases (we don't want to expose too much internal API).
+     * Subclasses should override this method for efficiency, but this is not mandatory.
      *
-     * @return A handler for the constants declared in the inner {@code Keys} class.
+     * @return a handler for the constants declared in the inner {@code Keys} class.
      */
-    KeyConstants getKeyConstants() {
+    protected KeyConstants getKeyConstants() {
         Class<?> keysClass = KeyConstants.class;
         for (final Class<?> inner : getClass().getClasses()) {
             if ("Keys".equals(inner.getSimpleName())) {
@@ -178,7 +176,7 @@ public class IndexedResourceBundle exten
     /**
      * Returns an enumeration of the keys.
      *
-     * @return All keys in this resource bundle.
+     * @return all keys in this resource bundle.
      */
     @Override
     public final Enumeration<String> getKeys() {
@@ -225,7 +223,7 @@ public class IndexedResourceBundle exten
      * Lists resources to the specified stream. If a resource has more than one line, only
      * the first line will be written. This method is used mostly for debugging purposes.
      *
-     * @param  out The destination stream.
+     * @param  out  the destination stream.
      * @throws IOException if an output operation failed.
      */
     @Debug
@@ -261,9 +259,9 @@ public class IndexedResourceBundle exten
     /**
      * Ensures that resource values are loaded. If they are not, loads them immediately.
      *
-     * @param  key Key for the requested resource, or {@code null} if all resources
+     * @param  key  key for the requested resource, or {@code null} if all resources
      *         are requested. This key is used mostly for constructing messages.
-     * @return The resources.
+     * @return the resources.
      * @throws MissingResourceException if this method failed to load resources.
      */
     private String[] ensureLoaded(final String key) throws MissingResourceException {
@@ -342,7 +340,7 @@ public class IndexedResourceBundle exten
      * Returns null if this resource bundle does not contain an
      * object for the given key.
      *
-     * @param  key the key for the desired object
+     * @param  key  the key for the desired object
      * @throws NullPointerException if {@code key} is {@code null}
      * @return the object for the given key, or null
      */
@@ -384,7 +382,7 @@ public class IndexedResourceBundle exten
      * <div class="note"><b>Note:</b>
      * If more cases are added, remember to update class and package javadoc.</div>
      *
-     * @param  arguments The object to check.
+     * @param  arguments  the object to check.
      * @return {@code arguments} as an array, eventually with some elements replaced.
      */
     private Object[] toArray(final Object arguments) {
@@ -449,9 +447,9 @@ public class IndexedResourceBundle exten
      * Gets a string for the given key and appends "…" to it.
      * This method is typically used for creating menu items.
      *
-     * @param  key The key for the desired string.
-     * @return The string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key  the key for the desired string.
+     * @return the string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public final String getMenuLabel(final short key) throws MissingResourceException {
         return getString(key) + '…';
@@ -463,8 +461,8 @@ public class IndexedResourceBundle exten
      * No space is added after the string; it is up to the caller to add such space if needed.
      *
      * @param  key The key for the desired string.
-     * @return The string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @return the string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public final String getLabel(final short key) throws MissingResourceException {
         String label = getString(key);
@@ -479,9 +477,9 @@ public class IndexedResourceBundle exten
     /**
      * Gets a string for the given key from this resource bundle or one of its parents.
      *
-     * @param  key The key for the desired string.
-     * @return The string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key  the key for the desired string.
+     * @return the string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public final String getString(final short key) throws MissingResourceException {
         return getString(String.valueOf(key));
@@ -502,10 +500,10 @@ public class IndexedResourceBundle exten
      * {@link MessageFormat}, all occurrences of "{0}", "{1}", "{2}" in the resource string will be
      * replaced by {@code arg0[0]}, {@code arg0[1]}, {@code arg0[2]}, etc.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 A single object or an array of objects to be formatted and substituted.
-     * @return The string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  a single object or an array of objects to be formatted and substituted.
+     * @return the string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      *
      * @see #getString(String)
      * @see #getString(short,Object,Object)
@@ -546,11 +544,11 @@ public class IndexedResourceBundle exten
      * Gets a string for the given key and replaces all occurrences of "{0}",
      * "{1}", with values of {@code arg0}, {@code arg1}, etc.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute for "{0}".
-     * @param  arg1 Value to substitute for "{1}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute for "{0}".
+     * @param  arg1  value to substitute for "{1}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public final String getString(final short  key,
                                   final Object arg0,
@@ -563,12 +561,12 @@ public class IndexedResourceBundle exten
      * Gets a string for the given key and replaces all occurrences of "{0}",
      * "{1}", with values of {@code arg0}, {@code arg1}, etc.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute for "{0}".
-     * @param  arg1 Value to substitute for "{1}".
-     * @param  arg2 Value to substitute for "{2}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute for "{0}".
+     * @param  arg1  value to substitute for "{1}".
+     * @param  arg2  value to substitute for "{2}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public final String getString(final short  key,
                                   final Object arg0,
@@ -582,13 +580,13 @@ public class IndexedResourceBundle exten
      * Gets a string for the given key and replaces all occurrences of "{0}",
      * "{1}", with values of {@code arg0}, {@code arg1}, etc.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute for "{0}".
-     * @param  arg1 Value to substitute for "{1}".
-     * @param  arg2 Value to substitute for "{2}".
-     * @param  arg3 Value to substitute for "{3}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute for "{0}".
+     * @param  arg1  value to substitute for "{1}".
+     * @param  arg2  value to substitute for "{2}".
+     * @param  arg3  value to substitute for "{3}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public final String getString(final short  key,
                                   final Object arg0,
@@ -603,14 +601,14 @@ public class IndexedResourceBundle exten
      * Gets a string for the given key and replaces all occurrences of "{0}",
      * "{1}", with values of {@code arg0}, {@code arg1}, etc.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute for "{0}".
-     * @param  arg1 Value to substitute for "{1}".
-     * @param  arg2 Value to substitute for "{2}".
-     * @param  arg3 Value to substitute for "{3}".
-     * @param  arg4 Value to substitute for "{4}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute for "{0}".
+     * @param  arg1  value to substitute for "{1}".
+     * @param  arg2  value to substitute for "{2}".
+     * @param  arg3  value to substitute for "{3}".
+     * @param  arg4  value to substitute for "{4}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public final String getString(final short  key,
                                   final Object arg0,
@@ -625,9 +623,9 @@ public class IndexedResourceBundle exten
     /**
      * Gets a localized log record.
      *
-     * @param  level The log record level.
-     * @param  key   The resource key.
-     * @return The log record.
+     * @param  level  the log record level.
+     * @param  key    the resource key.
+     * @return the log record.
      */
     public final LogRecord getLogRecord(final Level level, final short key) {
         final LogRecord record = new LogRecord(level, getKeyConstants().getKeyName(key));
@@ -639,10 +637,10 @@ public class IndexedResourceBundle exten
     /**
      * Gets a localized log record.
      *
-     * @param  level The log record level.
-     * @param  key   The resource key.
-     * @param  arg0  The parameter for the log message, which may be an array.
-     * @return The log record.
+     * @param  level  the log record level.
+     * @param  key    the resource key.
+     * @param  arg0   the parameter for the log message, which may be an array.
+     * @return the log record.
      */
     public final LogRecord getLogRecord(final Level level, final short key,
                                         final Object arg0)
@@ -655,11 +653,11 @@ public class IndexedResourceBundle exten
     /**
      * Gets a localized log record.
      *
-     * @param  level The log record level.
-     * @param  key   The resource key.
-     * @param  arg0  The first parameter.
-     * @param  arg1  The second parameter.
-     * @return The log record.
+     * @param  level  the log record level.
+     * @param  key    the resource key.
+     * @param  arg0   the first parameter.
+     * @param  arg1   the second parameter.
+     * @return the log record.
      */
     public final LogRecord getLogRecord(final Level level, final short key,
                                         final Object arg0,
@@ -671,12 +669,12 @@ public class IndexedResourceBundle exten
     /**
      * Gets a localized log record.
      *
-     * @param  level The log record level.
-     * @param  key   The resource key.
-     * @param  arg0  The first parameter.
-     * @param  arg1  The second parameter.
-     * @param  arg2  The third parameter.
-     * @return The log record.
+     * @param  level  the log record level.
+     * @param  key    the resource key.
+     * @param  arg0   the first parameter.
+     * @param  arg1   the second parameter.
+     * @param  arg2   the third parameter.
+     * @return the log record.
      */
     public final LogRecord getLogRecord(final Level level, final short key,
                                         final Object arg0,
@@ -689,13 +687,13 @@ public class IndexedResourceBundle exten
     /**
      * Gets a localized log record.
      *
-     * @param  level The log record level.
-     * @param  key   The resource key.
-     * @param  arg0  The first parameter.
-     * @param  arg1  The second parameter.
-     * @param  arg2  The third parameter.
-     * @param  arg3  The fourth parameter.
-     * @return The log record.
+     * @param  level  the log record level.
+     * @param  key    the resource key.
+     * @param  arg0   the first parameter.
+     * @param  arg1   the second parameter.
+     * @param  arg2   the third parameter.
+     * @param  arg3   the fourth parameter.
+     * @return the log record.
      */
     public final LogRecord getLogRecord(final Level level, final short key,
                                         final Object arg0,
@@ -710,12 +708,12 @@ public class IndexedResourceBundle exten
      * Returns the locale specified in the given map, or {@code null} if none.
      * Value of unexpected type are ignored.
      *
-     * @param  properties The map of properties, or {@code null} if none.
-     * @return The locale found in the given map, or {@code null} if none.
+     * @param  properties  the map of properties, or {@code null} if none.
+     * @return the locale found in the given map, or {@code null} if none.
      *
-     * @since 0.4
+     * @since 0.8
      */
-    static Locale getLocale(final Map<?,?> properties) {
+    protected static Locale getLocale(final Map<?,?> properties) {
         if (properties != null) {
             final Object candidate = properties.get(LOCALE_KEY);
             if (candidate instanceof Locale) {
@@ -729,7 +727,7 @@ public class IndexedResourceBundle exten
      * Returns a string representation of this object.
      * This method is for debugging purposes only.
      *
-     * @return A string representation of this resources bundle.
+     * @return a string representation of this resources bundle.
      */
     @Debug
     @Override

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/KeyConstants.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -29,11 +29,13 @@ import org.apache.sis.util.CharSequences
  * from its name and conversely.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
- * @version 0.4
+ * @since   0.8
+ * @version 0.8
  * @module
+ *
+ * @see IndexedResourceBundle#getKeyConstants()
  */
-class KeyConstants {
+public class KeyConstants {
     /**
      * The class that defines key constants.
      */
@@ -68,6 +70,7 @@ class KeyConstants {
      * The keys names are used only in rare situation, like {@link IndexedResourceBundle#list(Appendable)}
      * or in log records.
      */
+    @SuppressWarnings("ReturnOfCollectionOrArrayField")
     final synchronized String[] getKeyNames() {
         if (keys == null) {
             String[] names;

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -28,7 +28,7 @@ import org.opengis.util.InternationalStr
  *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3
- * @version 0.4
+ * @version 0.8
  * @module
  */
 public final class Messages extends IndexedResourceBundle {
@@ -61,235 +61,159 @@ public final class Messages extends Inde
         public static final short AlreadyRegistered_2 = 0;
 
         /**
-         * Ambiguity between inverse flattening and semi minor axis length for “{0}”. Using inverse
-         * flattening.
-         */
-        public static final short AmbiguousEllipsoid_1 = 30;
-
-        /**
          * Can not create the {0} schema in database.
          */
-        public static final short CanNotCreateSchema_1 = 41;
+        public static final short CanNotCreateSchema_1 = 1;
 
         /**
          * Can not instantiate the object of type ‘{0}’ identified by “{1}”. Reason is:{2}
          */
-        public static final short CanNotInstantiateForIdentifier_3 = 35;
+        public static final short CanNotInstantiateForIdentifier_3 = 2;
 
         /**
          * Changed the container capacity from {0} to {1} elements.
          */
-        public static final short ChangedContainerCapacity_2 = 1;
+        public static final short ChangedContainerCapacity_2 = 3;
 
         /**
          * Configuration of “{0}” received on {1} in {2} seconds.
          */
-        public static final short ConfigurationOf_3 = 31;
-
-        /**
-         * This result indicates if a datum shift method has been applied.
-         */
-        public static final short ConformanceMeansDatumShift = 8;
-
-        /**
-         * This parameter is shown for completeness, but should never have a value different than {0}
-         * for this projection.
-         */
-        public static final short ConstantProjParameterValue_1 = 11;
+        public static final short ConfigurationOf_3 = 4;
 
         /**
          * Created an instance of ‘{0}’ from the “{1}” identifier in {2} seconds.
          */
-        public static final short CreateDurationFromIdentifier_3 = 33;
+        public static final short CreateDurationFromIdentifier_3 = 5;
 
         /**
          * Created an instance of ‘{0}’ in {1} seconds.
          */
-        public static final short CreateDuration_2 = 34;
+        public static final short CreateDuration_2 = 6;
 
         /**
          * Created an instance of ‘{0}’ named “{1}” with the “{2}” identifier.
          */
-        public static final short CreatedIdentifiedObject_3 = 17;
+        public static final short CreatedIdentifiedObject_3 = 7;
 
         /**
          * Created an instance of ‘{0}’ named “{1}”.
          */
-        public static final short CreatedNamedObject_2 = 16;
+        public static final short CreatedNamedObject_2 = 8;
 
         /**
          * Creating {0} schema in the “{1}” database.
          */
-        public static final short CreatingSchema_2 = 39;
-
-        /**
-         * {0} dataset version {1} on “{2}” version {3}.
-         */
-        public static final short DataBase_4 = 28;
+        public static final short CreatingSchema_2 = 9;
 
         /**
          * The {0} environment variable is defined, but the given “{1}” value is not an existing
          * directory.
          */
-        public static final short DataDirectoryDoesNotExist_2 = 20;
+        public static final short DataDirectoryDoesNotExist_2 = 10;
 
         /**
          * Apache SIS is not authorized to access the “{1}” sub-directory in the directory given by the
          * {0} environment variable.
          */
-        public static final short DataDirectoryNotAccessible_2 = 26;
+        public static final short DataDirectoryNotAccessible_2 = 11;
 
         /**
          * Apache SIS is not authorized to read information given by the “{0}” environment variable.
          */
-        public static final short DataDirectoryNotAuthorized_1 = 25;
+        public static final short DataDirectoryNotAuthorized_1 = 12;
 
         /**
          * The “{1}” directory specified by the {0} environment variable exists but is not readable.
          */
-        public static final short DataDirectoryNotReadable_2 = 21;
+        public static final short DataDirectoryNotReadable_2 = 13;
 
         /**
          * The “{0}” environment variable is not set.
          */
-        public static final short DataDirectoryNotSpecified_1 = 22;
+        public static final short DataDirectoryNotSpecified_1 = 14;
 
         /**
          * Apache SIS can not write in the “{1}” directory given by the {0} environment variable.
          */
-        public static final short DataDirectoryNotWritable_2 = 23;
+        public static final short DataDirectoryNotWritable_2 = 15;
 
         /**
          * Environment variable {0} specifies the “{1}” data directory.
          */
-        public static final short DataDirectory_2 = 24;
-
-        /**
-         * Code “{0}” is deprecated and replaced by code {1}. Reason is: {2}
-         */
-        public static final short DeprecatedCode_3 = 29;
+        public static final short DataDirectory_2 = 16;
 
         /**
          * Property “{0}” has been discarded in favor of “{1}”, because those two properties are
          * mutually exclusive.
          */
-        public static final short DiscardedExclusiveProperty_2 = 2;
-
-        /**
-         * There is no factory for version {1} of “{0}” authority. Fallback on default version for
-         * objects creation.
-         */
-        public static final short FallbackDefaultFactoryVersion_2 = 38;
+        public static final short DiscardedExclusiveProperty_2 = 17;
 
         /**
          * Ignored properties after the first occurrence of ‘{0}’.
          */
-        public static final short IgnoredPropertiesAfterFirst_1 = 6;
+        public static final short IgnoredPropertiesAfterFirst_1 = 18;
 
         /**
          * Ignored property associated to ‘{0}’.
          */
-        public static final short IgnoredPropertyAssociatedTo_1 = 7;
-
-        /**
-         * More than one service provider of type ‘{0}’ are declared for “{1}”. Only the first provider
-         * (an instance of ‘{2}’) will be used.
-         */
-        public static final short IgnoredServiceProvider_3 = 36;
+        public static final short IgnoredPropertyAssociatedTo_1 = 19;
 
         /**
          * Parsing of “{0}” done, but some elements were ignored.
          */
-        public static final short IncompleteParsing_1 = 14;
+        public static final short IncompleteParsing_1 = 20;
 
         /**
          * Inserted {0} records in {1} seconds.
          */
-        public static final short InsertDuration_2 = 40;
-
-        /**
-         * Inverse operation uses this parameter value with opposite sign.
-         */
-        public static final short InverseOperationUsesOppositeSign = 42;
-
-        /**
-         * Inverse operation uses the same parameter value.
-         */
-        public static final short InverseOperationUsesSameSign = 43;
+        public static final short InsertDuration_2 = 21;
 
         /**
          * No object associated to the “{0}” JNDI name.
          */
-        public static final short JNDINotSpecified_1 = 32;
-
-        /**
-         * Loading datum shift file “{0}”.
-         */
-        public static final short LoadingDatumShiftFile_1 = 27;
+        public static final short JNDINotSpecified_1 = 22;
 
         /**
          * Text were discarded for some locales.
          */
-        public static final short LocalesDiscarded = 3;
-
-        /**
-         * The “{1}” parameter could have been omitted. But it has been given a value of {2} which does
-         * not match the definition of the “{0}” ellipsoid.
-         */
-        public static final short MismatchedEllipsoidAxisLength_3 = 9;
-
-        /**
-         * No coordinate operation from “{0}” to “{1}” because of mismatched factories.
-         */
-        public static final short MismatchedOperationFactories_2 = 37;
-
-        /**
-         * Despite its name, this parameter is effectively “{0}”.
-         */
-        public static final short MisnamedParameter_1 = 18;
+        public static final short LocalesDiscarded = 23;
 
         /**
          * This “{0}” formatting is a departure from standard format.
          */
-        public static final short NonConformFormatting_1 = 15;
-
-        /**
-         * This parameter borrowed from the “{0}” projection is not formally a parameter of this
-         * projection.
-         */
-        public static final short NotFormalProjectionParameter_1 = 10;
+        public static final short NonConformFormatting_1 = 24;
 
         /**
          * Optional module “{0}” requested but not found.
          */
-        public static final short OptionalModuleNotFound_1 = 12;
+        public static final short OptionalModuleNotFound_1 = 25;
 
         /**
          * Property “{0}” is hidden by “{1}”.
          */
-        public static final short PropertyHiddenBy_2 = 4;
+        public static final short PropertyHiddenBy_2 = 26;
 
         /**
          * The text contains unknown elements:
          */
-        public static final short UnknownElementsInText = 13;
+        public static final short UnknownElementsInText = 27;
 
         /**
          * Loading of “{0}” done, but some records were ignored because of unrecognized keywords: {1}
          */
-        public static final short UnknownKeywordInRecord_2 = 19;
+        public static final short UnknownKeywordInRecord_2 = 28;
 
         /**
          * Can not parse “{1}” as an instance of ‘{0}’. The value is stored as plain text instead, but
          * will be ignored by some processing.
          */
-        public static final short UnparsableValueStoredAsText_2 = 5;
+        public static final short UnparsableValueStoredAsText_2 = 29;
     }
 
     /**
      * Constructs a new resource bundle loading data from the given UTF file.
      *
-     * @param resources The path of the binary file containing resources, or {@code null} if
+     * @param resources  the path of the binary file containing resources, or {@code null} if
      *        there is no resources. The resources may be a file or an entry in a JAR file.
      */
     Messages(final URL resources) {
@@ -298,17 +222,19 @@ public final class Messages extends Inde
 
     /**
      * Returns the handle for the {@code Keys} constants.
+     *
+     * @return a handler for the constants declared in the inner {@code Keys} class.
      */
     @Override
-    final KeyConstants getKeyConstants() {
+    protected KeyConstants getKeyConstants() {
         return Keys.INSTANCE;
     }
 
     /**
      * Returns resources in the given locale.
      *
-     * @param  locale The locale, or {@code null} for the default locale.
-     * @return Resources in the given locale.
+     * @param  locale  the locale, or {@code null} for the default locale.
+     * @return resources in the given locale.
      * @throws MissingResourceException if resources can't be found.
      */
     public static Messages getResources(final Locale locale) throws MissingResourceException {
@@ -318,9 +244,9 @@ public final class Messages extends Inde
     /**
      * Gets a string for the given key from this resource bundle or one of its parents.
      *
-     * @param  key The key for the desired string.
-     * @return The string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key  the key for the desired string.
+     * @return the string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public static String format(final short key) throws MissingResourceException {
         return getResources(null).getString(key);
@@ -330,10 +256,10 @@ public final class Messages extends Inde
      * Gets a string for the given key are replace all occurrence of "{0}"
      * with values of {@code arg0}.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute to "{0}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute to "{0}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public static String format(final short  key,
                                 final Object arg0) throws MissingResourceException
@@ -345,11 +271,11 @@ public final class Messages extends Inde
      * Gets a string for the given key are replace all occurrence of "{0}",
      * "{1}", with values of {@code arg0}, {@code arg1}.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute to "{0}".
-     * @param  arg1 Value to substitute to "{1}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute to "{0}".
+     * @param  arg1  value to substitute to "{1}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public static String format(final short  key,
                                 final Object arg0,
@@ -362,12 +288,12 @@ public final class Messages extends Inde
      * Gets a string for the given key are replace all occurrence of "{0}",
      * "{1}", with values of {@code arg0}, {@code arg1}, etc.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute to "{0}".
-     * @param  arg1 Value to substitute to "{1}".
-     * @param  arg2 Value to substitute to "{2}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute to "{0}".
+     * @param  arg1  value to substitute to "{1}".
+     * @param  arg2  value to substitute to "{2}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public static String format(final short  key,
                                 final Object arg0,
@@ -381,13 +307,13 @@ public final class Messages extends Inde
      * Gets a string for the given key are replace all occurrence of "{0}",
      * "{1}", with values of {@code arg0}, {@code arg1}, etc.
      *
-     * @param  key The key for the desired string.
-     * @param  arg0 Value to substitute to "{0}".
-     * @param  arg1 Value to substitute to "{1}".
-     * @param  arg2 Value to substitute to "{2}".
-     * @param  arg3 Value to substitute to "{3}".
-     * @return The formatted string for the given key.
-     * @throws MissingResourceException If no object for the given key can be found.
+     * @param  key   the key for the desired string.
+     * @param  arg0  value to substitute to "{0}".
+     * @param  arg1  value to substitute to "{1}".
+     * @param  arg2  value to substitute to "{2}".
+     * @param  arg3  value to substitute to "{3}".
+     * @return the formatted string for the given key.
+     * @throws MissingResourceException if no object for the given key can be found.
      */
     public static String format(final short  key,
                                 final Object arg0,
@@ -404,10 +330,10 @@ public final class Messages extends Inde
     private static final class International extends ResourceInternationalString {
         private static final long serialVersionUID = 4553487496835099424L;
 
-        International(short key)                 {super(key);}
-        International(short key, Object args)    {super(key, args);}
-        @Override KeyConstants getKeyConstants() {return Keys.INSTANCE;}
-        @Override IndexedResourceBundle getBundle(final Locale locale) {
+        International(short key)                           {super(key);}
+        International(short key, Object args)              {super(key, args);}
+        @Override protected KeyConstants getKeyConstants() {return Keys.INSTANCE;}
+        @Override protected IndexedResourceBundle getBundle(final Locale locale) {
             return getResources(locale);
         }
     }
@@ -417,8 +343,8 @@ public final class Messages extends Inde
      * validity. If the key is invalid, then a {@link MissingResourceException} may be thrown
      * when a {@link InternationalString#toString(Locale)} method is invoked.
      *
-     * @param  key The key for the desired string.
-     * @return An international string for the given key.
+     * @param  key  the key for the desired string.
+     * @return an international string for the given key.
      */
     public static InternationalString formatInternational(final short key) {
         return new International(key);
@@ -434,9 +360,9 @@ public final class Messages extends Inde
      * of a temporary array. There is no risk of confusion since the two methods delegate their
      * work to the same {@code format} method anyway.</div>
      *
-     * @param  key The key for the desired string.
-     * @param  arg Values to substitute to "{0}".
-     * @return An international string for the given key.
+     * @param  key  the key for the desired string.
+     * @param  arg  values to substitute to "{0}".
+     * @return an international string for the given key.
      */
     public static InternationalString formatInternational(final short key, final Object arg) {
         return new International(key, arg);
@@ -447,9 +373,9 @@ public final class Messages extends Inde
      * validity. If the key is invalid, then a {@link MissingResourceException} may be thrown
      * when a {@link InternationalString#toString(Locale)} method is invoked.
      *
-     * @param  key  The key for the desired string.
-     * @param  args Values to substitute to "{0}", "{1}", <i>etc</i>.
-     * @return An international string for the given key.
+     * @param  key   the key for the desired string.
+     * @param  args  values to substitute to "{0}", "{1}", <i>etc</i>.
+     * @return an international string for the given key.
      */
     public static InternationalString formatInternational(final short key, final Object... args) {
         return new International(key, args);

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages.properties [ISO-8859-1] Fri Oct  7 21:35:43 2016
@@ -15,20 +15,16 @@
 # limitations under the License.
 #
 AlreadyRegistered_2              = {0} \u201c{1}\u201d is already registered. The second instance will be ignored.
-AmbiguousEllipsoid_1             = Ambiguity between inverse flattening and semi minor axis length for \u201c{0}\u201d. Using inverse flattening.
 CanNotCreateSchema_1             = Can not create the {0} schema in database.
 # In following message, the first characters of parameter {2} should be a line separator ("\r", "\n" or "\r\n").
 CanNotInstantiateForIdentifier_3 = Can not instantiate the object of type \u2018{0}\u2019 identified by \u201c{1}\u201d. Reason is:{2}
 ChangedContainerCapacity_2       = Changed the container capacity from {0} to {1} elements.
 ConfigurationOf_3                = Configuration of \u201c{0}\u201d received on {1} in {2} seconds.
-ConformanceMeansDatumShift       = This result indicates if a datum shift method has been applied.
-ConstantProjParameterValue_1     = This parameter is shown for completeness, but should never have a value different than {0} for this projection.
 CreatedNamedObject_2             = Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d.
 CreatedIdentifiedObject_3        = Created an instance of \u2018{0}\u2019 named \u201c{1}\u201d with the \u201c{2}\u201d identifier.
 CreateDuration_2                 = Created an instance of \u2018{0}\u2019 in {1} seconds.
 CreateDurationFromIdentifier_3   = Created an instance of \u2018{0}\u2019 from the \u201c{1}\u201d identifier in {2} seconds.
 CreatingSchema_2                 = Creating {0} schema in the \u201c{1}\u201d database.
-DataBase_4                       = {0} dataset version {1} on \u201c{2}\u201d version {3}.
 DataDirectory_2                  = Environment variable {0} specifies the \u201c{1}\u201d data directory.
 DataDirectoryDoesNotExist_2      = The {0} environment variable is defined, but the given \u201c{1}\u201d value is not an existing directory.
 DataDirectoryNotAccessible_2     = Apache SIS is not authorized to access the \u201c{1}\u201d sub-directory in the directory given by the {0} environment variable.
@@ -36,26 +32,16 @@ DataDirectoryNotAuthorized_1     = Apach
 DataDirectoryNotReadable_2       = The \u201c{1}\u201d directory specified by the {0} environment variable exists but is not readable.
 DataDirectoryNotSpecified_1      = The \u201c{0}\u201d environment variable is not set.
 DataDirectoryNotWritable_2       = Apache SIS can not write in the \u201c{1}\u201d directory given by the {0} environment variable.
-DeprecatedCode_3                 = Code \u201c{0}\u201d is deprecated and replaced by code {1}. Reason is: {2}
 DiscardedExclusiveProperty_2     = Property \u201c{0}\u201d has been discarded in favor of \u201c{1}\u201d, because those two properties are mutually exclusive.
-FallbackDefaultFactoryVersion_2  = There is no factory for version {1} of \u201c{0}\u201d authority. Fallback on default version for objects creation.
 IgnoredPropertiesAfterFirst_1    = Ignored properties after the first occurrence of \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1    = Ignored property associated to \u2018{0}\u2019.
-IgnoredServiceProvider_3         = More than one service provider of type \u2018{0}\u2019 are declared for \u201c{1}\u201d. Only the first provider (an instance of \u2018{2}\u2019) will be used.
 IncompleteParsing_1              = Parsing of \u201c{0}\u201d done, but some elements were ignored.
 InsertDuration_2                 = Inserted {0} records in {1} seconds.
-InverseOperationUsesSameSign     = Inverse operation uses the same parameter value.
-InverseOperationUsesOppositeSign = Inverse operation uses this parameter value with opposite sign.
 JNDINotSpecified_1               = No object associated to the \u201c{0}\u201d JNDI name.
-LoadingDatumShiftFile_1          = Loading datum shift file \u201c{0}\u201d.
 LocalesDiscarded                 = Text were discarded for some locales.
 OptionalModuleNotFound_1         = Optional module \u201c{0}\u201d requested but not found.
 PropertyHiddenBy_2               = Property \u201c{0}\u201d is hidden by \u201c{1}\u201d.
-MismatchedOperationFactories_2   = No coordinate operation from \u201c{0}\u201d to \u201c{1}\u201d because of mismatched factories.
-MismatchedEllipsoidAxisLength_3  = The \u201c{1}\u201d parameter could have been omitted. But it has been given a value of {2} which does not match the definition of the \u201c{0}\u201d ellipsoid.
-MisnamedParameter_1              = Despite its name, this parameter is effectively \u201c{0}\u201d.
 NonConformFormatting_1           = This \u201c{0}\u201d formatting is a departure from standard format.
-NotFormalProjectionParameter_1   = This parameter borrowed from the \u201c{0}\u201d projection is not formally a parameter of this projection.
 UnknownElementsInText            = The text contains unknown elements:
 UnknownKeywordInRecord_2         = Loading of \u201c{0}\u201d done, but some records were ignored because of unrecognized keywords: {1}
 UnparsableValueStoredAsText_2    = Can not parse \u201c{1}\u201d as an instance of \u2018{0}\u2019. The value is stored as plain text instead, but will be ignored by some processing.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Messages_fr.properties [ISO-8859-1] Fri Oct  7 21:35:43 2016
@@ -22,20 +22,16 @@
 #   U+00A0 NO-BREAK SPACE         before  :
 #
 AlreadyRegistered_2              = Le {0} \u00ab\u202f{1}\u202f\u00bb est d\u00e9j\u00e0 inscrit dans le registre. La seconde instance sera ignor\u00e9e.
-AmbiguousEllipsoid_1             = Ambigu\u00eft\u00e9 entre l\u2019aplatissement et la longueur du semi-axe mineur pour \u00ab\u202f{0}\u202f\u00bb. Utilise l\u2019aplatissement.
 CanNotCreateSchema_1             = Ne peut pas cr\u00e9er le sch\u00e9ma {0} dans la base de donn\u00e9es.
 # In following message, the first characters of parameter {2} should be a line separator ("\r", "\n" or "\r\n").
 CanNotInstantiateForIdentifier_3 = Ne peut pas cr\u00e9er l\u2019objet de type \u2018{0}\u2019 identifi\u00e9 par \u00ab\u202f{1}\u202f\u00bb. La raison est\u00a0:{2}
 ChangedContainerCapacity_2       = Changement de la capacit\u00e9 du conteneur de {0} vers {1} \u00e9l\u00e9ments.
 ConfigurationOf_3                = Configuration de \u00ab\u202f{0}\u202f\u00bb re\u00e7ue le {1} en {2} secondes.
-ConformanceMeansDatumShift       = Ce r\u00e9sultat indique si un changement de r\u00e9f\u00e9rentiel a \u00e9t\u00e9 appliqu\u00e9.
-ConstantProjParameterValue_1     = Ce param\u00e8tre est montr\u00e9 pour \u00eatre plus complet, mais sa valeur ne devrait jamais \u00eatre diff\u00e9rente de {0} pour cette projection.
 CreatedNamedObject_2             = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb.
 CreatedIdentifiedObject_3        = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 nomm\u00e9e \u00ab\u202f{1}\u202f\u00bb avec l\u2019identifiant \u00ab\u202f{2}\u202f\u00bb.
 CreateDuration_2                 = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 en {1} secondes.
 CreateDurationFromIdentifier_3   = Cr\u00e9ation d\u2019une instance de \u2018{0}\u2019 \u00e0 partir de l\u2019identifiant \u00ab\u202f{1}\u202f\u00bb en {2} secondes.
 CreatingSchema_2                 = Cr\u00e9ation du sch\u00e9ma {0} dans la base de donn\u00e9es \u00ab\u202f{1}\u202f\u00bb.
-DataBase_4                       = Base de donn\u00e9es {0} version {1} sur \u00ab\u202f{2}\u202f\u00bb version {3}.
 DataDirectory_2                  = La variable environnementale {0} sp\u00e9cifie le r\u00e9pertoire de donn\u00e9es \u00ab\u202f{1}\u202f\u00bb.
 DataDirectoryDoesNotExist_2      = La variable environnementale {0} est bien d\u00e9finie, mais sa valeur \u00ab\u202f{1}\u202f\u00bb n\u2019est pas un r\u00e9pertoire existant.
 DataDirectoryNotAccessible_2     = Apache SIS n\u2019a pas l\u2019autorisation d\u2019acc\u00e9der au sous-r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb dans le r\u00e9pertoire donn\u00e9 par la variable environnementale {0}.
@@ -43,26 +39,16 @@ DataDirectoryNotAuthorized_1     = Apach
 DataDirectoryNotReadable_2       = Le r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb sp\u00e9cifi\u00e9 par la variable environnementale {0} existe bien mais ne peut pas \u00eatre lu.
 DataDirectoryNotSpecified_1      = La variable environnementale \u00ab\u202f{0}\u202f\u00bb n\u2019est pas d\u00e9finie.
 DataDirectoryNotWritable_2       = Apache SIS ne peut pas \u00e9crire dans le r\u00e9pertoire \u00ab\u202f{1}\u202f\u00bb sp\u00e9cifi\u00e9e par la variable environnementale {0}.
-DeprecatedCode_3                 = Le code \u00ab\u202f{0}\u202f\u00bb est d\u00e9pr\u00e9ci\u00e9 et remplac\u00e9 par le code {1}. La raison est\u00a0: {2}
 DiscardedExclusiveProperty_2     = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 \u00e9cart\u00e9e en faveur de \u00ab\u202f{1}\u202f\u00bb, parce que ces deux propri\u00e9t\u00e9s sont mutuellement exclusives.
-FallbackDefaultFactoryVersion_2  = Il n\u2019y a pas de fabrique pour la version {1} de l\u2019autorit\u00e9 \u00ab\u202f{0}\u202f\u00bb. Les objets seront cr\u00e9\u00e9s avec la version par d\u00e9faut.
 IgnoredPropertiesAfterFirst_1    = Des propri\u00e9t\u00e9s ont \u00e9t\u00e9 ignor\u00e9es apr\u00e8s la premi\u00e8re occurrence de \u2018{0}\u2019.
 IgnoredPropertyAssociatedTo_1    = Une propri\u00e9t\u00e9 associ\u00e9e \u00e0 \u2018{0}\u2019 a \u00e9t\u00e9 ignor\u00e9e.
-IgnoredServiceProvider_3         = Plusieurs fournisseurs de service de type \u2018{0}\u2019 sont d\u00e9clar\u00e9s pour \u00ab\u202f{1}\u202f\u00bb. Seul le premier fournisseur (une instance de \u2018{2}\u2019) sera utilis\u00e9.
 IncompleteParsing_1              = La lecture de \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 faite, mais en ignorant certains \u00e9l\u00e9ments.
 InsertDuration_2                 = {0} enregistrements ont \u00e9t\u00e9 ajout\u00e9s en {1} secondes.
-InverseOperationUsesSameSign     = L\u2019op\u00e9ration inverse utilise la m\u00eame valeur pour ce param\u00e8tre.
-InverseOperationUsesOppositeSign = L\u2019op\u00e9ration inverse utilise ce param\u00e8tre avec la valeur de signe oppos\u00e9.
 JNDINotSpecified_1               = Aucun objet n\u2019est associ\u00e9 au nom JNDI \u00ab\u202f{0}\u202f\u00bb.
-LoadingDatumShiftFile_1          = Chargement du fichier de changement de r\u00e9f\u00e9rentiel \u00ab\u202f{0}\u202f\u00bb.
 LocalesDiscarded                 = Des textes ont \u00e9t\u00e9 ignor\u00e9s pour certaines langues.
 OptionalModuleNotFound_1         = Le module optionnel \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 demand\u00e9 mais n\u2019a pas \u00e9t\u00e9 trouv\u00e9.
 PropertyHiddenBy_2               = La propri\u00e9t\u00e9 \u00ab\u202f{0}\u202f\u00bb est masqu\u00e9e par \u00ab\u202f{1}\u202f\u00bb.
-MismatchedOperationFactories_2   = Il n\u2019y a pas d\u2019op\u00e9rations allant de \u00ab\u202f{0}\u202f\u00bb vers \u00ab\u202f{1}\u202f\u00bb parce que ces derniers sont associ\u00e9s \u00e0 deux fabriques diff\u00e9rentes.
-MismatchedEllipsoidAxisLength_3  = Le param\u00e8tre \u00ab\u202f{1}\u202f\u00bb aurait pu \u00eatre omis. Mais il lui a \u00e9t\u00e9 donn\u00e9 la valeur {2} qui ne correspond pas \u00e0 la d\u00e9finition de l\u2019ellipso\u00efde \u00ab\u202f{0}\u202f\u00bb.
-MisnamedParameter_1              = Malgr\u00e9 son nom, ce param\u00e8tre produit en r\u00e9alit\u00e9 l\u2019effet d\u2019un \u00ab\u202f{0}\u202f\u00bb.
 NonConformFormatting_1           = Cette \u00e9criture de \u00ab\u202f{0}\u202f\u00bb d\u00e9vie du format standard.
-NotFormalProjectionParameter_1   = Ce param\u00e8tre emprunt\u00e9 \u00e0 la projection \u00ab\u202f{0}\u202f\u00bb n\u2019est pas formellement un param\u00e8tre de cette projection.
 UnknownElementsInText            = Le texte contient des \u00e9l\u00e9ments inconnus\u00a0:
 UnknownKeywordInRecord_2         = La lecture de \u00ab\u202f{0}\u202f\u00bb a \u00e9t\u00e9 faite, mais en ignorant certains enregistrements \u00e0 cause de mots-cl\u00e9s non reconnus: {1}
 UnparsableValueStoredAsText_2    = La valeur \u00ab\u202f{1}\u202f\u00bb ne peut pas \u00eatre interpr\u00e9t\u00e9e comme une instance de \u2018{0}\u2019. Elle est donc m\u00e9moris\u00e9e sous sa forme textuelle, mais sera ignor\u00e9e par certains traitements.

Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java?rev=1763840&r1=1763839&r2=1763840&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/ResourceInternationalString.java [UTF-8] Fri Oct  7 21:35:43 2016
@@ -39,11 +39,11 @@ import java.util.Objects;
  * This base class is immutable and thus inherently thread-safe.
  *
  * @author  Martin Desruisseaux (Geomatys)
- * @since   0.3
- * @version 0.4
+ * @since   0.8
+ * @version 0.8
  * @module
  */
-abstract class ResourceInternationalString extends AbstractInternationalString implements Serializable {
+public abstract class ResourceInternationalString extends AbstractInternationalString implements Serializable {
     /**
      * Serial number for inter-operability with different versions.
      */
@@ -71,9 +71,9 @@ abstract class ResourceInternationalStri
     /**
      * Creates a new international string for the given key.
      *
-     * @param key The key for the resource to fetch.
+     * @param key  the key for the resource to fetch.
      */
-    ResourceInternationalString(final short key) {
+    protected ResourceInternationalString(final short key) {
         this.key     = key;
         hasArguments = false;
         arguments    = null;
@@ -82,10 +82,10 @@ abstract class ResourceInternationalStri
     /**
      * Creates a new international string for the given key and arguments.
      *
-     * @param key The key for the resource to fetch.
-     * @param arguments The argument(s).
+     * @param key  the key for the resource to fetch.
+     * @param arguments  the argument(s).
      */
-    ResourceInternationalString(final short key, final Object arguments) {
+    protected ResourceInternationalString(final short key, final Object arguments) {
         this.key          = key;
         this.hasArguments = true;
         this.arguments    = arguments;
@@ -96,24 +96,24 @@ abstract class ResourceInternationalStri
      * This is used at serialization time in order to serialize the constant name
      * rather than its numeric value.
      *
-     * @return A handler for the constants declared in the inner {@code Keys} class.
+     * @return a handler for the constants declared in the inner {@code Keys} class.
      */
-    abstract KeyConstants getKeyConstants();
+    protected abstract KeyConstants getKeyConstants();
 
     /**
      * Returns the resource bundle for the given locale.
      *
-     * @param  locale The locale for which to get the resource bundle.
-     * @return The resource bundle for the given locale.
+     * @param  locale  the locale for which to get the resource bundle.
+     * @return the resource bundle for the given locale.
      */
-    abstract IndexedResourceBundle getBundle(final Locale locale);
+    protected abstract IndexedResourceBundle getBundle(final Locale locale);
 
     /**
      * Returns a string in the specified locale.
      *
-     * @param  locale The desired locale for the string to be returned.
-     * @return The string in the specified locale, or in a fallback locale.
-     * @throws MissingResourceException is the key given to the constructor is invalid.
+     * @param  locale  the desired locale for the string to be returned.
+     * @return the string in the specified locale, or in a fallback locale.
+     * @throws MissingResourceException if the key given to the constructor is invalid.
      */
     @Override
     public final String toString(final Locale locale) throws MissingResourceException {
@@ -124,7 +124,7 @@ abstract class ResourceInternationalStri
     /**
      * Compares this international string with the specified object for equality.
      *
-     * @param object The object to compare with this international string.
+     * @param  object  the object to compare with this international string.
      * @return {@code true} if the given object is equal to this string.
      */
     @Override
@@ -149,7 +149,7 @@ abstract class ResourceInternationalStri
     /**
      * Serializes this international string using the key name rather than numerical value.
      *
-     * @param  out The output stream where to serialize this object.
+     * @param  out  the output stream where to serialize this object.
      * @throws IOException If an I/O error occurred while writing.
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
@@ -160,9 +160,9 @@ abstract class ResourceInternationalStri
     /**
      * Deserializes an object serialized by {@link #writeObject(ObjectOutputStream)}.
      *
-     * @param  in The input stream from which to deserialize an object.
-     * @throws IOException If an I/O error occurred while reading or if the stream contains invalid data.
-     * @throws ClassNotFoundException If the class serialized on the stream is not on the classpath.
+     * @param  in  the input stream from which to deserialize an object.
+     * @throws IOException if an I/O error occurred while reading or if the stream contains invalid data.
+     * @throws ClassNotFoundException if the class serialized on the stream is not on the classpath.
      */
     private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException {
         in.defaultReadObject();



Mime
View raw message