sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1424832 - in /sis/branches/JDK7: sis-referencing/src/main/java/org/apache/sis/geometry/ sis-utility/src/main/java/org/apache/sis/measure/ sis-utility/src/main/java/org/apache/sis/util/ sis-utility/src/main/java/org/apache/sis/util/collecti...
Date Fri, 21 Dec 2012 10:03:04 GMT
Author: desruisseaux
Date: Fri Dec 21 10:03:04 2012
New Revision: 1424832

URL: http://svn.apache.org/viewvc?rev=1424832&view=rev
Log:
Re-order the parameters order in error messages in order to apply the same convention than
JUnit:
first programmatic parameters are information about the context where the error occurred,
while the values that caused the error are last. The intend is to have more consistency.

Modified:
    sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
    sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties

Modified: sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
(original)
+++ sis/branches/JDK7/sis-referencing/src/main/java/org/apache/sis/geometry/GeneralEnvelope.java
Fri Dec 21 10:03:04 2012
@@ -297,11 +297,11 @@ public class GeneralEnvelope extends Arr
             throw new IllegalArgumentException(Errors.format(
                     Errors.Keys.OddArrayLength_1, ordinates.length));
         }
-        final int dimension  = ordinates.length >>> 1;
-        final int check = this.ordinates.length >>> 1;
-        if (dimension != check) {
+        final int dimension = ordinates.length >>> 1;
+        final int expected  = this.ordinates.length >>> 1;
+        if (dimension != expected) {
             throw new MismatchedDimensionException(Errors.format(
-                    Errors.Keys.MismatchedDimension_3, "ordinates", dimension, check));
+                    Errors.Keys.MismatchedDimension_3, "ordinates", expected, dimension));
         }
         System.arraycopy(ordinates, 0, this.ordinates, 0, ordinates.length);
     }
@@ -848,9 +848,8 @@ public class GeneralEnvelope extends Arr
                     ordinates[j] = axis.getMaximumValue();
                     changed = true;
                 } else {
-                    throw new IllegalStateException(Errors.format(
-                            Errors.Keys.IllegalOrdinateRange_3, lower, upper,
-                            (axis != null) ? axis.getName() : i));
+                    throw new IllegalStateException(Errors.format(Errors.Keys.IllegalOrdinateRange_3,
+                            (axis != null) ? axis.getName() : i, lower, upper));
                 }
             }
         }

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/measure/AngleFormat.java Fri
Dec 21 10:03:04 2012
@@ -460,7 +460,7 @@ scan:   for (int i=0; i<length;) {
                 }
                 if (parseFinished || (field != expectedField && field != FRACTION_FIELD))
{
                     throw new IllegalArgumentException(Errors.format(
-                            Errors.Keys.IllegalFormatPatternForClass_2, pattern, Angle.class));
+                            Errors.Keys.IllegalFormatPatternForClass_2, Angle.class, pattern));
                 }
                 if (isIntegerField) {
                     /*
@@ -493,7 +493,7 @@ scan:   for (int i=0; i<length;) {
                         final int b = pattern.codePointAt(endPreviousField);
                         if (b != decimalSeparator || endPreviousField + Character.charCount(b)
!= i) {
                             throw new IllegalArgumentException(Errors.format(
-                                    Errors.Keys.IllegalFormatPatternForClass_2, pattern,
Angle.class));
+                                    Errors.Keys.IllegalFormatPatternForClass_2, Angle.class,
pattern));
                         }
                     }
                     int width = 1;
@@ -531,7 +531,7 @@ scan:   for (int i=0; i<length;) {
                 default: {
                     // Happen if no symbol has been recognized in the pattern.
                     throw new IllegalArgumentException(Errors.format(
-                            Errors.Keys.IllegalFormatPatternForClass_2, pattern, Angle.class));
+                            Errors.Keys.IllegalFormatPatternForClass_2, Angle.class, pattern));
                 }
             }
         }
@@ -981,7 +981,7 @@ scan:   for (int i=0; i<length;) {
         }
         ArgumentChecks.ensureNonNull("value", value);
         throw new IllegalArgumentException(Errors.format(Errors.Keys.IllegalArgumentClass_3,
-                "value", value.getClass(), Angle.class));
+                "value", Angle.class, value.getClass()));
     }
 
     /**

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java (original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/ArgumentChecks.java Fri
Dec 21 10:03:04 2012
@@ -168,10 +168,10 @@ public final class ArgumentChecks extend
                 final Object[] args;
                 if (name != null) {
                     key = Errors.Keys.IllegalArgumentClass_3;
-                    args = new Object[] {name, valueClass, expectedType};
+                    args = new Object[] {name, expectedType, valueClass};
                 } else {
                     key = Errors.Keys.IllegalClass_2;
-                    args = new Object[] {valueClass, expectedType};
+                    args = new Object[] {expectedType, valueClass};
                 }
                 throw new IllegalArgumentException(Errors.format(key, args));
             }
@@ -441,7 +441,7 @@ public final class ArgumentChecks extend
     {
         if (value < min || value > max) {
             throw new IllegalArgumentException(Errors.format(
-                    Errors.Keys.ValueOutOfRange_4, name, value, min, max));
+                    Errors.Keys.ValueOutOfRange_4, name, min, max, value));
         }
     }
 
@@ -459,7 +459,7 @@ public final class ArgumentChecks extend
     {
         if (value < min || value > max) {
             throw new IllegalArgumentException(Errors.format(
-                    Errors.Keys.ValueOutOfRange_4, name, value, min, max));
+                    Errors.Keys.ValueOutOfRange_4, name, min, max, value));
         }
     }
 
@@ -478,7 +478,7 @@ public final class ArgumentChecks extend
         if (!(value >= min && value <= max)) { // Use '!' for catching NaN.
             throw new IllegalArgumentException(Float.isNaN(value) ?
                     Errors.format(Errors.Keys.NotANumber_1, name) :
-                    Errors.format(Errors.Keys.ValueOutOfRange_4, name, value, min, max));
+                    Errors.format(Errors.Keys.ValueOutOfRange_4, name, min, max, value));
         }
     }
 
@@ -497,7 +497,7 @@ public final class ArgumentChecks extend
         if (!(value >= min && value <= max)) { // Use '!' for catching NaN.
             throw new IllegalArgumentException(Double.isNaN(value) ?
                     Errors.format(Errors.Keys.NotANumber_1, name)  :
-                    Errors.format(Errors.Keys.ValueOutOfRange_4, name, value, min, max));
+                    Errors.format(Errors.Keys.ValueOutOfRange_4, name, min, max, value));
         }
     }
 
@@ -552,7 +552,7 @@ public final class ArgumentChecks extend
                 final int dimension = cs.getDimension();
                 if (dimension != expected) {
                     throw new MismatchedDimensionException(Errors.format(
-                            Errors.Keys.MismatchedDimension_3, name, dimension, expected));
+                            Errors.Keys.MismatchedDimension_3, name, expected, dimension));
                 }
             }
         }
@@ -575,7 +575,7 @@ public final class ArgumentChecks extend
             final int dimension = vector.length;
             if (dimension != expected) {
                 throw new MismatchedDimensionException(Errors.format(
-                        Errors.Keys.MismatchedDimension_3, name, dimension, expected));
+                        Errors.Keys.MismatchedDimension_3, name, expected, dimension));
             }
         }
     }
@@ -597,7 +597,7 @@ public final class ArgumentChecks extend
             final int dimension = position.getDimension();
             if (dimension != expected) {
                 throw new MismatchedDimensionException(Errors.format(
-                        Errors.Keys.MismatchedDimension_3, name, dimension, expected));
+                        Errors.Keys.MismatchedDimension_3, name, expected, dimension));
             }
         }
     }
@@ -619,7 +619,7 @@ public final class ArgumentChecks extend
             final int dimension = envelope.getDimension();
             if (dimension != expected) {
                 throw new MismatchedDimensionException(Errors.format(
-                        Errors.Keys.MismatchedDimension_3, name, dimension, expected));
+                        Errors.Keys.MismatchedDimension_3, name, expected, dimension));
             }
         }
     }

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedArrayList.java
Fri Dec 21 10:03:04 2012
@@ -124,7 +124,7 @@ public class CheckedArrayList<E> extends
     protected void ensureValid(final E element) throws IllegalArgumentException {
         if (element != null && !type.isInstance(element)) {
             throw new IllegalArgumentException(Errors.format(
-                    Errors.Keys.IllegalArgumentClass_3, "element", element.getClass(), type));
+                    Errors.Keys.IllegalArgumentClass_3, "element", type, element.getClass()));
         }
     }
 

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashMap.java
Fri Dec 21 10:03:04 2012
@@ -105,7 +105,7 @@ public class CheckedHashMap<K,V> extends
     {
         if (element!=null && !type.isInstance(element)) {
             throw new IllegalArgumentException(Errors.format(
-                    Errors.Keys.IllegalArgumentClass_3, "element", element.getClass(), type));
+                    Errors.Keys.IllegalArgumentClass_3, "element", type, element.getClass()));
         }
     }
 

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/CheckedHashSet.java
Fri Dec 21 10:03:04 2012
@@ -123,7 +123,7 @@ public class CheckedHashSet<E> extends L
     protected void ensureValid(final E element) throws IllegalArgumentException {
         if (element != null && !type.isInstance(element)) {
             throw new IllegalArgumentException(Errors.format(
-                    Errors.Keys.IllegalArgumentClass_3, "element", element.getClass(), type));
+                    Errors.Keys.IllegalArgumentClass_3, "element", type, element.getClass()));
         }
     }
 

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/DefaultTreeTable.java
Fri Dec 21 10:03:04 2012
@@ -374,7 +374,7 @@ public class DefaultTreeTable implements
             protected void setParentOf(final TreeTable.Node node, final int mode) throws
IllegalArgumentException {
                 if (!(node instanceof Node)) {
                     throw new IllegalArgumentException(Errors.format(
-                            Errors.Keys.IllegalArgumentClass_3, "node", node.getClass(),
Node.class));
+                            Errors.Keys.IllegalArgumentClass_3, "node", Node.class, node.getClass()));
                 }
                 final TreeTable.Node p;
                 switch (mode) {

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/collection/TreeTableFormat.java
Fri Dec 21 10:03:04 2012
@@ -365,7 +365,7 @@ scan:   for (int i=0; i<length; i++) {
         }
         if (prefix == null) {
             throw new IllegalArgumentException(Errors.format(
-                    Errors.Keys.IllegalFormatPatternForClass_2, pattern, TreeTable.class));
+                    Errors.Keys.IllegalFormatPatternForClass_2, TreeTable.class, pattern));
         }
         /*
          * Finally store the result. The parsing pattern must be first because the call to

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
Fri Dec 21 10:03:04 2012
@@ -24,6 +24,14 @@ import org.opengis.util.InternationalStr
 /**
  * Locale-dependent resources for error messages.
  *
+ * {@section Argument order convention}
+ * This resource bundle applies the same convention than JUnit: for every {@code format(…)}
method,
+ * the first arguments provide information about the context in which the error occurred
(e.g. the
+ * name of a method argument or the range of valid values), while the erroneous values that
caused
+ * the error are last. Note that being the last programmatic parameter does not means that
the value
+ * will appears last in the formatted text, since every localized message can reorder the
parameters
+ * as they want.
+ *
  * @author  Martin Desruisseaux (IRD, Geomatys)
  * @since   0.3 (derived from geotk-2.2)
  * @version 0.3
@@ -114,7 +122,7 @@ public final class Errors extends Indexe
         public static final int IllegalArgumentClass_2 = 17;
 
         /**
-         * Argument ‘{0}’ can not be an instance of ‘{1}’. Expected an
instance of ‘{2}’ or derived
+         * Argument ‘{0}’ can not be an instance of ‘{2}’. Expected an
instance of ‘{1}’ or derived
          * type.
          */
         public static final int IllegalArgumentClass_3 = 2;
@@ -136,12 +144,12 @@ public final class Errors extends Indexe
         public static final int IllegalBitsPattern_1 = 16;
 
         /**
-         * Class ‘{0}’ is illegal. It must be ‘{1}’ or a derived class.
+         * Class ‘{1}’ is illegal. It must be ‘{0}’ or a derived class.
          */
         public static final int IllegalClass_2 = 3;
 
         /**
-         * The “{0}” pattern can not be applied to formating of objects of type
‘{1}’.
+         * The “{1}” pattern can not be applied to formating of objects of type
‘{0}’.
          */
         public static final int IllegalFormatPatternForClass_2 = 29;
 
@@ -216,7 +224,7 @@ public final class Errors extends Indexe
         public static final int MismatchedDimension_2 = 60;
 
         /**
-         * Argument ‘{0}’ has {1} dimension{1,choice,1#|2#s}, while {2} was expected.
+         * Argument ‘{0}’ has {2} dimension{2,choice,1#|2#s}, while {1} was expected.
          */
         public static final int MismatchedDimension_3 = 58;
 
@@ -366,7 +374,7 @@ public final class Errors extends Indexe
         public static final int ValueNotGreaterThanZero_2 = 7;
 
         /**
-         * Value ‘{0}’={1} is invalid. Expected a value in the [{2} … {3}]
range.
+         * Value ‘{0}’={3} is invalid. Expected a value in the [{1} … {2}]
range.
          */
         public static final int ValueOutOfRange_4 = 6;
     }

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
Fri Dec 21 10:03:04 2012
@@ -14,6 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+
+# Argument numbering convention
+# -----------------------------
+# This resource bundle applies the same convention than JUnit: the first programmatic parameters
+# (those having lowest numbers like {0} or {1}) provide information about the context in
which the
+# error occurred (e.g. the parameter name or the range of valid values), while the last parameters
+# (those having highest numbers) are the erroneous values that caused the error. Note that
last
+# programmatic parameters do not have to be last in the formatted text, since each localized
message
+# can reorder the parameters as they want.
+#
+
 CanNotComputeDerivative         = Can not compute the derivative.
 CloneNotSupported_1             = Can not clone an object of type \u2018{0}\u2019.
 DeadThread_1                    = Thread \u201c{0}\u201d is dead.
@@ -25,12 +36,12 @@ EmptyProperty_1                 = Proper
 ExcessiveArgumentSize_3         = Argument \u2018{0}\u2019 shall not contain more than {1}
elements. A number of {2} is excessive.
 ForbiddenAttribute_2            = Attribute \u201c{0}\u201d is not allowed for an object
of type \u2018{1}\u2019.
 IllegalArgumentClass_2          = Argument \u2018{0}\u2019 can not be an instance of \u2018{1}\u2019.
-IllegalArgumentClass_3          = Argument \u2018{0}\u2019 can not be an instance of \u2018{1}\u2019.
Expected an instance of \u2018{2}\u2019 or derived type.
+IllegalArgumentClass_3          = Argument \u2018{0}\u2019 can not be an instance of \u2018{2}\u2019.
Expected an instance of \u2018{1}\u2019 or derived type.
 IllegalArgumentField_4          = Argument \u2018{0}\u2019 can not take the \u201c{1}\u201d
value, because the \u2018{2}\u2019 field can not take the \u201c{3}\u201d value.
 IllegalArgumentValue_2          = Argument \u2018{0}\u2019 can not take the \u201c{1}\u201d
value.
 IllegalBitsPattern_1            = Illegal bits pattern: {0}.
-IllegalClass_2                  = Class \u2018{0}\u2019 is illegal. It must be \u2018{1}\u2019
or a derived class.
-IllegalFormatPatternForClass_2  = The \u201c{0}\u201d pattern can not be applied to formating
of objects of type \u2018{1}\u2019.
+IllegalClass_2                  = Class \u2018{1}\u2019 is illegal. It must be \u2018{0}\u2019
or a derived class.
+IllegalFormatPatternForClass_2  = The \u201c{1}\u201d pattern can not be applied to formating
of objects of type \u2018{0}\u2019.
 IllegalLanguageCode_1           = The \u201c{0}\u201d language is not recognized.
 IllegalOrdinateRange_3          = The [{0} \u2026 {1}] range of ordinate values is not valid
for the \u201c{2}\u201d axis.
 IllegalPropertyClass_2          = Property \u2018{0}\u2019 can be associated to an instance
of \u2018{1}\u2019.
@@ -46,7 +57,7 @@ KeyCollision_1                  = A diff
 MandatoryAttribute_2            = Attribute \u201c{0}\u201d is mandatory for an object of
type \u2018{1}\u2019.
 MismatchedCRS                   = The coordinate reference system must be the same for all
objects.
 MismatchedDimension_2           = Mismatched object dimension: {0}D and {1}D.
-MismatchedDimension_3           = Argument \u2018{0}\u2019 has {1} dimension{1,choice,1#|2#s},
while {2} was expected.
+MismatchedDimension_3           = Argument \u2018{0}\u2019 has {2} dimension{2,choice,1#|2#s},
while {1} was expected.
 NegativeArgument_2              = Argument \u2018{0}\u2019 shall not be negative. The given
value was {1}.
 NodeChildOfItself_1             = Node \u201c{0}\u201d can not be a child of itself.
 NodeHasAnotherParent_1          = Node \u201c{0}\u201d already has another parent.
@@ -76,4 +87,4 @@ UnsupportedImplementation_1     = Can no
 UnsupportedOperation_1          = The \u2018{0}\u2019 operation is unsupported.
 ValueAlreadyDefined_1           = A value is already defined for \u201c{0}\u201d.
 ValueNotGreaterThanZero_2       = Value \u2018{0}\u2019={1} is invalid. Expected a number
greater than 0.
-ValueOutOfRange_4               = Value \u2018{0}\u2019={1} is invalid. Expected a value
in the [{2} \u2026 {3}] range.
+ValueOutOfRange_4               = Value \u2018{0}\u2019={3} is invalid. Expected a value
in the [{1} \u2026 {2}] range.

Modified: sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1424832&r1=1424831&r2=1424832&view=diff
==============================================================================
--- sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
(original)
+++ sis/branches/JDK7/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
Fri Dec 21 10:03:04 2012
@@ -25,14 +25,14 @@ EmptyProperty_1                 = La pro
 ExcessiveArgumentSize_3         = L\u2019argument \u2018{0}\u2019 ne peut pas contenir plus
de {1} \u00e9l\u00e9ments. Un nombre de {2} est excessif.
 ForbiddenAttribute_2            = L\u2019attribut \u201c{0}\u201d n\u2019est pas autoris\u00e9
pour un objet de type \u2018{1}\u2019.
 IllegalArgumentClass_2          = L\u2019argument \u2018{0}\u2019 ne peut pas \u00eatre de
type \u2018{1}\u2019.
-IllegalArgumentClass_3          = L\u2019argument \u2018{0}\u2019 ne peut pas \u00eatre de
type \u2018{1}\u2019. Une instance de \u2018{2}\u2019 ou d\u2019un type d\u00e9riv\u00e9 \u00e9tait
attendue.
+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
\u201c{1}\u201d parce que le champs \u2018{2}\u2019 ne peut pas prendre la valeur \u201c{3}\u201d.
 IllegalArgumentValue_2          = L\u2019argument \u2018{0}\u2019 n\u2019accepte pas la valeur
\u201c{1}\u201d.
 IllegalBitsPattern_1            = Pattern de bits invalide: {0}.
-IllegalClass_2                  = La classe \u2018{0}\u2019 est ill\u00e9gale. Il doit s\u2019agir
d\u2019une classe \u2018{1}\u2019 ou d\u00e9riv\u00e9e.
-IllegalFormatPatternForClass_2  = Le mod\u00e8le \u201c{0}\u201d ne peut pas \u00eatre appliqu\u00e9
au formatage d\u2019objets de type \u2018{1}\u2019.
+IllegalClass_2                  = La classe \u2018{1}\u2019 est ill\u00e9gale. Il doit s\u2019agir
d\u2019une classe \u2018{0}\u2019 ou d\u00e9riv\u00e9e.
+IllegalFormatPatternForClass_2  = Le mod\u00e8le \u201c{1}\u201d ne peut pas \u00eatre appliqu\u00e9
au formatage d\u2019objets de type \u2018{0}\u2019.
 IllegalLanguageCode_1           = Le code de langue \u201c{0}\u201d n\u2019est pas reconnu.
-IllegalOrdinateRange_3          = La plage de valeurs de coordonn\u00e9es [{0} \u2026 {1}]
n\u2019est pas valide pour l\u2019axe \u201c{2}\u201d.
+IllegalOrdinateRange_3          = La plage de valeurs de coordonn\u00e9es [{1} \u2026 {2}]
n\u2019est pas valide pour l\u2019axe \u201c{0}\u201d.
 IllegalPropertyClass_2          = La propri\u00e9t\u00e9 \u2018{0}\u2019 ne peut pas \u00eatre
associ\u00e9e \u00e0 une valeur de type \u2018{1}\u2019.
 IllegalRange_2                  = La plage [{0} \u2026 {1}] n\u2019est pas valide.
 InconsistentAttribute_2         = La valeur \u201c{1}\u201d de l\u2019attribut \u2018{0}\u2019
n\u2019est pas coh\u00e9rente avec celles des autres attributs.
@@ -46,7 +46,7 @@ KeyCollision_1                  = Une va
 MandatoryAttribute_2            = L\u2019attribut \u201c{0}\u201d est obligatoire pour un
objet de type \u2018{1}\u2019.
 MismatchedCRS                   = Le syst\u00e8me de r\u00e9f\u00e9rence des coordonn\u00e9es
doit \u00eatre le m\u00eame pour tous les objets.
 MismatchedDimension_2           = Les dimensions des objets ({0}D et {1}D) ne concordent
pas.
-MismatchedDimension_3           = L\u2019argument \u2018{0}\u2019 a {1} dimension{1,choice,1#|2#s},
alors qu\u2019on en attendait {2}.
+MismatchedDimension_3           = L\u2019argument \u2018{0}\u2019 a {2} dimension{2,choice,1#|2#s},
alors qu\u2019on en attendait {1}.
 NegativeArgument_2              = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre n\u00e9gatif.
La valeur donn\u00e9e \u00e9tait {1}.
 NodeChildOfItself_1             = Le n\u0153ud \u201c{0}\u201d ne peut pas \u00eatre un enfant
de lui-m\u00eame.
 NodeHasAnotherParent_1          = Le n\u0153ud \u201c{0}\u201d a d\u00e9j\u00e0 un autre
parent.
@@ -76,4 +76,4 @@ UnsupportedImplementation_1     = Les in
 UnsupportedOperation_1          = L\u2019op\u00e9ration \u2018{0}\u2019 n\u2019est pas support\u00e9e.
 ValueAlreadyDefined_1           = Une valeur est d\u00e9j\u00e0 d\u00e9finie pour \u201c{0}\u201d.
 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={1} est invalide. Une valeur
dans la plage [{2} \u2026 {3}] \u00e9tait attendue.
+ValueOutOfRange_4               = La valeur \u2018{0}\u2019={3} est invalide. Une valeur
dans la plage [{1} \u2026 {2}] \u00e9tait attendue.



Mime
View raw message