svn commit: r1464422 - in /httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http: client/utils/URLEncodedUtils.java impl/cookie/RFC2965Spec.java

[ol...@apache.org]

Author: olegk
Date: Thu Apr  4 10:32:08 2013
New Revision: 1464422

URL: http://svn.apache.org/r1464422
Log:
Javadoc fixes

Modified:
    httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
    httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java

Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java?rev=1464422&r1=1464421&r2=1464422&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Thu Apr  4 10:32:08 2013
@@ -361,14 +361,6 @@ public class URLEncodedUtils {
 
     private static final int RADIX = 16;
 
-    /**
-     * Emcode/escape a portion of a URL, to use with the query part ensure {@code plusAsBlank} is true.
-     * 
-     * @param content the portion to decode
-     * @param charset the charset to use
-     * @param blankAsPlus if {@code true}, then convert space to '+' (e.g. for www-url-form-encoded content), otherwise leave as is.
-     * @return
-     */
     private static String urlencode(
             final String content,
             final Charset charset,
@@ -402,7 +394,7 @@ public class URLEncodedUtils {
      * @param content the portion to decode
      * @param charset the charset to use
      * @param plusAsBlank if {@code true}, then convert '+' to space (e.g. for www-url-form-encoded content), otherwise leave as is.
-     * @return
+     * @return encoded string
      */
     private static String urldecode(
             final String content,
@@ -442,7 +434,7 @@ public class URLEncodedUtils {
      * 
      * @param content the content to decode, will decode '+' as space
      * @param charset the charset to use
-     * @return
+     * @return encoded string
      */
     private static String decodeFormFields (final String content, final String charset) {
         if (content == null) {
@@ -456,7 +448,7 @@ public class URLEncodedUtils {
      * 
      * @param content the content to decode, will decode '+' as space
      * @param charset the charset to use
-     * @return
+     * @return encoded string
      */
     private static String decodeFormFields (final String content, final Charset charset) {
         if (content == null) {
@@ -474,7 +466,7 @@ public class URLEncodedUtils {
      * 
      * @param content the content to encode, will convert space to '+'
      * @param charset the charset to use
-     * @return
+     * @return encoded string
      */
     private static String encodeFormFields (final String content, final String charset) {
         if (content == null) {
@@ -493,7 +485,7 @@ public class URLEncodedUtils {
      * 
      * @param content the content to encode, will convert space to '+'
      * @param charset the charset to use
-     * @return
+     * @return encoded string
      */
     private static String encodeFormFields (final String content, final Charset charset) {
         if (content == null) {

Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java?rev=1464422&r1=1464421&r2=1464422&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java Thu Apr  4 10:32:08 2013
@@ -205,7 +205,6 @@ public class RFC2965Spec extends RFC2109
      * that all effective host names contain at least one dot.
      *
      * @param origin origin where cookie is received from or being sent to.
-     * @return
      */
     private static CookieOrigin adjustEffectiveHost(final CookieOrigin origin) {
         String host = origin.getHost();