diff -r bb38b4bc2063 -r 394ab6a6658d jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template --- a/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template Thu Aug 13 09:35:45 2015 +0300 +++ b/jdk/src/java.base/share/classes/java/nio/charset/Charset-X-Coder.java.template Thu Aug 13 12:40:07 2015 +0300 @@ -55,12 +55,12 @@ * has not been used before;

* *
  • Invoke the {@link #$code$ $code$} method zero or more times, as - * long as additional input may be available, passing false for the - * endOfInput argument and filling the input buffer and flushing the + * long as additional input may be available, passing {@code false} for the + * {@code endOfInput} argument and filling the input buffer and flushing the * output buffer between invocations;

  • * *
  • Invoke the {@link #$code$ $code$} method one final time, passing - * true for the endOfInput argument; and then

  • + * {@code true} for the {@code endOfInput} argument; and then

    * *
  • Invoke the {@link #flush flush} method so that the $coder$ can * flush any internal state to the output buffer.

  • @@ -175,7 +175,7 @@ * $otype$s that will be produced for each input $itype$ * * @param replacement - * The initial replacement; must not be null, must have + * The initial replacement; must not be {@code null}, must have * non-zero length, must not be longer than max$ItypesPerOtype$, * and must be {@linkplain #isLegalReplacement legal} * @@ -248,7 +248,7 @@ * Returns this $coder$'s replacement value. * * @return This $coder$'s current replacement, - * which is never null and is never empty + * which is never {@code null} and is never empty */ public final $replType$ replacement() { #if[decoder] @@ -267,7 +267,7 @@ * replacement is acceptable.

    * * @param newReplacement The new replacement; must not be - * null, must have non-zero length, + * {@code null}, must have non-zero length, #if[decoder] * and must not be longer than the value returned by the * {@link #max$ItypesPerOtype$() max$ItypesPerOtype$} method @@ -332,7 +332,7 @@ * * @param repl The byte array to be tested * - * @return true if, and only if, the given byte array + * @return {@code true} if, and only if, the given byte array * is a legal replacement value for this encoder */ public boolean isLegalReplacement(byte[] repl) { @@ -358,7 +358,7 @@ /** * Returns this $coder$'s current action for malformed-input errors. * - * @return The current malformed-input action, which is never null + * @return The current malformed-input action, which is never {@code null} */ public CodingErrorAction malformedInputAction() { return malformedInputAction; @@ -370,7 +370,7 @@ *

    This method invokes the {@link #implOnMalformedInput * implOnMalformedInput} method, passing the new action.

    * - * @param newAction The new action; must not be null + * @param newAction The new action; must not be {@code null} * * @return This $coder$ * @@ -400,7 +400,7 @@ * Returns this $coder$'s current action for unmappable-character errors. * * @return The current unmappable-character action, which is never - * null + * {@code null} */ public CodingErrorAction unmappableCharacterAction() { return unmappableCharacterAction; @@ -412,7 +412,7 @@ *

    This method invokes the {@link #implOnUnmappableCharacter * implOnUnmappableCharacter} method, passing the new action.

    * - * @param newAction The new action; must not be null + * @param newAction The new action; must not be {@code null} * * @return This $coder$ * @@ -521,16 +521,16 @@ * operation then care should be taken to preserve any $itype$s remaining * in the input buffer so that they are available to the next invocation. * - *

    The endOfInput parameter advises this method as to whether + *

    The {@code endOfInput} parameter advises this method as to whether * the invoker can provide further input beyond that contained in the given * input buffer. If there is a possibility of providing additional input - * then the invoker should pass false for this parameter; if there + * then the invoker should pass {@code false} for this parameter; if there * is no possibility of providing further input then the invoker should - * pass true. It is not erroneous, and in fact it is quite - * common, to pass false in one invocation and later discover that + * pass {@code true}. It is not erroneous, and in fact it is quite + * common, to pass {@code false} in one invocation and later discover that * no further input was actually available. It is critical, however, that * the final invocation of this method in a sequence of invocations always - * pass true so that any remaining un$code$d input will be treated + * pass {@code true} so that any remaining un$code$d input will be treated * as being malformed. * *

    This method works by invoking the {@link #$code$Loop $code$Loop} @@ -545,7 +545,7 @@ * The output $otype$ buffer * * @param endOfInput - * true if, and only if, the invoker can provide no + * {@code true} if, and only if, the invoker can provide no * additional input $itype$s beyond those in the given buffer * * @return A coder-result object describing the reason for termination @@ -553,9 +553,9 @@ * @throws IllegalStateException * If $a$ $coding$ operation is already in progress and the previous * step was an invocation neither of the {@link #reset reset} - * method, nor of this method with a value of false for - * the endOfInput parameter, nor of this method with a - * value of true for the endOfInput parameter + * method, nor of this method with a value of {@code false} for + * the {@code endOfInput} parameter, nor of this method with a + * value of {@code true} for the {@code endOfInput} parameter * but a return value indicating an incomplete $coding$ operation * * @throws CoderMalfunctionError @@ -659,7 +659,7 @@ * invocation neither of the {@link #flush flush} method nor of * the three-argument {@link * #$code$($Itype$Buffer,$Otype$Buffer,boolean) $code$} method - * with a value of true for the endOfInput + * with a value of {@code true} for the {@code endOfInput} * parameter */ public final CoderResult flush($Otype$Buffer out) { @@ -824,10 +824,10 @@ * Tells whether or not this decoder implements an auto-detecting charset. * *

    The default implementation of this method always returns - * false; it should be overridden by auto-detecting decoders to - * return true.

    + * {@code false}; it should be overridden by auto-detecting decoders to + * return {@code true}.

    * - * @return true if, and only if, this decoder implements an + * @return {@code true} if, and only if, this decoder implements an * auto-detecting charset */ public boolean isAutoDetecting() { @@ -840,21 +840,21 @@ * *

    If this decoder implements an auto-detecting charset then at a * single point during a decoding operation this method may start returning - * true to indicate that a specific charset has been detected in + * {@code true} to indicate that a specific charset has been detected in * the input byte sequence. Once this occurs, the {@link #detectedCharset * detectedCharset} method may be invoked to retrieve the detected charset. * - *

    That this method returns false does not imply that no bytes + *

    That this method returns {@code false} does not imply that no bytes * have yet been decoded. Some auto-detecting decoders are capable of * decoding some, or even all, of an input byte sequence without fixing on * a particular charset. * *

    The default implementation of this method always throws an {@link * UnsupportedOperationException}; it should be overridden by - * auto-detecting decoders to return true once the input charset + * auto-detecting decoders to return {@code true} once the input charset * has been determined.

    * - * @return true if, and only if, this decoder has detected a + * @return {@code true} if, and only if, this decoder has detected a * specific charset * * @throws UnsupportedOperationException @@ -880,7 +880,7 @@ * auto-detecting decoders to return the appropriate value.

    * * @return The charset detected by this auto-detecting decoder, - * or null if the charset has not yet been determined + * or {@code null} if the charset has not yet been determined * * @throws IllegalStateException * If insufficient bytes have been read to determine a charset @@ -920,7 +920,7 @@ /** * Tells whether or not this encoder can encode the given character. * - *

    This method returns false if the given character is a + *

    This method returns {@code false} if the given character is a * surrogate character; such characters can be interpreted only when they * are members of a pair consisting of a high surrogate followed by a low * surrogate. The {@link #canEncode(java.lang.CharSequence) @@ -937,7 +937,7 @@ * @param c * The given character * - * @return true if, and only if, this encoder can encode + * @return {@code true} if, and only if, this encoder can encode * the given character * * @throws IllegalStateException @@ -954,7 +954,7 @@ * Tells whether or not this encoder can encode the given character * sequence. * - *

    If this method returns false for a particular character + *

    If this method returns {@code false} for a particular character * sequence then more information about why the sequence cannot be encoded * may be obtained by performing a full encoding * operation. @@ -968,7 +968,7 @@ * @param cs * The given character sequence * - * @return true if, and only if, this encoder can encode + * @return {@code true} if, and only if, this encoder can encode * the given character without throwing any exceptions and without * performing any replacements *