You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2014/08/21 17:09:07 UTC

svn commit: r1619429 [5/5] - in /httpcomponents: contrib/httpcore/trunk/src/main/java/org/apache/http/contrib/sip/ httpasyncclient/trunk/httpasyncclient/src/main/java-deprecated/org/apache/http/nio/conn/scheme/ httpasyncclient/trunk/httpasyncclient/src...

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/ByteArrayBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/ByteArrayBuffer.java?rev=1619429&r1=1619428&r2=1619429&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/ByteArrayBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/ByteArrayBuffer.java Thu Aug 21 15:09:04 2014
@@ -63,16 +63,16 @@ public final class ByteArrayBuffer imple
     }
 
     /**
-     * Appends <code>len</code> bytes to this buffer from the given source
-     * array starting at index <code>off</code>. The capacity of the buffer
-     * is increased, if necessary, to accommodate all <code>len</code> bytes.
+     * Appends {@code len} bytes to this buffer from the given source
+     * array starting at index {@code off}. The capacity of the buffer
+     * is increased, if necessary, to accommodate all {@code len} bytes.
      *
      * @param   b        the bytes to be appended.
      * @param   off      the index of the first byte to append.
      * @param   len      the number of bytes to append.
-     * @throws IndexOutOfBoundsException if <code>off</code> if out of
-     * range, <code>len</code> is negative, or
-     * <code>off</code> + <code>len</code> is out of range.
+     * @throws IndexOutOfBoundsException if {@code off} if out of
+     * range, {@code len} is negative, or
+     * {@code off} + {@code len} is out of range.
      */
     public void append(final byte[] b, final int off, final int len) {
         if (b == null) {
@@ -94,7 +94,7 @@ public final class ByteArrayBuffer imple
     }
 
     /**
-     * Appends <code>b</code> byte to this buffer. The capacity of the buffer
+     * Appends {@code b} byte to this buffer. The capacity of the buffer
      * is increased, if necessary, to accommodate the additional byte.
      *
      * @param   b        the byte to be appended.
@@ -109,18 +109,18 @@ public final class ByteArrayBuffer imple
     }
 
     /**
-     * Appends <code>len</code> chars to this buffer from the given source
-     * array starting at index <code>off</code>. The capacity of the buffer
-     * is increased if necessary to accommodate all <code>len</code> chars.
+     * Appends {@code len} chars to this buffer from the given source
+     * array starting at index {@code off}. The capacity of the buffer
+     * is increased if necessary to accommodate all {@code len} chars.
      * <p>
      * The chars are converted to bytes using simple cast.
      *
      * @param   b        the chars to be appended.
      * @param   off      the index of the first char to append.
      * @param   len      the number of bytes to append.
-     * @throws IndexOutOfBoundsException if <code>off</code> if out of
-     * range, <code>len</code> is negative, or
-     * <code>off</code> + <code>len</code> is out of range.
+     * @throws IndexOutOfBoundsException if {@code off} if out of
+     * range, {@code len} is negative, or
+     * {@code off} + {@code len} is out of range.
      */
     public void append(final char[] b, final int off, final int len) {
         if (b == null) {
@@ -145,19 +145,19 @@ public final class ByteArrayBuffer imple
     }
 
     /**
-     * Appends <code>len</code> chars to this buffer from the given source
-     * char array buffer starting at index <code>off</code>. The capacity
+     * Appends {@code len} chars to this buffer from the given source
+     * char array buffer starting at index {@code off}. The capacity
      * of the buffer is increased if necessary to accommodate all
-     * <code>len</code> chars.
+     * {@code len} chars.
      * <p>
      * The chars are converted to bytes using simple cast.
      *
      * @param   b        the chars to be appended.
      * @param   off      the index of the first char to append.
      * @param   len      the number of bytes to append.
-     * @throws IndexOutOfBoundsException if <code>off</code> if out of
-     * range, <code>len</code> is negative, or
-     * <code>off</code> + <code>len</code> is out of range.
+     * @throws IndexOutOfBoundsException if {@code off} if out of
+     * range, {@code len} is negative, or
+     * {@code off} + {@code len} is out of range.
      */
     public void append(final CharArrayBuffer b, final int off, final int len) {
         if (b == null) {
@@ -187,13 +187,13 @@ public final class ByteArrayBuffer imple
     }
 
     /**
-     * Returns the <code>byte</code> value in this buffer at the specified
+     * Returns the {@code byte} value in this buffer at the specified
      * index. The index argument must be greater than or equal to
-     * <code>0</code>, and less than the length of this buffer.
+     * {@code 0}, and less than the length of this buffer.
      *
      * @param      i   the index of the desired byte value.
      * @return     the byte value at the specified index.
-     * @throws     IndexOutOfBoundsException  if <code>index</code> is
+     * @throws     IndexOutOfBoundsException  if {@code index} is
      *             negative or greater than or equal to {@link #length()}.
      */
     public int byteAt(final int i) {
@@ -223,7 +223,7 @@ public final class ByteArrayBuffer imple
     /**
      * Ensures that the capacity is at least equal to the specified minimum.
      * If the current capacity is less than the argument, then a new internal
-     * array is allocated with greater capacity. If the <code>required</code>
+     * array is allocated with greater capacity. If the {@code required}
      * argument is non-positive, this method takes no action.
      *
      * @param   required   the minimum required capacity.
@@ -252,12 +252,12 @@ public final class ByteArrayBuffer imple
     /**
      * Sets the length of the buffer. The new length value is expected to be
      * less than the current capacity and greater than or equal to
-     * <code>0</code>.
+     * {@code 0}.
      *
      * @param      len   the new length
      * @throws     IndexOutOfBoundsException  if the
-     *               <code>len</code> argument is greater than the current
-     *               capacity of the buffer or less than <code>0</code>.
+     *               {@code len} argument is greater than the current
+     *               capacity of the buffer or less than {@code 0}.
      */
     public void setLength(final int len) {
         if (len < 0 || len > this.buffer.length) {
@@ -267,9 +267,9 @@ public final class ByteArrayBuffer imple
     }
 
     /**
-     * Returns <code>true</code> if this buffer is empty, that is, its
-     * {@link #length()} is equal to <code>0</code>.
-     * @return <code>true</code> if this buffer is empty, <code>false</code>
+     * Returns {@code true} if this buffer is empty, that is, its
+     * {@link #length()} is equal to {@code 0}.
+     * @return {@code true} if this buffer is empty, {@code false}
      *   otherwise.
      */
     public boolean isEmpty() {
@@ -277,9 +277,9 @@ public final class ByteArrayBuffer imple
     }
 
     /**
-     * Returns <code>true</code> if this buffer is full, that is, its
+     * Returns {@code true} if this buffer is full, that is, its
      * {@link #length()} is equal to its {@link #capacity()}.
-     * @return <code>true</code> if this buffer is full, <code>false</code>
+     * @return {@code true} if this buffer is full, {@code false}
      *   otherwise.
      */
     public boolean isFull() {
@@ -289,22 +289,22 @@ public final class ByteArrayBuffer imple
     /**
      * Returns the index within this buffer of the first occurrence of the
      * specified byte, starting the search at the specified
-     * <code>beginIndex</code> and finishing at <code>endIndex</code>.
+     * {@code beginIndex} and finishing at {@code endIndex}.
      * If no such byte occurs in this buffer within the specified bounds,
-     * <code>-1</code> is returned.
+     * {@code -1} is returned.
      * <p>
-     * There is no restriction on the value of <code>beginIndex</code> and
-     * <code>endIndex</code>. If <code>beginIndex</code> is negative,
-     * it has the same effect as if it were zero. If <code>endIndex</code> is
+     * There is no restriction on the value of {@code beginIndex} and
+     * {@code endIndex}. If {@code beginIndex} is negative,
+     * it has the same effect as if it were zero. If {@code endIndex} is
      * greater than {@link #length()}, it has the same effect as if it were
-     * {@link #length()}. If the <code>beginIndex</code> is greater than
-     * the <code>endIndex</code>, <code>-1</code> is returned.
+     * {@link #length()}. If the {@code beginIndex} is greater than
+     * the {@code endIndex}, {@code -1} is returned.
      *
      * @param   b            the byte to search for.
      * @param   from         the index to start the search from.
      * @param   to           the index to finish the search at.
      * @return  the index of the first occurrence of the byte in the buffer
-     *   within the given bounds, or <code>-1</code> if the byte does
+     *   within the given bounds, or {@code -1} if the byte does
      *   not occur.
      *
      * @since 4.1
@@ -331,13 +331,13 @@ public final class ByteArrayBuffer imple
 
     /**
      * Returns the index within this buffer of the first occurrence of the
-     * specified byte, starting the search at <code>0</code> and finishing
+     * specified byte, starting the search at {@code 0} and finishing
      * at {@link #length()}. If no such byte occurs in this buffer within
-     * those bounds, <code>-1</code> is returned.
+     * those bounds, {@code -1} is returned.
      *
      * @param   b   the byte to search for.
      * @return  the index of the first occurrence of the byte in the
-     *   buffer, or <code>-1</code> if the byte does not occur.
+     *   buffer, or {@code -1} if the byte does not occur.
      *
      * @since 4.1
      */

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/CharArrayBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/CharArrayBuffer.java?rev=1619429&r1=1619428&r2=1619429&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/CharArrayBuffer.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/CharArrayBuffer.java Thu Aug 21 15:09:04 2014
@@ -65,16 +65,16 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Appends <code>len</code> chars to this buffer from the given source
-     * array starting at index <code>off</code>. The capacity of the buffer
-     * is increased, if necessary, to accommodate all <code>len</code> chars.
+     * Appends {@code len} chars to this buffer from the given source
+     * array starting at index {@code off}. The capacity of the buffer
+     * is increased, if necessary, to accommodate all {@code len} chars.
      *
      * @param   b        the chars to be appended.
      * @param   off      the index of the first char to append.
      * @param   len      the number of chars to append.
-     * @throws IndexOutOfBoundsException if <code>off</code> is out of
-     * range, <code>len</code> is negative, or
-     * <code>off</code> + <code>len</code> is out of range.
+     * @throws IndexOutOfBoundsException if {@code off} is out of
+     * range, {@code len} is negative, or
+     * {@code off} + {@code len} is out of range.
      */
     public void append(final char[] b, final int off, final int len) {
         if (b == null) {
@@ -113,17 +113,17 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Appends <code>len</code> chars to this buffer from the given source
-     * buffer starting at index <code>off</code>. The capacity of the
+     * Appends {@code len} chars to this buffer from the given source
+     * buffer starting at index {@code off}. The capacity of the
      * destination buffer is increased, if necessary, to accommodate all
-     * <code>len</code> chars.
+     * {@code len} chars.
      *
      * @param   b        the source buffer to be appended.
      * @param   off      the index of the first char to append.
      * @param   len      the number of chars to append.
-     * @throws IndexOutOfBoundsException if <code>off</code> is out of
-     * range, <code>len</code> is negative, or
-     * <code>off</code> + <code>len</code> is out of range.
+     * @throws IndexOutOfBoundsException if {@code off} is out of
+     * range, {@code len} is negative, or
+     * {@code off} + {@code len} is out of range.
      */
     public void append(final CharArrayBuffer b, final int off, final int len) {
         if (b == null) {
@@ -134,7 +134,7 @@ public final class CharArrayBuffer imple
 
     /**
      * Appends all chars to this buffer from the given source buffer starting
-     * at index <code>0</code>. The capacity of the destination buffer is
+     * at index {@code 0}. The capacity of the destination buffer is
      * increased, if necessary, to accommodate all {@link #length()} chars.
      *
      * @param   b        the source buffer to be appended.
@@ -147,7 +147,7 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Appends <code>ch</code> char to this buffer. The capacity of the buffer
+     * Appends {@code ch} char to this buffer. The capacity of the buffer
      * is increased, if necessary, to accommodate the additional char.
      *
      * @param   ch        the char to be appended.
@@ -162,18 +162,18 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Appends <code>len</code> bytes to this buffer from the given source
-     * array starting at index <code>off</code>. The capacity of the buffer
-     * is increased, if necessary, to accommodate all <code>len</code> bytes.
+     * Appends {@code len} bytes to this buffer from the given source
+     * array starting at index {@code off}. The capacity of the buffer
+     * is increased, if necessary, to accommodate all {@code len} bytes.
      * <p>
      * The bytes are converted to chars using simple cast.
      *
      * @param   b        the bytes to be appended.
      * @param   off      the index of the first byte to append.
      * @param   len      the number of bytes to append.
-     * @throws IndexOutOfBoundsException if <code>off</code> is out of
-     * range, <code>len</code> is negative, or
-     * <code>off</code> + <code>len</code> is out of range.
+     * @throws IndexOutOfBoundsException if {@code off} is out of
+     * range, {@code len} is negative, or
+     * {@code off} + {@code len} is out of range.
      */
     public void append(final byte[] b, final int off, final int len) {
         if (b == null) {
@@ -198,18 +198,18 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Appends <code>len</code> bytes to this buffer from the given source
-     * array starting at index <code>off</code>. The capacity of the buffer
-     * is increased, if necessary, to accommodate all <code>len</code> bytes.
+     * Appends {@code len} bytes to this buffer from the given source
+     * array starting at index {@code off}. The capacity of the buffer
+     * is increased, if necessary, to accommodate all {@code len} bytes.
      * <p>
      * The bytes are converted to chars using simple cast.
      *
      * @param   b        the bytes to be appended.
      * @param   off      the index of the first byte to append.
      * @param   len      the number of bytes to append.
-     * @throws IndexOutOfBoundsException if <code>off</code> is out of
-     * range, <code>len</code> is negative, or
-     * <code>off</code> + <code>len</code> is out of range.
+     * @throws IndexOutOfBoundsException if {@code off} is out of
+     * range, {@code len} is negative, or
+     * {@code off} + {@code len} is out of range.
      */
     public void append(final ByteArrayBuffer b, final int off, final int len) {
         if (b == null) {
@@ -250,13 +250,13 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Returns the <code>char</code> value in this buffer at the specified
+     * Returns the {@code char} value in this buffer at the specified
      * index. The index argument must be greater than or equal to
-     * <code>0</code>, and less than the length of this buffer.
+     * {@code 0}, and less than the length of this buffer.
      *
      * @param      i   the index of the desired char value.
      * @return     the char value at the specified index.
-     * @throws     IndexOutOfBoundsException  if <code>index</code> is
+     * @throws     IndexOutOfBoundsException  if {@code index} is
      *             negative or greater than or equal to {@link #length()}.
      */
     public char charAt(final int i) {
@@ -295,7 +295,7 @@ public final class CharArrayBuffer imple
     /**
      * Ensures that the capacity is at least equal to the specified minimum.
      * If the current capacity is less than the argument, then a new internal
-     * array is allocated with greater capacity. If the <code>required</code>
+     * array is allocated with greater capacity. If the {@code required}
      * argument is non-positive, this method takes no action.
      *
      * @param   required   the minimum required capacity.
@@ -313,12 +313,12 @@ public final class CharArrayBuffer imple
     /**
      * Sets the length of the buffer. The new length value is expected to be
      * less than the current capacity and greater than or equal to
-     * <code>0</code>.
+     * {@code 0}.
      *
      * @param      len   the new length
      * @throws     IndexOutOfBoundsException  if the
-     *               <code>len</code> argument is greater than the current
-     *               capacity of the buffer or less than <code>0</code>.
+     *               {@code len} argument is greater than the current
+     *               capacity of the buffer or less than {@code 0}.
      */
     public void setLength(final int len) {
         if (len < 0 || len > this.buffer.length) {
@@ -328,9 +328,9 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Returns <code>true</code> if this buffer is empty, that is, its
-     * {@link #length()} is equal to <code>0</code>.
-     * @return <code>true</code> if this buffer is empty, <code>false</code>
+     * Returns {@code true} if this buffer is empty, that is, its
+     * {@link #length()} is equal to {@code 0}.
+     * @return {@code true} if this buffer is empty, {@code false}
      *   otherwise.
      */
     public boolean isEmpty() {
@@ -338,9 +338,9 @@ public final class CharArrayBuffer imple
     }
 
     /**
-     * Returns <code>true</code> if this buffer is full, that is, its
+     * Returns {@code true} if this buffer is full, that is, its
      * {@link #length()} is equal to its {@link #capacity()}.
-     * @return <code>true</code> if this buffer is full, <code>false</code>
+     * @return {@code true} if this buffer is full, {@code false}
      *   otherwise.
      */
     public boolean isFull() {
@@ -350,22 +350,22 @@ public final class CharArrayBuffer imple
     /**
      * Returns the index within this buffer of the first occurrence of the
      * specified character, starting the search at the specified
-     * <code>beginIndex</code> and finishing at <code>endIndex</code>.
+     * {@code beginIndex} and finishing at {@code endIndex}.
      * If no such character occurs in this buffer within the specified bounds,
-     * <code>-1</code> is returned.
+     * {@code -1} is returned.
      * <p>
-     * There is no restriction on the value of <code>beginIndex</code> and
-     * <code>endIndex</code>. If <code>beginIndex</code> is negative,
-     * it has the same effect as if it were zero. If <code>endIndex</code> is
+     * There is no restriction on the value of {@code beginIndex} and
+     * {@code endIndex}. If {@code beginIndex} is negative,
+     * it has the same effect as if it were zero. If {@code endIndex} is
      * greater than {@link #length()}, it has the same effect as if it were
-     * {@link #length()}. If the <code>beginIndex</code> is greater than
-     * the <code>endIndex</code>, <code>-1</code> is returned.
+     * {@link #length()}. If the {@code beginIndex} is greater than
+     * the {@code endIndex}, {@code -1} is returned.
      *
      * @param   ch     the char to search for.
      * @param   from   the index to start the search from.
      * @param   to     the index to finish the search at.
      * @return  the index of the first occurrence of the character in the buffer
-     *   within the given bounds, or <code>-1</code> if the character does
+     *   within the given bounds, or {@code -1} if the character does
      *   not occur.
      */
     public int indexOf(final int ch, final int from, final int to) {
@@ -390,13 +390,13 @@ public final class CharArrayBuffer imple
 
     /**
      * Returns the index within this buffer of the first occurrence of the
-     * specified character, starting the search at <code>0</code> and finishing
+     * specified character, starting the search at {@code 0} and finishing
      * at {@link #length()}. If no such character occurs in this buffer within
-     * those bounds, <code>-1</code> is returned.
+     * those bounds, {@code -1} is returned.
      *
      * @param   ch          the char to search for.
      * @return  the index of the first occurrence of the character in the
-     *   buffer, or <code>-1</code> if the character does not occur.
+     *   buffer, or {@code -1} if the character does not occur.
      */
     public int indexOf(final int ch) {
         return indexOf(ch, 0, this.len);
@@ -404,17 +404,17 @@ public final class CharArrayBuffer imple
 
     /**
      * Returns a substring of this buffer. The substring begins at the specified
-     * <code>beginIndex</code> and extends to the character at index
-     * <code>endIndex - 1</code>.
+     * {@code beginIndex} and extends to the character at index
+     * {@code endIndex - 1}.
      *
      * @param      beginIndex   the beginning index, inclusive.
      * @param      endIndex     the ending index, exclusive.
      * @return     the specified substring.
      * @exception  StringIndexOutOfBoundsException  if the
-     *             <code>beginIndex</code> is negative, or
-     *             <code>endIndex</code> is larger than the length of this
-     *             buffer, or <code>beginIndex</code> is larger than
-     *             <code>endIndex</code>.
+     *             {@code beginIndex} is negative, or
+     *             {@code endIndex} is larger than the length of this
+     *             buffer, or {@code beginIndex} is larger than
+     *             {@code endIndex}.
      */
     public String substring(final int beginIndex, final int endIndex) {
         if (beginIndex < 0) {
@@ -432,18 +432,18 @@ public final class CharArrayBuffer imple
     /**
      * Returns a substring of this buffer with leading and trailing whitespace
      * omitted. The substring begins with the first non-whitespace character
-     * from <code>beginIndex</code> and extends to the last
+     * from {@code beginIndex} and extends to the last
      * non-whitespace character with the index lesser than
-     * <code>endIndex</code>.
+     * {@code endIndex}.
      *
      * @param      beginIndex   the beginning index, inclusive.
      * @param      endIndex     the ending index, exclusive.
      * @return     the specified substring.
      * @exception  IndexOutOfBoundsException  if the
-     *             <code>beginIndex</code> is negative, or
-     *             <code>endIndex</code> is larger than the length of this
-     *             buffer, or <code>beginIndex</code> is larger than
-     *             <code>endIndex</code>.
+     *             {@code beginIndex} is negative, or
+     *             {@code endIndex} is larger than the length of this
+     *             buffer, or {@code beginIndex} is larger than
+     *             {@code endIndex}.
      */
     public String substringTrimmed(final int beginIndex, final int endIndex) {
         if (beginIndex < 0) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java?rev=1619429&r1=1619428&r2=1619429&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/main/java/org/apache/http/util/VersionInfo.java Thu Aug 21 15:09:04 2014
@@ -81,10 +81,10 @@ public class VersionInfo {
      * Instantiates version information.
      *
      * @param pckg      the package
-     * @param module    the module, or <code>null</code>
-     * @param release   the release, or <code>null</code>
-     * @param time      the build time, or <code>null</code>
-     * @param clsldr    the class loader, or <code>null</code>
+     * @param module    the module, or {@code null}
+     * @param release   the release, or {@code null}
+     * @param time      the build time, or {@code null}
+     * @param clsldr    the class loader, or {@code null}
      */
     protected VersionInfo(final String pckg, final String module,
                           final String release, final String time, final String clsldr) {
@@ -101,7 +101,7 @@ public class VersionInfo {
      * Obtains the package name.
      * The package name identifies the module or informal unit.
      *
-     * @return  the package name, never <code>null</code>
+     * @return  the package name, never {@code null}
      */
     public final String getPackage() {
         return infoPackage;
@@ -111,7 +111,7 @@ public class VersionInfo {
      * Obtains the name of the versioned module or informal unit.
      * This data is read from the version information for the package.
      *
-     * @return  the module name, never <code>null</code>
+     * @return  the module name, never {@code null}
      */
     public final String getModule() {
         return infoModule;
@@ -121,7 +121,7 @@ public class VersionInfo {
      * Obtains the release of the versioned module or informal unit.
      * This data is read from the version information for the package.
      *
-     * @return  the release version, never <code>null</code>
+     * @return  the release version, never {@code null}
      */
     public final String getRelease() {
         return infoRelease;
@@ -131,7 +131,7 @@ public class VersionInfo {
      * Obtains the timestamp of the versioned module or informal unit.
      * This data is read from the version information for the package.
      *
-     * @return  the timestamp, never <code>null</code>
+     * @return  the timestamp, never {@code null}
      */
     public final String getTimestamp() {
         return infoTimestamp;
@@ -139,11 +139,11 @@ public class VersionInfo {
 
     /**
      * Obtains the classloader used to read the version information.
-     * This is just the <code>toString</code> output of the classloader,
+     * This is just the {@code toString} output of the classloader,
      * since the version information should not keep a reference to
      * the classloader itself. That could prevent garbage collection.
      *
-     * @return  the classloader description, never <code>null</code>
+     * @return  the classloader description, never {@code null}
      */
     public final String getClassloader() {
         return infoClassloader;
@@ -189,10 +189,10 @@ public class VersionInfo {
      *
      * @param pckgs     the packages for which to load version info
      * @param clsldr    the classloader to load from, or
-     *                  <code>null</code> for the thread context classloader
+     *                  {@code null} for the thread context classloader
      *
      * @return  the version information for all packages found,
-     *          never <code>null</code>
+     *          never {@code null}
      */
     public static VersionInfo[] loadVersionInfo(final String[] pckgs,
                                                       final ClassLoader clsldr) {
@@ -216,10 +216,10 @@ public class VersionInfo {
      *                  for example "org.apache.http".
      *                  The package name should NOT end with a dot.
      * @param clsldr    the classloader to load from, or
-     *                  <code>null</code> for the thread context classloader
+     *                  {@code null} for the thread context classloader
      *
      * @return  the version information for the argument package, or
-     *          <code>null</code> if not available
+     *          {@code null} if not available
      */
     public static VersionInfo loadVersionInfo(final String pckg,
                                               final ClassLoader clsldr) {
@@ -260,7 +260,7 @@ public class VersionInfo {
      * @param pckg      the package for the version information
      * @param info      the map from string keys to string values,
      *                  for example {@link java.util.Properties}
-     * @param clsldr    the classloader, or <code>null</code>
+     * @param clsldr    the classloader, or {@code null}
      *
      * @return  the version information
      */
@@ -311,7 +311,7 @@ public class VersionInfo {
      *            the package for which to load version information, for example "org.apache.http". The package name
      *            should NOT end with a dot.
      * @param cls
-     *            the class' class loader to load from, or <code>null</code> for the thread context class loader
+     *            the class' class loader to load from, or {@code null} for the thread context class loader
      * @since 4.3
      */
     public static String getUserAgent(final String name, final String pkg, final Class<?> cls) {

Modified: httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java?rev=1619429&r1=1619428&r2=1619429&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java (original)
+++ httpcomponents/httpcore/trunk/httpcore/src/test/java/org/apache/http/util/TestEntityUtils.java Thu Aug 21 15:09:04 2014
@@ -216,7 +216,7 @@ public class TestEntityUtils {
     }
 
     /**
-     * Helper class that returns <code>null</code> as the content.
+     * Helper class that returns {@code null} as the content.
      */
     public static class NullHttpEntity extends BasicHttpEntity {
 
@@ -225,7 +225,7 @@ public class TestEntityUtils {
          * Obtains no content.
          * This method disables the state checks in the base class.
          *
-         * @return <code>null</code>
+         * @return {@code null}
          */
         @Override
         public InputStream getContent() {

Modified: httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml?rev=1619429&r1=1619428&r2=1619429&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml (original)
+++ httpcomponents/httpcore/trunk/src/docbkx/nio-ext.xml Thu Aug 21 15:09:04 2014
@@ -1438,7 +1438,7 @@ HttpAsyncRequestHandler<HttpRequest> rh 
                         <title><methodname>getException</methodname>:</title>
                         <para>
                         Returns an exception in case of an abnormal termination. This method
-                        returns <code>null</code> if the request execution is still ongoing or if
+                        returns {@code null} if the request execution is still ongoing or if
                         it completed successfully.
                         </para>
                         </formalpara>
@@ -1448,7 +1448,7 @@ HttpAsyncRequestHandler<HttpRequest> rh 
                         <title><methodname>getResult</methodname>:</title>
                         <para>
                         Returns a result of the request execution, when available. This method
-                        returns <code>null</code> if the request execution is still ongoing.
+                        returns {@code null} if the request execution is still ongoing.
                         </para>
                         </formalpara>
                     </listitem>
@@ -1529,7 +1529,7 @@ HttpAsyncRequestHandler<HttpRequest> rh 
                         <para>
                         This event is invoked only for if the outgoing response message has
                         a content entity enclosed in it, that is <methodname>
-                        HttpResponse#getEntity()</methodname> returns <code>null</code>.
+                        HttpResponse#getEntity()</methodname> returns {@code null}.
                         </para>
                         </formalpara>
                     </listitem>
@@ -1623,7 +1623,7 @@ handlerReqistry.register("*", myRequestH
             to be used for the next series of HTTP message exchanges through the connection
             context using <methodname>HttpAsyncRequestExecutor#HTTP_HANDLER</methodname> attribute.
             HTTP exchange sequence is considered complete when the <methodname>
-            HttpAsyncRequestExecutionHandler#isDone()</methodname> method returns <code>true</code>.
+            HttpAsyncRequestExecutionHandler#isDone()</methodname> method returns {@code true}.
             </para>
             <programlisting><![CDATA[
 HttpAsyncRequestExecutor ph = new HttpAsyncRequestExecutor();
@@ -1841,7 +1841,7 @@ HttpResponse response = future.get();
                         <title><methodname>getException</methodname>:</title>
                         <para>
                         Returns an exception in case of an abnormal termination. This method
-                        returns <code>null</code> if the response processing is still ongoing or
+                        returns {@code null} if the response processing is still ongoing or
                         if it completed successfully.
                         </para>
                         </formalpara>
@@ -1851,7 +1851,7 @@ HttpResponse response = future.get();
                         <title><methodname>getResult</methodname>:</title>
                         <para>
                         Returns a result of the response processing, when available. This method
-                        returns <code>null</code> if the response processing is still ongoing.
+                        returns {@code null} if the response processing is still ongoing.
                         </para>
                         </formalpara>
                     </listitem>

Modified: httpcomponents/project-website/trunk/src/site/xdoc/downloads.xml
URL: http://svn.apache.org/viewvc/httpcomponents/project-website/trunk/src/site/xdoc/downloads.xml?rev=1619429&r1=1619428&r2=1619429&view=diff
==============================================================================
--- httpcomponents/project-website/trunk/src/site/xdoc/downloads.xml (original)
+++ httpcomponents/project-website/trunk/src/site/xdoc/downloads.xml Thu Aug 21 15:09:04 2014
@@ -59,9 +59,9 @@
     <input type="submit" value="Change"/>
   </form>
 
-  <p>The <code>KEYS</code> link links to the code signing keys used to sign the product. The 
-   <code>PGP</code> link downloads the OpenPGP compatible signature from our main site. The 
-   <code>MD5</code> link downloads the checksum from the main site.
+  <p>The {@code KEYS} link links to the code signing keys used to sign the product. The 
+   {@code PGP} link downloads the OpenPGP compatible signature from our main site. The 
+   {@code MD5} link downloads the checksum from the main site.
   </p>
 
   <subsection name="HttpClient 4.3.5 (GA)">