Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DD60410DE5 for ; Tue, 4 Jun 2013 00:16:54 +0000 (UTC) Received: (qmail 38705 invoked by uid 500); 4 Jun 2013 00:16:54 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 38570 invoked by uid 500); 4 Jun 2013 00:16:54 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 38475 invoked by uid 99); 4 Jun 2013 00:16:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 00:16:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 00:16:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4D1B823888E3 for ; Tue, 4 Jun 2013 00:16:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489240 - /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Date: Tue, 04 Jun 2013 00:16:29 -0000 To: commits@hc.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130604001629.4D1B823888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Tue Jun 4 00:16:28 2013 New Revision: 1489240 URL: http://svn.apache.org/r1489240 Log: Use camel-case for method names (example: urldecode -> urlDecode). Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java?rev=1489240&r1=1489239&r2=1489240&view=diff ============================================================================== --- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java (original) +++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Tue Jun 4 00:16:28 2013 @@ -363,7 +363,7 @@ public class URLEncodedUtils { private static final int RADIX = 16; - private static String urlencode( + private static String urlEncode( final String content, final Charset charset, final BitSet safechars, @@ -398,7 +398,7 @@ public class URLEncodedUtils { * @param plusAsBlank if {@code true}, then convert '+' to space (e.g. for www-url-form-encoded content), otherwise leave as is. * @return encoded string */ - private static String urldecode( + private static String urlDecode( final String content, final Charset charset, final boolean plusAsBlank) { @@ -442,7 +442,7 @@ public class URLEncodedUtils { if (content == null) { return null; } - return urldecode(content, charset != null ? Charset.forName(charset) : Consts.UTF_8, true); + return urlDecode(content, charset != null ? Charset.forName(charset) : Consts.UTF_8, true); } /** @@ -456,7 +456,7 @@ public class URLEncodedUtils { if (content == null) { return null; } - return urldecode(content, charset != null ? charset : Consts.UTF_8, true); + return urlDecode(content, charset != null ? charset : Consts.UTF_8, true); } /** @@ -474,7 +474,7 @@ public class URLEncodedUtils { if (content == null) { return null; } - return urlencode(content, charset != null ? Charset.forName(charset) : + return urlEncode(content, charset != null ? Charset.forName(charset) : Consts.UTF_8, URLENCODER, true); } @@ -493,7 +493,7 @@ public class URLEncodedUtils { if (content == null) { return null; } - return urlencode(content, charset != null ? charset : Consts.UTF_8, URLENCODER, true); + return urlEncode(content, charset != null ? charset : Consts.UTF_8, URLENCODER, true); } /** @@ -506,7 +506,7 @@ public class URLEncodedUtils { * @return the encoded string */ static String encUserInfo(final String content, final Charset charset) { - return urlencode(content, charset, USERINFO, false); + return urlEncode(content, charset, USERINFO, false); } /** @@ -519,7 +519,7 @@ public class URLEncodedUtils { * @return the encoded string */ static String encUric(final String content, final Charset charset) { - return urlencode(content, charset, URIC, false); + return urlEncode(content, charset, URIC, false); } /** @@ -532,7 +532,7 @@ public class URLEncodedUtils { * @return the encoded string */ static String encPath(final String content, final Charset charset) { - return urlencode(content, charset, PATHSAFE, false); + return urlEncode(content, charset, PATHSAFE, false); } }