sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1762647 [4/10] - in /sis/trunk: ./ application/sis-webapp/src/test/ core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-metadata/src/main/java/org/apache/sis/metadata/ core/sis-metadata/src/main/java/org/apache/sis/metadata/iso...
Date Wed, 28 Sep 2016 13:01:40 GMT
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java?rev=1762647&r1=1762646&r2=1762647&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/CharSequences.java [UTF-8] Wed Sep 28 13:01:39 2016
@@ -128,8 +128,8 @@ public final class CharSequences extends
      * Since the <var>used width</var> value may be greater than expected, this method handle negative {@code length}
      * values as if the value was zero.
      *
-     * @param  length The string length. Negative values are clamped to 0.
-     * @return A string of length {@code length} filled with white spaces.
+     * @param  length  the string length. Negative values are clamped to 0.
+     * @return a string of length {@code length} filled with white spaces.
      */
     public static CharSequence spaces(final int length) {
         /*
@@ -176,8 +176,8 @@ public final class CharSequences extends
      * Returns the {@linkplain CharSequence#length() length} of the given characters sequence,
      * or 0 if {@code null}.
      *
-     * @param  text The character sequence from which to get the length, or {@code null}.
-     * @return The length of the character sequence, or 0 if the argument is {@code null}.
+     * @param  text  the character sequence from which to get the length, or {@code null}.
+     * @return the length of the character sequence, or 0 if the argument is {@code null}.
      */
     public static int length(final CharSequence text) {
         return (text != null) ? text.length() : 0;
@@ -188,8 +188,8 @@ public final class CharSequences extends
      * or 0 if {@code null}. Unpaired surrogates within the text count as one code
      * point each.
      *
-     * @param  text The character sequence from which to get the count, or {@code null}.
-     * @return The number of Unicode code points, or 0 if the argument is {@code null}.
+     * @param  text  the character sequence from which to get the count, or {@code null}.
+     * @return the number of Unicode code points, or 0 if the argument is {@code null}.
      *
      * @see #codePointCount(CharSequence, int, int)
      */
@@ -217,10 +217,10 @@ public final class CharSequences extends
      * to delegate to the optimized methods from the {@link String}, {@link StringBuilder},
      * {@link StringBuffer} or {@link CharBuffer} classes if possible.</p>
      *
-     * @param  text      The character sequence from which to get the count, or {@code null}.
-     * @param  fromIndex The index from which to start the computation.
-     * @param  toIndex   The index after the last character to take in account.
-     * @return The number of Unicode code points, or 0 if the argument is {@code null}.
+     * @param  text       the character sequence from which to get the count, or {@code null}.
+     * @param  fromIndex  the index from which to start the computation.
+     * @param  toIndex    the index after the last character to take in account.
+     * @return the number of Unicode code points, or 0 if the argument is {@code null}.
      *
      * @see Character#codePointCount(CharSequence, int, int)
      * @see String#codePointCount(int, int)
@@ -245,13 +245,13 @@ public final class CharSequences extends
      * Returns the number of occurrences of the {@code toSearch} string in the given {@code text}.
      * The search is case-sensitive.
      *
-     * @param  text The character sequence to count occurrences, or {@code null}.
-     * @param  toSearch The string to search in the given {@code text}.
-     *         It shall contain at least one character.
-     * @return The number of occurrences of {@code toSearch} in {@code text},
+     * @param  text      the character sequence to count occurrences, or {@code null}.
+     * @param  toSearch  the string to search in the given {@code text}.
+     *                   It shall contain at least one character.
+     * @return the number of occurrences of {@code toSearch} in {@code text},
      *         or 0 if {@code text} was null or empty.
-     * @throws NullArgumentException If the {@code toSearch} argument is null.
-     * @throws IllegalArgumentException If the {@code toSearch} argument is empty.
+     * @throws NullArgumentException if the {@code toSearch} argument is null.
+     * @throws IllegalArgumentException if the {@code toSearch} argument is empty.
      */
     public static int count(final CharSequence text, final String toSearch) {
         ArgumentChecks.ensureNonEmpty("toSearch", toSearch);
@@ -274,9 +274,9 @@ public final class CharSequences extends
     /**
      * Counts the number of occurrence of the given character in the given character sequence.
      *
-     * @param  text The character sequence to count occurrences, or {@code null}.
-     * @param  toSearch The character to count.
-     * @return The number of occurrences of the given character, or 0 if the {@code text} is null.
+     * @param  text      the character sequence to count occurrences, or {@code null}.
+     * @param  toSearch  the character to count.
+     * @return the number of occurrences of the given character, or 0 if the {@code text} is null.
      */
     public static int count(final CharSequence text, final char toSearch) {
         int n = 0;
@@ -313,14 +313,14 @@ public final class CharSequences extends
      * from 0 or {@code toIndex} respectively. This is consistent with the
      * {@link String#indexOf(String, int)} behavior.
      *
-     * @param  text      The string in which to perform the search.
-     * @param  toSearch  The substring for which to search.
-     * @param  fromIndex The index from which to start the search.
-     * @param  toIndex   The index after the last character where to perform the search.
-     * @return The index within the text of the first occurrence of the specified part, starting at the specified
-     *         index, or -1 if no occurrence has been found or if the {@code text} argument is null.
-     * @throws NullArgumentException If the {@code toSearch} argument is null.
-     * @throws IllegalArgumentException If the {@code toSearch} argument is empty.
+     * @param  text       the string in which to perform the search.
+     * @param  toSearch   the substring for which to search.
+     * @param  fromIndex  the index from which to start the search.
+     * @param  toIndex    the index after the last character where to perform the search.
+     * @return the index within the text of the first occurrence of the specified part, starting at the specified index,
+     *         or -1 if no occurrence has been found or if the {@code text} argument is null.
+     * @throws NullArgumentException if the {@code toSearch} argument is null.
+     * @throws IllegalArgumentException if the {@code toSearch} argument is empty.
      *
      * @see String#indexOf(String, int)
      * @see StringBuilder#indexOf(String, int)
@@ -372,11 +372,11 @@ search:     for (; fromIndex <= toIndex;
      * from 0 or {@code toIndex} respectively. This is consistent with the behavior documented
      * in {@link String#indexOf(int, int)}.</p>
      *
-     * @param  text      The character sequence in which to perform the search, or {@code null}.
-     * @param  toSearch  The Unicode code point of the character to search.
-     * @param  fromIndex The index to start the search from.
-     * @param  toIndex   The index after the last character where to perform the search.
-     * @return The index of the first occurrence of the given character in the specified sub-sequence,
+     * @param  text       the character sequence in which to perform the search, or {@code null}.
+     * @param  toSearch   the Unicode code point of the character to search.
+     * @param  fromIndex  the index to start the search from.
+     * @param  toIndex    the index after the last character where to perform the search.
+     * @return the index of the first occurrence of the given character in the specified sub-sequence,
      *         or -1 if no occurrence has been found or if the {@code text} argument is null.
      *
      * @see String#indexOf(int, int)
@@ -423,11 +423,11 @@ search:     for (; fromIndex <= toIndex;
      * from {@code length} or {@code fromIndex} respectively. This is consistent with the behavior
      * documented in {@link String#lastIndexOf(int, int)}.</p>
      *
-     * @param  text      The character sequence in which to perform the search, or {@code null}.
-     * @param  toSearch  The Unicode code point of the character to search.
-     * @param  fromIndex The index of the first character in the range where to perform the search.
-     * @param  toIndex   The index after the last character in the range where to perform the search.
-     * @return The index of the last occurrence of the given character in the specified sub-sequence,
+     * @param  text       the character sequence in which to perform the search, or {@code null}.
+     * @param  toSearch   the Unicode code point of the character to search.
+     * @param  fromIndex  the index of the first character in the range where to perform the search.
+     * @param  toIndex    the index after the last character in the range where to perform the search.
+     * @return the index of the last occurrence of the given character in the specified sub-sequence,
      *         or -1 if no occurrence has been found or if the {@code text} argument is null.
      *
      * @see String#lastIndexOf(int, int)
@@ -478,12 +478,12 @@ search:     for (; fromIndex <= toIndex;
      * {@code text.length()} is returned. If this method reaches the beginning of
      * {@code text} while searching backward, then 0 is returned.</p>
      *
-     * @param  text      The string in which to skip a determined amount of lines.
-     * @param  numLines  The number of lines to skip. Can be positive, zero or negative.
-     * @param  fromIndex Index at which to start the search, from 0 to {@code text.length()} inclusive.
-     * @return Index of the first character after the last skipped line.
-     * @throws NullPointerException If the {@code text} argument is null.
-     * @throws IndexOutOfBoundsException If {@code fromIndex} is out of bounds.
+     * @param  text       the string in which to skip a determined amount of lines.
+     * @param  numLines   the number of lines to skip. Can be positive, zero or negative.
+     * @param  fromIndex  index at which to start the search, from 0 to {@code text.length()} inclusive.
+     * @return index of the first character after the last skipped line.
+     * @throws NullPointerException if the {@code text} argument is null.
+     * @throws IndexOutOfBoundsException if {@code fromIndex} is out of bounds.
      */
     public static int indexOfLineStart(final CharSequence text, int numLines, int fromIndex) {
         final int length = text.length();
@@ -550,10 +550,10 @@ search:     for (; fromIndex <= toIndex;
      *
      * Space characters are identified by the {@link Character#isWhitespace(int)} method.
      *
-     * @param  text      The string in which to perform the search (can not be null).
-     * @param  fromIndex The index from which to start the search (can not be negative).
-     * @param  toIndex   The index after the last character where to perform the search.
-     * @return The index within the text of the first occurrence of a non-space character, starting
+     * @param  text       the string in which to perform the search (can not be null).
+     * @param  fromIndex  the index from which to start the search (can not be negative).
+     * @param  toIndex    the index after the last character where to perform the search.
+     * @return the index within the text of the first occurrence of a non-space character, starting
      *         at the specified index, or a value equals or greater than {@code toIndex} if none.
      * @throws NullPointerException if the {@code text} argument is null.
      *
@@ -587,10 +587,10 @@ search:     for (; fromIndex <= toIndex;
      *
      * Space characters are identified by the {@link Character#isWhitespace(int)} method.
      *
-     * @param  text      The string in which to perform the search (can not be null).
-     * @param  fromIndex The index from which to start the search (can not be negative).
-     * @param  toIndex   The index after the last character where to perform the search.
-     * @return The index within the text of the last occurrence of a non-space character, starting
+     * @param  text       the string in which to perform the search (can not be null).
+     * @param  fromIndex  the index from which to start the search (can not be negative).
+     * @param  toIndex    the index after the last character where to perform the search.
+     * @return the index within the text of the last occurrence of a non-space character, starting
      *         at the specified index, or a value equals or lower than {@code fromIndex} if none.
      * @throws NullPointerException if the {@code text} argument is null.
      *
@@ -616,8 +616,8 @@ search:     for (; fromIndex <= toIndex;
      * <p>Note that this is a undocumented SIS features. There is currently no commitment that this implementation
      * details will not change in future version.</p>
      *
-     * @param  text The text to be splitted.
-     * @return An array where to store the result of splitting the given {@code text}.
+     * @param  text  the text to be splitted.
+     * @return an array where to store the result of splitting the given {@code text}.
      */
     private static CharSequence[] createSplitArray(final CharSequence text) {
         return (text instanceof String ||
@@ -644,9 +644,9 @@ search:     for (; fromIndex <= toIndex;
      *   <li>The leading and trailing spaces of each subsequences are trimmed.</li>
      * </ul>
      *
-     * @param  text The text to split, or {@code null}.
-     * @param  separator The delimiting character (typically the coma).
-     * @return The array of subsequences computed by splitting the given text around the given
+     * @param  text       the text to split, or {@code null}.
+     * @param  separator  the delimiting character (typically the coma).
+     * @return the array of subsequences computed by splitting the given text around the given
      *         character, or an empty array if {@code toSplit} was null.
      *
      * @see String#split(String)
@@ -713,8 +713,8 @@ search:     for (; fromIndex <= toIndex;
      * However this method still useful for other {@link CharSequence} implementations providing an efficient
      * {@code subSequence(int,int)} method.</div>
      *
-     * @param  text The multi-line text from which to get the individual lines, or {@code null}.
-     * @return The lines in the text, or an empty array if the given text was null.
+     * @param  text  the multi-line text from which to get the individual lines, or {@code null}.
+     * @return the lines in the text, or an empty array if the given text was null.
      *
      * @see #indexOfLineStart(CharSequence, int, int)
      */
@@ -790,11 +790,11 @@ search:     for (; fromIndex <= toIndex;
      * then {@linkplain Double#parseDouble(String) parses} each item as a {@code double}.
      * Empty sub-sequences are parsed as {@link Double#NaN}.
      *
-     * @param  values    The text containing the values to parse, or {@code null}.
-     * @param  separator The delimiting character (typically the coma).
-     * @return The array of numbers parsed from the given text,
+     * @param  values     the text containing the values to parse, or {@code null}.
+     * @param  separator  the delimiting character (typically the coma).
+     * @return the array of numbers parsed from the given text,
      *         or an empty array if {@code values} was null.
-     * @throws NumberFormatException If at least one number can not be parsed.
+     * @throws NumberFormatException if at least one number can not be parsed.
      */
     public static double[] parseDoubles(final CharSequence values, final char separator)
             throws NumberFormatException
@@ -813,11 +813,11 @@ search:     for (; fromIndex <= toIndex;
      * then {@linkplain Float#parseFloat(String) parses} each item as a {@code float}.
      * Empty sub-sequences are parsed as {@link Float#NaN}.
      *
-     * @param  values    The text containing the values to parse, or {@code null}.
-     * @param  separator The delimiting character (typically the coma).
-     * @return The array of numbers parsed from the given text,
+     * @param  values     the text containing the values to parse, or {@code null}.
+     * @param  separator  the delimiting character (typically the coma).
+     * @return the array of numbers parsed from the given text,
      *         or an empty array if {@code values} was null.
-     * @throws NumberFormatException If at least one number can not be parsed.
+     * @throws NumberFormatException if at least one number can not be parsed.
      */
     public static float[] parseFloats(final CharSequence values, final char separator)
             throws NumberFormatException
@@ -835,12 +835,12 @@ search:     for (; fromIndex <= toIndex;
      * {@linkplain #split(CharSequence, char) Splits} the given text around the given character,
      * then {@linkplain Long#parseLong(String) parses} each item as a {@code long}.
      *
-     * @param  values    The text containing the values to parse, or {@code null}.
-     * @param  separator The delimiting character (typically the coma).
-     * @param  radix     The radix to be used for parsing. This is usually 10.
-     * @return The array of numbers parsed from the given text,
+     * @param  values     the text containing the values to parse, or {@code null}.
+     * @param  separator  the delimiting character (typically the coma).
+     * @param  radix      the radix to be used for parsing. This is usually 10.
+     * @return the array of numbers parsed from the given text,
      *         or an empty array if {@code values} was null.
-     * @throws NumberFormatException If at least one number can not be parsed.
+     * @throws NumberFormatException if at least one number can not be parsed.
      */
     public static long[] parseLongs(final CharSequence values, final char separator, final int radix)
             throws NumberFormatException
@@ -857,12 +857,12 @@ search:     for (; fromIndex <= toIndex;
      * {@linkplain #split(CharSequence, char) Splits} the given text around the given character,
      * then {@linkplain Integer#parseInt(String) parses} each item as an {@code int}.
      *
-     * @param  values    The text containing the values to parse, or {@code null}.
-     * @param  separator The delimiting character (typically the coma).
-     * @param  radix     The radix to be used for parsing. This is usually 10.
-     * @return The array of numbers parsed from the given text,
+     * @param  values     the text containing the values to parse, or {@code null}.
+     * @param  separator  the delimiting character (typically the coma).
+     * @param  radix      the radix to be used for parsing. This is usually 10.
+     * @return the array of numbers parsed from the given text,
      *         or an empty array if {@code values} was null.
-     * @throws NumberFormatException If at least one number can not be parsed.
+     * @throws NumberFormatException if at least one number can not be parsed.
      */
     public static int[] parseInts(final CharSequence values, final char separator, final int radix)
             throws NumberFormatException
@@ -879,12 +879,12 @@ search:     for (; fromIndex <= toIndex;
      * {@linkplain #split(CharSequence, char) Splits} the given text around the given character,
      * then {@linkplain Short#parseShort(String) parses} each item as a {@code short}.
      *
-     * @param  values    The text containing the values to parse, or {@code null}.
-     * @param  separator The delimiting character (typically the coma).
-     * @param  radix     The radix to be used for parsing. This is usually 10.
-     * @return The array of numbers parsed from the given text,
+     * @param  values     the text containing the values to parse, or {@code null}.
+     * @param  separator  the delimiting character (typically the coma).
+     * @param  radix      the radix to be used for parsing. This is usually 10.
+     * @return the array of numbers parsed from the given text,
      *         or an empty array if {@code values} was null.
-     * @throws NumberFormatException If at least one number can not be parsed.
+     * @throws NumberFormatException if at least one number can not be parsed.
      */
     public static short[] parseShorts(final CharSequence values, final char separator, final int radix)
             throws NumberFormatException
@@ -901,12 +901,12 @@ search:     for (; fromIndex <= toIndex;
      * {@linkplain #split(CharSequence, char) Splits} the given text around the given character,
      * then {@linkplain Byte#parseByte(String) parses} each item as a {@code byte}.
      *
-     * @param  values    The text containing the values to parse, or {@code null}.
-     * @param  separator The delimiting character (typically the coma).
-     * @param  radix     The radix to be used for parsing. This is usually 10.
-     * @return The array of numbers parsed from the given text,
+     * @param  values     the text containing the values to parse, or {@code null}.
+     * @param  separator  the delimiting character (typically the coma).
+     * @param  radix      the radix to be used for parsing. This is usually 10.
+     * @return the array of numbers parsed from the given text,
      *         or an empty array if {@code values} was null.
-     * @throws NumberFormatException If at least one number can not be parsed.
+     * @throws NumberFormatException if at least one number can not be parsed.
      */
     public static byte[] parseBytes(final CharSequence values, final char separator, final int radix)
             throws NumberFormatException
@@ -932,9 +932,8 @@ search:     for (; fromIndex <= toIndex;
      * for coordinate system axes like φ and λ, then the replacements depend on the enclosing
      * coordinate system. See {@link org.apache.sis.io.wkt.Transliterator} for more information.</div>
      *
-     * @param  text The text to scan for Unicode characters to replace by ASCII characters,
-     *         or {@code null}.
-     * @return The given text with substitutions applied, or {@code text} if no replacement
+     * @param  text  the text to scan for Unicode characters to replace by ASCII characters, or {@code null}.
+     * @return the given text with substitutions applied, or {@code text} if no replacement
      *         has been applied, or {@code null} if the given text was null.
      *
      * @see StringBuilders#toASCII(StringBuilder)
@@ -955,7 +954,7 @@ search:     for (; fromIndex <= toIndex;
      * <p>This method performs the same work than {@link #trimWhitespaces(CharSequence)},
      * but is overloaded for the {@code String} type because of its frequent use.</p>
      *
-     * @param  text The text from which to remove leading and trailing whitespaces, or {@code null}.
+     * @param  text  the text from which to remove leading and trailing whitespaces, or {@code null}.
      * @return A string with leading and trailing whitespaces removed, or {@code null} is the given
      *         text was null.
      */
@@ -974,8 +973,8 @@ search:     for (; fromIndex <= toIndex;
      *
      * <p>This method is the generic version of {@link #trimWhitespaces(String)}.</p>
      *
-     * @param  text The text from which to remove leading and trailing whitespaces, or {@code null}.
-     * @return A characters sequence with leading and trailing whitespaces removed,
+     * @param  text  the text from which to remove leading and trailing whitespaces, or {@code null}.
+     * @return a characters sequence with leading and trailing whitespaces removed,
      *         or {@code null} is the given text was null.
      *
      * @see #skipLeadingWhitespaces(CharSequence, int, int)
@@ -1000,12 +999,12 @@ search:     for (; fromIndex <= toIndex;
      *     text = trimWhitespaces(text.subSequence(lower, upper));
      * }
      *
-     * @param  text  The text from which to remove leading and trailing white spaces.
-     * @param  lower Index of the first character to consider for inclusion in the sub-sequence.
-     * @param  upper Index after the last character to consider for inclusion in the sub-sequence.
-     * @return A characters sequence with leading and trailing white spaces removed, or {@code null}
+     * @param  text   the text from which to remove leading and trailing white spaces.
+     * @param  lower  index of the first character to consider for inclusion in the sub-sequence.
+     * @param  upper  index after the last character to consider for inclusion in the sub-sequence.
+     * @return a characters sequence with leading and trailing white spaces removed, or {@code null}
      *         if the {@code text} argument is null.
-     * @throws IndexOutOfBoundsException If {@code lower} or {@code upper} is out of bounds.
+     * @throws IndexOutOfBoundsException if {@code lower} or {@code upper} is out of bounds.
      */
     public static CharSequence trimWhitespaces(CharSequence text, int lower, int upper) {
         final int length = length(text);
@@ -1040,8 +1039,8 @@ search:     for (; fromIndex <= toIndex;
      * if that number should preferably be parsed as an integer before attempting to parse
      * it as a floating point number.
      *
-     * @param  value The value to trim if possible, or {@code null}.
-     * @return The value without the trailing {@code ".0"} part (if any),
+     * @param  value  the value to trim if possible, or {@code null}.
+     * @return the value without the trailing {@code ".0"} part (if any),
      *         or {@code null} if the given text was null.
      *
      * @see StringBuilders#trimFractionalPart(StringBuilder)
@@ -1079,10 +1078,9 @@ search:     for (; fromIndex <= toIndex;
      *   "This sentence given (…) in a short name."
      * </blockquote>
      *
-     * @param  text The sentence to reduce if it is too long, or {@code null}.
-     * @param  maxLength The maximum length allowed for {@code text}.
-     * @return A sentence not longer than {@code maxLength}, or {@code null}
-     *         if the given text was null.
+     * @param  text       the sentence to reduce if it is too long, or {@code null}.
+     * @param  maxLength  the maximum length allowed for {@code text}.
+     * @return a sentence not longer than {@code maxLength}, or {@code null} if the given text was null.
      */
     public static CharSequence shortSentence(CharSequence text, final int maxLength) {
         ArgumentChecks.ensureStrictlyPositive("maxLength", maxLength);
@@ -1172,8 +1170,8 @@ searchWordBreak:    while (true) {
      * <p>Note that those heuristic rules may be modified in future SIS versions,
      * depending on the practical experience gained.</p>
      *
-     * @param  identifier The name of a Java constant, or {@code null}.
-     * @return The identifier like an English sentence, or {@code null}
+     * @param  identifier  the name of a Java constant, or {@code null}.
+     * @return the identifier like an English sentence, or {@code null}
      *         if the given {@code identifier} argument was null.
      */
     public static CharSequence upperCaseToSentence(final CharSequence identifier) {
@@ -1221,8 +1219,8 @@ searchWordBreak:    while (true) {
      * <p>Note that those heuristic rules may be modified in future SIS versions,
      * depending on the practical experience gained.</p>
      *
-     * @param  identifier An identifier with no space, words begin with an upper-case character, or {@code null}.
-     * @return The identifier with spaces inserted after what looks like words, or {@code null}
+     * @param  identifier  an identifier with no space, words begin with an upper-case character, or {@code null}.
+     * @return the identifier with spaces inserted after what looks like words, or {@code null}
      *         if the given {@code identifier} argument was null.
      */
     public static CharSequence camelCaseToSentence(final CharSequence identifier) {
@@ -1267,10 +1265,10 @@ searchWordBreak:    while (true) {
      *
      * <p>The given string is usually a programmatic identifier like a class name or a method name.</p>
      *
-     * @param  identifier An identifier with no space, words begin with an upper-case character.
-     * @param  toLowerCase {@code true} for changing the first character of words to lower case,
+     * @param  identifier   an identifier with no space, words begin with an upper-case character.
+     * @param  toLowerCase  {@code true} for changing the first character of words to lower case,
      *         except for the first word and acronyms.
-     * @return The identifier with spaces inserted after what looks like words, or {@code null}
+     * @return the identifier with spaces inserted after what looks like words, or {@code null}
      *         if the given {@code identifier} argument was null.
      */
     public static CharSequence camelCaseToWords(final CharSequence identifier, final boolean toLowerCase) {
@@ -1334,8 +1332,8 @@ searchWordBreak:    while (true) {
      * <p><b>Examples:</b> given {@code "northEast"}, this method returns {@code "NE"}.
      * Given {@code "Open Geospatial Consortium"}, this method returns {@code "OGC"}.</p>
      *
-     * @param  text The text for which to create an acronym, or {@code null}.
-     * @return The acronym, or {@code null} if the given text was null.
+     * @param  text  the text for which to create an acronym, or {@code null}.
+     * @return the acronym, or {@code null} if the given text was null.
      */
     public static CharSequence camelCaseToAcronym(CharSequence text) {
         text = trimWhitespaces(text);
@@ -1396,8 +1394,8 @@ searchWordBreak:    while (true) {
      *
      * If any of the given arguments is {@code null}, this method returns {@code false}.
      *
-     * @param  acronym A possible acronym of the sequence of words, or {@code null}.
-     * @param  words The sequence of words, or {@code null}.
+     * @param  acronym  a possible acronym of the sequence of words, or {@code null}.
+     * @param  words    the sequence of words, or {@code null}.
      * @return {@code true} if the first string is an acronym of the second one.
      */
     public static boolean isAcronymForWords(final CharSequence acronym, final CharSequence words) {
@@ -1541,7 +1539,7 @@ cmp:    while (ia < lga) {
      * {@linkplain org.apache.sis.util.iso.DefaultNameSpace#DEFAULT_SEPARATOR namespace separators},
      * this exclusion is considered desirable.
      *
-     * @param  identifier The character sequence to test, or {@code null}.
+     * @param  identifier  the character sequence to test, or {@code null}.
      * @return {@code true} if the given character sequence is a legal Unicode identifier.
      *
      * @see org.apache.sis.metadata.iso.ImmutableIdentifier
@@ -1570,7 +1568,7 @@ cmp:    while (ia < lga) {
      * Returns {@code true} if the given text is non-null, contains at least one upper-case character and
      * no lower-case character. Space and punctuation are ignored.
      *
-     * @param  text The character sequence to test (may be {@code null}).
+     * @param  text  the character sequence to test (may be {@code null}).
      * @return {@code true} if non-null, contains at least one upper-case character and no lower-case character.
      *
      * @see String#toUpperCase()
@@ -1585,10 +1583,10 @@ cmp:    while (ia < lga) {
      * Returns {@code true} if the given sub-sequence is non-null, contains at least one upper-case character and
      * no lower-case character. Space and punctuation are ignored.
      *
-     * @param  text  The character sequence to test.
-     * @param  lower Index of the first character to check, inclusive.
-     * @param  upper Index of the last character to check, exclusive.
-     * @param  hasUpperCase {@code true} if this method should behave as if the given text already had
+     * @param  text          the character sequence to test.
+     * @param  lower         index of the first character to check, inclusive.
+     * @param  upper         index of the last character to check, exclusive.
+     * @param  hasUpperCase  {@code true} if this method should behave as if the given text already had
      *         at least one upper-case character (not necessarily in the portion given by the indices).
      * @return {@code true} if contains at least one upper-case character and no lower-case character.
      */
@@ -1619,10 +1617,10 @@ cmp:    while (ia < lga) {
      *     assert equalsFiltered("WGS84", "WGS_84", Characters.Filter.LETTERS_AND_DIGITS, true) == true;
      * }
      *
-     * @param  s1 The first characters sequence to compare, or {@code null}.
-     * @param  s2 The second characters sequence to compare, or {@code null}.
-     * @param  filter The subset of characters to compare, or {@code null} for comparing all characters.
-     * @param  ignoreCase {@code true} for comparing cases, or {@code false} for requiring exact match.
+     * @param  s1          the first characters sequence to compare, or {@code null}.
+     * @param  s2          the second characters sequence to compare, or {@code null}.
+     * @param  filter      the subset of characters to compare, or {@code null} for comparing all characters.
+     * @param  ignoreCase  {@code true} for comparing cases, or {@code false} for requiring exact match.
      * @return {@code true} if both arguments are {@code null} or if the two given texts are equal,
      *         optionally ignoring case and filtered-out characters.
      */
@@ -1645,11 +1643,10 @@ cmp:    while (ia < lga) {
             int c1 = codePointAt(s1, i1);
             final int n = charCount(c1);
             if (filter.contains(c1)) {
-                // Fetch the next significant character from the second string.
-                int c2;
+                int c2;                     // Fetch the next significant character from the second string.
                 do {
                     if (i2 >= lg2) {
-                        return false; // The first string has more significant characters than expected.
+                        return false;       // The first string has more significant characters than expected.
                     }
                     c2 = codePointAt(s2, i2);
                     i2 += charCount(c2);
@@ -1665,7 +1662,7 @@ cmp:    while (ia < lga) {
         while (i2 < lg2) {
             final int s = codePointAt(s2, i2);
             if (filter.contains(s)) {
-                return false; // The first string has less significant characters than expected.
+                return false;               // The first string has less significant characters than expected.
             }
             i2 += charCount(s);
         }
@@ -1695,8 +1692,8 @@ cmp:    while (ia < lga) {
      * it works on arbitrary character sequences and compares <cite>code points</cite>
      * instead than characters.
      *
-     * @param  s1 The first string to compare, or {@code null}.
-     * @param  s2 The second string to compare, or {@code null}.
+     * @param  s1  the first string to compare, or {@code null}.
+     * @param  s2  the second string to compare, or {@code null}.
      * @return {@code true} if the two given texts are equal, ignoring case,
      *         or if both arguments are {@code null}.
      *
@@ -1731,8 +1728,8 @@ cmp:    while (ia < lga) {
      * {@link String#contentEquals(CharSequence)} if possible. This method never invoke
      * {@link CharSequence#toString()} in order to avoid a potentially large copy of data.
      *
-     * @param  s1 The first string to compare, or {@code null}.
-     * @param  s2 The second string to compare, or {@code null}.
+     * @param  s1  the first string to compare, or {@code null}.
+     * @param  s2  the second string to compare, or {@code null}.
      * @return {@code true} if the two given texts are equal, or if both arguments are {@code null}.
      *
      * @see String#contentEquals(CharSequence)
@@ -1771,9 +1768,9 @@ cmp:    while (ia < lga) {
      * {@code fromIndex < 0} or {@code fromIndex + part.length() > text.length()},
      * then this method returns {@code false}.
      *
-     * @param text      The character sequence for which to tests for the presence of {@code part}.
-     * @param fromIndex The offset in {@code text} where to test for the presence of {@code part}.
-     * @param part      The part which may be present in {@code text}.
+     * @param  text       the character sequence for which to tests for the presence of {@code part}.
+     * @param  fromIndex  the offset in {@code text} where to test for the presence of {@code part}.
+     * @param  part       the part which may be present in {@code text}.
      * @return {@code true} if {@code text} contains {@code part} at the given {@code offset}.
      * @throws NullPointerException if any of the arguments is null.
      *
@@ -1811,10 +1808,10 @@ cmp:    while (ia < lga) {
      * {@code fromIndex < 0} or {@code fromIndex + part.length() > text.length()},
      * then this method returns {@code false}.
      *
-     * @param text       The character sequence for which to tests for the presence of {@code part}.
-     * @param fromIndex  The offset in {@code text} where to test for the presence of {@code part}.
-     * @param part       The part which may be present in {@code text}.
-     * @param ignoreCase {@code true} if the case should be ignored.
+     * @param  text        the character sequence for which to tests for the presence of {@code part}.
+     * @param  fromIndex   the offset in {@code text} where to test for the presence of {@code part}.
+     * @param  part        the part which may be present in {@code text}.
+     * @param  ignoreCase  {@code true} if the case should be ignored.
      * @return {@code true} if {@code text} contains {@code part} at the given {@code offset}.
      * @throws NullPointerException if any of the arguments is null.
      *
@@ -1830,7 +1827,7 @@ cmp:    while (ia < lga) {
         // because we compare code points while String.regionMatches(…) compares characters.
         final int limit  = text.length();
         final int length = part.length();
-        if (fromIndex < 0) { // Not checked before because we want NullPointerException if an argument is null.
+        if (fromIndex < 0) {                // Not checked before because we want NullPointerException if an argument is null.
             return false;
         }
         for (int i=0; i<length;) {
@@ -1851,9 +1848,9 @@ cmp:    while (ia < lga) {
     /**
      * Returns {@code true} if the given character sequence starts with the given prefix.
      *
-     * @param  text        The characters sequence to test.
-     * @param  prefix      The expected prefix.
-     * @param  ignoreCase  {@code true} if the case should be ignored.
+     * @param  text         the characters sequence to test.
+     * @param  prefix       the expected prefix.
+     * @param  ignoreCase   {@code true} if the case should be ignored.
      * @return {@code true} if the given sequence starts with the given prefix.
      * @throws NullPointerException if any of the arguments is null.
      */
@@ -1864,9 +1861,9 @@ cmp:    while (ia < lga) {
     /**
      * Returns {@code true} if the given character sequence ends with the given suffix.
      *
-     * @param  text        The characters sequence to test.
-     * @param  suffix      The expected suffix.
-     * @param  ignoreCase  {@code true} if the case should be ignored.
+     * @param  text         the characters sequence to test.
+     * @param  suffix       the expected suffix.
+     * @param  ignoreCase   {@code true} if the case should be ignored.
      * @return {@code true} if the given sequence ends with the given suffix.
      * @throws NullPointerException if any of the arguments is null.
      */
@@ -1892,9 +1889,9 @@ cmp:    while (ia < lga) {
      * Returns the longest sequence of characters which is found at the beginning of the two
      * given texts. If one of those texts is {@code null}, then the other text is returned.
      *
-     * @param  s1 The first text,  or {@code null}.
-     * @param  s2 The second text, or {@code null}.
-     * @return The common prefix of both texts, or {@code null} if both texts are null.
+     * @param  s1  the first text,  or {@code null}.
+     * @param  s2  the second text, or {@code null}.
+     * @return the common prefix of both texts, or {@code null} if both texts are null.
      */
     public static CharSequence commonPrefix(final CharSequence s1, final CharSequence s2) {
         if (s1 == null) return s2;
@@ -1925,9 +1922,9 @@ cmp:    while (ia < lga) {
      * Returns the longest sequence of characters which is found at the end of the two given texts.
      * If one of those texts is {@code null}, then the other text is returned.
      *
-     * @param  s1 The first text,  or {@code null}.
-     * @param  s2 The second text, or {@code null}.
-     * @return The common suffix of both texts, or {@code null} if both texts are null.
+     * @param  s1  the first text,  or {@code null}.
+     * @param  s2  the second text, or {@code null}.
+     * @return the common suffix of both texts, or {@code null} if both texts are null.
      */
     public static CharSequence commonSuffix(final CharSequence s1, final CharSequence s2) {
         if (s1 == null) return s2;
@@ -1972,9 +1969,9 @@ cmp:    while (ia < lga) {
      *       the same value than for <var>c</var>.</li>
      * </ul>
      *
-     * @param  text The text for which to get the token.
-     * @param  fromIndex Index of the fist character to consider in the given text.
-     * @return A sub-sequence of {@code text} starting at the given offset, or an empty string
+     * @param  text       the text for which to get the token.
+     * @param  fromIndex  index of the fist character to consider in the given text.
+     * @return a sub-sequence of {@code text} starting at the given offset, or an empty string
      *         if there is no non-blank character at or after the given offset.
      * @throws NullPointerException if the {@code text} argument is null.
      */
@@ -2022,10 +2019,10 @@ cmp:    while (ia < lga) {
      *       The {@code toSearch} value is searched verbatim.</li>
      * </ul>
      *
-     * @param  text      The character sequence in which to perform the replacements, or {@code null}.
-     * @param  toSearch  The string to replace.
-     * @param  replaceBy The replacement for the searched string.
-     * @return The given text with replacements applied, or {@code text} if no replacement has been applied,
+     * @param  text       the character sequence in which to perform the replacements, or {@code null}.
+     * @param  toSearch   the string to replace.
+     * @param  replaceBy  the replacement for the searched string.
+     * @return the given text with replacements applied, or {@code text} if no replacement has been applied,
      *         or {@code null} if the given text was null
      *
      * @see String#replace(char, char)
@@ -2057,11 +2054,11 @@ cmp:    while (ia < lga) {
     /**
      * Copies a sequence of characters in the given {@code char[]} array.
      *
-     * @param src       The characters sequence from which to copy characters.
-     * @param srcOffset Index of the first character from {@code src} to copy.
-     * @param dst       The array where to copy the characters.
-     * @param dstOffset Index where to write the first character in {@code dst}.
-     * @param length    Number of characters to copy.
+     * @param src        the characters sequence from which to copy characters.
+     * @param srcOffset  index of the first character from {@code src} to copy.
+     * @param dst        the array where to copy the characters.
+     * @param dstOffset  index where to write the first character in {@code dst}.
+     * @param length     number of characters to copy.
      *
      * @see String#getChars(int, int, char[], int)
      * @see StringBuilder#getChars(int, int, char[], int)

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java?rev=1762647&r1=1762646&r2=1762647&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Localized.java [UTF-8] Wed Sep 28 13:01:39 2016
@@ -44,7 +44,7 @@ public interface Localized {
      * Implementations are encouraged to return a non-null value in every cases.
      * Nevertheless client codes should be prepared to receive null values.
      *
-     * @return The locale, or {@code null} if not explicitly defined.
+     * @return the locale, or {@code null} if not explicitly defined.
      */
     Locale getLocale();
 }

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java?rev=1762647&r1=1762646&r2=1762647&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Numbers.java [UTF-8] Wed Sep 28 13:01:39 2016
@@ -137,10 +137,11 @@ public final class Numbers extends Stati
 
     /**
      * Returns {@code true} if the given {@code type} is a floating point type.
+     * The list of floating point types include primitive and wrapper classes of
+     * {@link Float} and {@link Double}, together with the {@link BigDecimal} class.
      *
-     * @param  type The type to test (may be {@code null}).
-     * @return {@code true} if {@code type} is the primitive or wrapper class of
-     *         {@link Float} or {@link Double}.
+     * @param  type  the type to test (may be {@code null}).
+     * @return {@code true} if {@code type} is one of the known types capable to represent floating point numbers.
      *
      * @see #isInteger(Class)
      */
@@ -154,7 +155,7 @@ public final class Numbers extends Stati
      * {@link Long}, {@code long}, {@link Integer}, {@code int}, {@link Short}, {@code short},
      * {@link Byte}, {@code byte} and {@link BigInteger}.
      *
-     * @param  type The type to test (may be {@code null}).
+     * @param  type  the type to test (may be {@code null}).
      * @return {@code true} if {@code type} is an integer type.
      *
      * @see #isFloat(Class)
@@ -168,8 +169,8 @@ public final class Numbers extends Stati
      * Returns the number of bits used by primitive of the specified type.
      * The given type must be a primitive type or its wrapper class.
      *
-     * @param  type The primitive type (may be {@code null}).
-     * @return The number of bits, or 0 if {@code type} is null.
+     * @param  type  the primitive type (may be {@code null}).
+     * @return the number of bits, or 0 if {@code type} is null.
      * @throws IllegalArgumentException if the given type is unknown.
      */
     public static int primitiveBitCount(final Class<?> type) throws IllegalArgumentException {
@@ -190,8 +191,8 @@ public final class Numbers extends Stati
      * Changes a primitive class to its wrapper (for example {@code int} to {@link Integer}).
      * If the specified class is not a primitive type, then it is returned unchanged.
      *
-     * @param  type The primitive type (may be {@code null}).
-     * @return The type as a wrapper.
+     * @param  type  the primitive type (may be {@code null}).
+     * @return the type as a wrapper.
      *
      * @see #wrapperToPrimitive(Class)
      */
@@ -204,8 +205,8 @@ public final class Numbers extends Stati
      * Changes a wrapper class to its primitive (for example {@link Integer} to {@code int}).
      * If the specified class is not a wrapper type, then it is returned unchanged.
      *
-     * @param  type The wrapper type (may be {@code null}).
-     * @return The type as a primitive.
+     * @param  type  the wrapper type (may be {@code null}).
+     * @return the type as a primitive.
      *
      * @see #primitiveToWrapper(Class)
      */
@@ -222,10 +223,10 @@ public final class Numbers extends Stati
      * <p>If one of the given argument is null, then this method returns the class of the
      * non-null argument. If both arguments are null, then this method returns {@code null}.</p>
      *
-     * @param  n1 The first number, or {@code null}.
-     * @param  n2 The second number, or {@code null}.
-     * @return The widest type of the given numbers, or {@code null} if not {@code n1} and {@code n2} are null.
-     * @throws IllegalArgumentException If a number is not of a known type.
+     * @param  n1  the first number, or {@code null}.
+     * @param  n2  the second number, or {@code null}.
+     * @return the widest type of the given numbers, or {@code null} if not {@code n1} and {@code n2} are null.
+     * @throws IllegalArgumentException if a number is not of a known type.
      *
      * @see #widestClass(Number, Number)
      * @see #narrowestClass(Number, Number)
@@ -253,10 +254,10 @@ public final class Numbers extends Stati
      *
      * returns {@code Long.class}.
      *
-     * @param  c1 The first number type, or {@code null}.
-     * @param  c2 The second number type, or {@code null}.
-     * @return The widest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
-     * @throws IllegalArgumentException If one of the given types is unknown.
+     * @param  c1  the first number type, or {@code null}.
+     * @param  c2  the second number type, or {@code null}.
+     * @return the widest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
+     * @throws IllegalArgumentException if one of the given types is unknown.
      *
      * @see #widestClass(Class, Class)
      * @see #narrowestClass(Number, Number)
@@ -283,10 +284,10 @@ public final class Numbers extends Stati
      * of any of {@link Byte}, {@link Short}, {@link Integer}, {@link Long}, {@link Float}
      * {@link Double}, {@link BigInteger} or {@link BigDecimal} types.
      *
-     * @param  n1 The first number.
-     * @param  n2 The second number.
-     * @return The narrowest type of the given numbers.
-     * @throws IllegalArgumentException If a number is not of a known type.
+     * @param  n1  the first number.
+     * @param  n2  the second number.
+     * @return the narrowest type of the given numbers.
+     * @throws IllegalArgumentException if a number is not of a known type.
      *
      * @see #narrowestClass(Class, Class)
      * @see #widestClass(Class, Class)
@@ -314,10 +315,10 @@ public final class Numbers extends Stati
      *
      * returns {@code Short.class}.
      *
-     * @param  c1 The first number type, or {@code null}.
-     * @param  c2 The second number type, or {@code null}.
-     * @return The narrowest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
-     * @throws IllegalArgumentException If one of the given types is unknown.
+     * @param  c1  the first number type, or {@code null}.
+     * @param  c2  the second number type, or {@code null}.
+     * @return the narrowest of the given types, or {@code null} if both {@code c1} and {@code c2} are null.
+     * @throws IllegalArgumentException if one of the given types is unknown.
      *
      * @see #narrowestClass(Number, Number)
      * @see #widestClass(Class, Class)
@@ -358,8 +359,8 @@ public final class Numbers extends Stati
      *   <li>Otherwise this method returns {@code Long.class};</li>
      * </ul>
      *
-     * @param  value The value to be wrapped in a finer (if possible) {@link Number}.
-     * @return The narrowest type capable to hold the given value.
+     * @param  value  the value to be wrapped in a finer (if possible) {@link Number}.
+     * @return the narrowest type capable to hold the given value.
      *
      * @see #narrowestNumber(Number)
      */
@@ -395,8 +396,8 @@ public final class Numbers extends Stati
      *     return cast(value, narrowestClass(value));
      * }
      *
-     * @param  value The value to be wrapped in a finer (if possible) {@link Number}.
-     * @return The narrowest type capable to hold the given value.
+     * @param  value  the value to be wrapped in a finer (if possible) {@link Number}.
+     * @return the narrowest type capable to hold the given value.
      *
      * @see #narrowestClass(Number)
      * @see #cast(Number, Class)
@@ -415,16 +416,18 @@ public final class Numbers extends Stati
                 final float  floatValue  = (float) doubleValue;
                 isFloat = (doubleToLongBits(floatValue) == doubleToLongBits(doubleValue));
                 if (doubleValue != longValue) {
-                    candidate = isFloat ? ((Number) Float   .valueOf(floatValue))
-                                        : ((Number) Numerics.valueOf(doubleValue));
+                    // Do not use "isFloat ? … : …" operator as it inserts undesired automatic auto-(un)boxing.
+                    if (isFloat) candidate = Float   .valueOf(floatValue);
+                    else         candidate = Numerics.valueOf(doubleValue);
                     break;
                 }
                 // Fall through everywhere.
             }
             case LONG: {
                 if (((int) longValue) != longValue) {
-                    candidate = isFloat ? ((Number) Float.valueOf((float) longValue))
-                                        : ((Number) Long.valueOf(longValue));
+                    // Do not use "isFloat ? … : …" operator as it inserts undesired automatic auto-(un)boxing.
+                    if (isFloat) candidate = Float.valueOf(longValue);
+                    else         candidate = Long .valueOf(longValue);
                     break;
                 }
             }
@@ -452,8 +455,8 @@ public final class Numbers extends Stati
     /**
      * Returns the smallest number capable to hold the specified value.
      *
-     * @param  value The value to be wrapped in a {@link Number}.
-     * @return The narrowest type capable to hold the given value.
+     * @param  value  the value to be wrapped in a {@link Number}.
+     * @return the narrowest type capable to hold the given value.
      * @throws NumberFormatException if the given value can not be parsed as a number.
      *
      * @see #narrowestNumber(Number)
@@ -492,12 +495,11 @@ public final class Numbers extends Stati
      * then the behavior depends on the implementation of the corresponding
      * {@code Number.fooValue()} method - typically, the value is just rounded or truncated.
      *
-     * @param  <N>    The class to cast to.
-     * @param  number The number to cast, or {@code null}.
-     * @param  type   The destination type.
-     * @return The number casted to the given type, or {@code null} if the given value was null.
-     * @throws IllegalArgumentException If the given type is not one of the primitive
-     *         wrappers for numeric types.
+     * @param  <N>     the class to cast to.
+     * @param  number  the number to cast, or {@code null}.
+     * @param  type    the destination type.
+     * @return the number casted to the given type, or {@code null} if the given value was null.
+     * @throws IllegalArgumentException if the given type is not one of the primitive wrappers for numeric types.
      */
     @SuppressWarnings("unchecked")
     public static <N extends Number> N cast(final Number number, final Class<N> type)
@@ -553,13 +555,12 @@ public final class Numbers extends Stati
      * Furthermore, the given value shall be convertible to the given class without precision lost,
      * otherwise an {@link IllegalArgumentException} will be thrown.
      *
-     * @param  <N> The wrapper class.
-     * @param  value The value to wrap.
-     * @param  type The desired wrapper class.
-     * @return The value wrapped in an object of the given class.
-     * @throws IllegalArgumentException If the given type is not one of the primitive
-     *         wrappers for numeric types, or if the given value can not be wrapped in
-     *         an instance of the given class without precision lost.
+     * @param  <N>    the wrapper class.
+     * @param  value  the value to wrap.
+     * @param  type   the desired wrapper class.
+     * @return the value wrapped in an object of the given class.
+     * @throws IllegalArgumentException if the given type is not one of the primitive wrappers for numeric types,
+     *         or if the given value can not be wrapped in an instance of the given class without precision lost.
      */
     @SuppressWarnings("unchecked")
     public static <N extends Number> N wrap(final double value, final Class<N> type)
@@ -584,11 +585,11 @@ public final class Numbers extends Stati
     }
 
     /**
-     * Converts the specified string into a value object. The value object can be an instance of
-     * {@link BigDecimal}, {@link BigInteger},
+     * Converts the specified string into a value object.
+     * The value object can be an instance of {@link BigDecimal}, {@link BigInteger},
      * {@link Double}, {@link Float}, {@link Long}, {@link Integer}, {@link Short}, {@link Byte},
-     * {@link Boolean}, {@link Character} or {@link String} according the specified type. This
-     * method makes the following choice:
+     * {@link Boolean}, {@link Character} or {@link String} according the specified type.
+     * This method makes the following choice:
      *
      * <ul>
      *   <li>If the given type is {@code Double.class}, then this method returns
@@ -598,13 +599,13 @@ public final class Numbers extends Stati
      *   <li>And likewise for all remaining known types.</li>
      * </ul>
      *
-     * @param  <T> The requested type.
-     * @param  value the value to parse.
-     * @param  type The requested type.
-     * @return The value object, or {@code null} if {@code value} was null.
+     * @param  <T>    the requested type.
+     * @param  value  the value to parse.
+     * @param  type   the requested type.
+     * @return the value object, or {@code null} if {@code value} was null.
      * @throws IllegalArgumentException if {@code type} is not a recognized type.
-     * @throws NumberFormatException if {@code type} is a subclass of {@link Number} and the
-     *         string value is not parsable as a number of the specified type.
+     * @throws NumberFormatException if {@code type} is a subclass of {@link Number}
+     *         and the string value is not parsable as a number of the specified type.
      */
     @SuppressWarnings("unchecked")
     public static <T> T valueOf(final String value, final Class<T> type)
@@ -667,9 +668,9 @@ public final class Numbers extends Stati
      * extended to array and collection types because those objects can also be seen as
      * mathematical concepts.
      *
-     * @param  <T> The compile-time type of the requested object.
-     * @param  type The type of the object for which to get a nil value.
-     * @return An object of the given type which represents a nil value, or {@code null}.
+     * @param  <T>   the compile-time type of the requested object.
+     * @param  type  the type of the object for which to get a nil value.
+     * @return an object of the given type which represents a nil value, or {@code null}.
      *
      * @see org.apache.sis.xml.NilObject
      */

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java?rev=1762647&r1=1762646&r2=1762647&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/SimpleInternationalString.java [UTF-8] Wed Sep 28 13:01:39 2016
@@ -23,9 +23,6 @@ import java.io.Serializable;
 import java.util.Locale;
 import org.apache.sis.util.ArgumentChecks;
 
-// Branch-dependent imports
-import java.util.Objects;
-
 
 /**
  * An international string consisting of a single string for all locales.
@@ -58,7 +55,7 @@ public class SimpleInternationalString e
      * to wrap is the more generic {@code CharSequence} interface, then use
      * the {@link Types#toInternationalString(CharSequence)} method instead.
      *
-     * @param text The string for all locales.
+     * @param text the string for all locales.
      */
     public SimpleInternationalString(final String text) {
         ArgumentChecks.ensureNonNull("text", text);
@@ -76,8 +73,8 @@ public class SimpleInternationalString e
     /**
      * Returns the same string for all locales. This is the string given to the constructor.
      *
-     * @param  locale Ignored in the {@code SimpleInternationalString} implementation.
-     * @return The international string as a {@code String}.
+     * @param  locale  ignored in the {@code SimpleInternationalString} implementation.
+     * @return the international string as a {@code String}.
      */
     @Override
     public String toString(final Locale locale) {
@@ -87,14 +84,14 @@ public class SimpleInternationalString e
     /**
      * 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
+    @SuppressWarnings("OverlyStrongTypeCast")
     public boolean equals(final Object object) {
         if (object != null && object.getClass() == getClass()) {
-            final SimpleInternationalString that = (SimpleInternationalString) object;
-            return Objects.equals(this.defaultValue, that.defaultValue);
+            return defaultValue.equals(((SimpleInternationalString) object).defaultValue);
         }
         return false;
     }
@@ -102,7 +99,7 @@ public class SimpleInternationalString e
     /**
      * Returns a hash code value for this international text.
      *
-     * @return The hash code value.
+     * @return the hash code value.
      */
     @Override
     public int hashCode() {
@@ -112,8 +109,8 @@ public class SimpleInternationalString e
     /**
      * Writes the string. This is required since {@link #defaultValue} is not serialized.
      *
-     * @param  out The output stream where to serialize this international string.
-     * @throws IOException If an I/O error occurred while writing.
+     * @param  out  the output stream where to serialize this international string.
+     * @throws IOException if an I/O error occurred while writing.
      */
     private void writeObject(final ObjectOutputStream out) throws IOException {
         out.defaultWriteObject();
@@ -123,9 +120,9 @@ public class SimpleInternationalString e
     /**
      * Reads the string. This is required since {@link #defaultValue} is not serialized.
      *
-     * @param  in The input stream from which to deserialize an international string.
-     * @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 international string.
+     * @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();

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1762647&r1=1762646&r2=1762647&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] Wed Sep 28 13:01:39 2016
@@ -176,8 +176,8 @@ public final class Types extends Static
      * </ul>
      * </div>
      *
-     * @param  code The code for which to get the class name, or {@code null}.
-     * @return The ISO (preferred) or Java (fallback) class name, or {@code null} if the given code is null.
+     * @param  code  the code for which to get the class name, or {@code null}.
+     * @return the ISO (preferred) or Java (fallback) class name, or {@code null} if the given code is null.
      */
     public static String getListName(final CodeList<?> code) {
         if (code == null) {
@@ -201,9 +201,8 @@ public final class Types extends Static
      * </ul>
      * </div>
      *
-     * @param  code The code for which to get the name, or {@code null}.
-     * @return The UML identifiers or programmatic name for the given code,
-     *         or {@code null} if the given code is null.
+     * @param  code  the code for which to get the name, or {@code null}.
+     * @return the UML identifiers or programmatic name for the given code, or {@code null} if the given code is null.
      *
      * @see #getCodeLabel(CodeList)
      * @see #getCodeTitle(CodeList)
@@ -236,8 +235,8 @@ public final class Types extends Static
      * </ul>
      * </div>
      *
-     * @param  code The code from which to get a title, or {@code null}.
-     * @return A unlocalized title for the given code, or {@code null} if the given code is null.
+     * @param  code  the code from which to get a title, or {@code null}.
+     * @return a unlocalized title for the given code, or {@code null} if the given code is null.
      *
      * @see #getCodeName(CodeList)
      * @see #getCodeTitle(CodeList)
@@ -268,8 +267,8 @@ public final class Types extends Static
      * with the {@link #forCodeTitle(CharSequence)} method. See <cite>Substituting a free text by a code list</cite>
      * in this class javadoc for more information.</p>
      *
-     * @param  code The code for which to get the title, or {@code null}.
-     * @return The title, or {@code null} if the given code is null.
+     * @param  code  the code for which to get the title, or {@code null}.
+     * @return the title, or {@code null} if the given code is null.
      *
      * @see #getDescription(CodeList)
      * @see #forCodeTitle(CharSequence)
@@ -283,8 +282,8 @@ public final class Types extends Static
      * For a description of the code list as a whole instead than a particular code,
      * see {@link Types#getDescription(Class)}.
      *
-     * @param  code The code for which to get the localized description, or {@code null}.
-     * @return The description, or {@code null} if none or if the given code is null.
+     * @param  code  the code for which to get the localized description, or {@code null}.
+     * @return the description, or {@code null} if none or if the given code is null.
      *
      * @see #getCodeTitle(CodeList)
      * @see #getDescription(Class)
@@ -303,8 +302,8 @@ public final class Types extends Static
      * Returns a description for the given class, or {@code null} if none.
      * This method can be used for GeoAPI interfaces or {@link CodeList}.
      *
-     * @param  type The GeoAPI interface or code list from which to get the description, or {@code null}.
-     * @return The description, or {@code null} if none or if the given type is {@code null}.
+     * @param  type  the GeoAPI interface or code list from which to get the description, or {@code null}.
+     * @return the description, or {@code null} if none or if the given type is {@code null}.
      *
      * @see #getDescription(CodeList)
      */
@@ -325,9 +324,9 @@ public final class Types extends Static
      * be a UML identifier. If any of the input argument is {@code null}, then
      * this method returns {@code null}.
      *
-     * @param  type     The GeoAPI interface from which to get the description of a property, or {@code null}.
-     * @param  property The ISO name of the property for which to get the description, or {@code null}.
-     * @return The description, or {@code null} if none or if the given type or property name is {@code null}.
+     * @param  type      the GeoAPI interface from which to get the description of a property, or {@code null}.
+     * @param  property  the ISO name of the property for which to get the description, or {@code null}.
+     * @return the description, or {@code null} if none or if the given type or property name is {@code null}.
      */
     public static InternationalString getDescription(final Class<?> type, final String property) {
         if (property != null) {
@@ -366,8 +365,8 @@ public final class Types extends Static
         /**
          * Creates a new international string from the specified resource bundle and key.
          *
-         * @param resources The name of the resource bundle, as a fully qualified class name.
-         * @param key       The key for the resource to fetch.
+         * @param resources  the name of the resource bundle, as a fully qualified class name.
+         * @param key        the key for the resource to fetch.
          */
         Description(final String resources, final String key) {
             super(resources, key);
@@ -440,7 +439,7 @@ public final class Types extends Static
         /**
          * Creates a new international string for the given code list element.
          *
-         * @param code The code list for which to create a title.
+         * @param  code  the code list for which to create a title.
          */
         CodeTitle(final CodeList<?> code) {
             super("org.opengis.metadata.CodeLists", resourceKey(code));
@@ -459,8 +458,8 @@ public final class Types extends Static
     /**
      * Returns the resource name for the given GeoAPI type, or {@code null} if none.
      *
-     * @param  classname The fully qualified name of the GeoAPI type.
-     * @return The resource bundle to load, or {@code null} if none.
+     * @param  classname  the fully qualified name of the GeoAPI type.
+     * @return the resource bundle to load, or {@code null} if none.
      */
     static String getResources(final String classname) {
         String resources = "org.opengis.metadata.Descriptions";
@@ -476,9 +475,9 @@ public final class Types extends Static
      * Note that the size of the returned array may growth between different invocations of this method,
      * since users can add their own codes to an existing list.
      *
-     * @param <T> The compile-time type given as the {@code codeType} parameter.
-     * @param codeType The type of code list.
-     * @return The list of values for the given code list, or an empty array if none.
+     * @param  <T>       the compile-time type given as the {@code codeType} parameter.
+     * @param  codeType  the type of code list.
+     * @return the list of values for the given code list, or an empty array if none.
      *
      * @see Class#getEnumConstants()
      */
@@ -517,8 +516,8 @@ public final class Types extends Static
      * Only identifiers for the stable part of GeoAPI are recognized. This method does not handle
      * the identifiers for the {@code geoapi-pending} module.
      *
-     * @param  identifier The ISO {@linkplain UML} identifier, or {@code null}.
-     * @return The GeoAPI interface, or {@code null} if the given identifier is {@code null} or unknown.
+     * @param  identifier  the ISO {@linkplain UML} identifier, or {@code null}.
+     * @return the GeoAPI interface, or {@code null} if the given identifier is {@code null} or unknown.
      */
     public static synchronized Class<?> forStandardName(final String identifier) {
         if (identifier == null) {
@@ -568,10 +567,10 @@ public final class Types extends Static
      * If there is no match, this method returns {@code null} — it does not thrown an exception,
      * unless the given class is not an enumeration.
      *
-     * @param <T>      The compile-time type given as the {@code enumType} parameter.
-     * @param enumType The type of enumeration.
-     * @param name     The name of the enumeration value to obtain, or {@code null}.
-     * @return A value matching the given name, or {@code null} if the name is null
+     * @param  <T>       the compile-time type given as the {@code enumType} parameter.
+     * @param  enumType  the type of enumeration.
+     * @param  name      the name of the enumeration value to obtain, or {@code null}.
+     * @return a value matching the given name, or {@code null} if the name is null
      *         or if no matching enumeration is found.
      *
      * @see Enum#valueOf(Class, String)
@@ -610,11 +609,11 @@ public final class Types extends Static
      * If no match is found, then a new code is created only if the {@code canCreate} argument is {@code true}.
      * Otherwise this method returns {@code null}.
      *
-     * @param <T>        The compile-time type given as the {@code codeType} parameter.
-     * @param codeType   The type of code list.
-     * @param name       The name of the code to obtain, or {@code null}.
-     * @param canCreate  {@code true} if this method is allowed to create new code.
-     * @return A code matching the given name, or {@code null} if the name is null
+     * @param  <T>        the compile-time type given as the {@code codeType} parameter.
+     * @param  codeType   the type of code list.
+     * @param  name       the name of the code to obtain, or {@code null}.
+     * @param  canCreate  {@code true} if this method is allowed to create new code.
+     * @return a code matching the given name, or {@code null} if the name is null
      *         or if no matching code is found and {@code canCreate} is {@code false}.
      *
      * @see #getCodeName(CodeList)
@@ -648,8 +647,8 @@ public final class Types extends Static
      *   <li>Otherwise returns {@code null}.</li>
      * </ul>
      *
-     * @param  title The title for which to get a code or enumeration value, or {@code null}.
-     * @return The code or enumeration value associated with the given title, or {@code null}.
+     * @param  title  the title for which to get a code or enumeration value, or {@code null}.
+     * @return the code or enumeration value associated with the given title, or {@code null}.
      *
      * @since 0.7
      *
@@ -677,11 +676,11 @@ public final class Types extends Static
      *   <li>The value for the decoded locale is added in the international string to be returned.</li>
      * </ul>
      *
-     * @param  properties The map from which to get the string values for an international string, or {@code null}.
-     * @param  prefix     The prefix of keys to use for creating the international string.
-     * @return The international string, or {@code null} if the given map is null or does not contain values
+     * @param  properties  the map from which to get the string values for an international string, or {@code null}.
+     * @param  prefix      the prefix of keys to use for creating the international string.
+     * @return the international string, or {@code null} if the given map is null or does not contain values
      *         associated to keys starting with the given prefix.
-     * @throws IllegalArgumentException If a key starts by the given prefix and:
+     * @throws IllegalArgumentException if a key starts by the given prefix and:
      *         <ul>
      *           <li>The key suffix is an illegal {@link Locale} code,</li>
      *           <li>or the value associated to that key is a not a {@link CharSequence}.</li>
@@ -773,9 +772,8 @@ public final class Types extends Static
      * Otherwise, this method copies the {@link InternationalString#toString()} value in a new
      * {@link SimpleInternationalString} instance and returns it.
      *
-     * @param  string The characters sequence to convert, or {@code null}.
-     * @return The given sequence as an international string,
-     *         or {@code null} if the given sequence was null.
+     * @param  string  the characters sequence to convert, or {@code null}.
+     * @return the given sequence as an international string, or {@code null} if the given sequence was null.
      *
      * @see DefaultNameFactory#createInternationalString(Map)
      */
@@ -796,8 +794,8 @@ public final class Types extends Static
      * <p>If a defensive copy of the {@code strings} array is wanted, then the caller needs to check
      * if the returned array is the same instance than the one given in argument to this method.</p>
      *
-     * @param  strings The characters sequences to convert, or {@code null}.
-     * @return The given array as an array of type {@code InternationalString[]},
+     * @param  strings  the characters sequences to convert, or {@code null}.
+     * @return the given array as an array of type {@code InternationalString[]},
      *         or {@code null} if the given array was null.
      */
     public static InternationalString[] toInternationalStrings(final CharSequence... strings) {

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java?rev=1762647&r1=1762646&r2=1762647&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/logging/WarningListeners.java [UTF-8] Wed Sep 28 13:01:39 2016
@@ -138,6 +138,7 @@ public class WarningListeners<S> impleme
     /**
      * Reports a warning represented by the given message and exception.
      * At least one of {@code message} and {@code exception} shall be non-null.
+     * If both are non-null, then the exception message will be concatenated after the given message.
      *
      * <div class="section">Stack trace omission</div>
      * If there is no registered listener, then the {@link #warning(LogRecord)} method will send the record to the

Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java?rev=1762647&r1=1762646&r2=1762647&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.java [UTF-8] Wed Sep 28 13:01:39 2016
@@ -151,6 +151,11 @@ public final class Errors extends Indexe
         public static final short CanNotParseFile_2 = 8;
 
         /**
+         * Can not read property “{1}” in file “{0}”.
+         */
+        public static final short CanNotReadPropertyInFile_2 = 237;
+
+        /**
          * Can not read “{0}”.
          */
         public static final short CanNotRead_1 = 9;
@@ -872,6 +877,11 @@ public final class Errors extends Indexe
         public static final short NotABackwardReference_1 = 199;
 
         /**
+         * “{0}” is not a key-value pair.
+         */
+        public static final short NotAKeyValuePair_1 = 236;
+
+        /**
          * Argument ‘{0}’ shall not be NaN (Not-a-Number).
          */
         public static final short NotANumber_1 = 89;
@@ -1256,7 +1266,7 @@ public final class Errors extends Indexe
     /**
      * 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.
      */
     Errors(final URL resources) {
@@ -1287,8 +1297,8 @@ public final class Errors extends Indexe
      * for the {@link #LOCALE_KEY} entry. If the given map is null, or contains no entry for the locale key,
      * or the value is not an instance of {@link Locale}, then this method fallback on the default locale.
      *
-     * @param  properties The map of properties, or {@code null} if none.
-     * @return Resources in the given locale.
+     * @param  properties the map of properties, or {@code null} if none.
+     * @return resources in the given locale.
      * @throws MissingResourceException if resources can't be found.
      *
      * @since 0.4
@@ -1300,9 +1310,9 @@ public final class Errors extends Indexe
     /**
      * 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((Locale) null).getString(key);
@@ -1312,10 +1322,10 @@ public final class Errors extends Indexe
      * 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
@@ -1327,11 +1337,11 @@ public final class Errors extends Indexe
      * 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,
@@ -1344,12 +1354,12 @@ public final class Errors extends Indexe
      * 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,
@@ -1363,13 +1373,13 @@ public final class Errors extends Indexe
      * 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,
@@ -1399,8 +1409,8 @@ public final class Errors extends Indexe
      * 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);
@@ -1416,9 +1426,9 @@ public final class Errors extends Indexe
      * 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);
@@ -1429,9 +1439,9 @@ public final class Errors extends Indexe
      * 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);




Mime
View raw message