Return-Path: Delivered-To: apmail-jakarta-httpcomponents-commits-archive@www.apache.org Received: (qmail 41262 invoked from network); 10 Sep 2007 09:20:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Sep 2007 09:20:09 -0000 Received: (qmail 36240 invoked by uid 500); 10 Sep 2007 09:20:03 -0000 Delivered-To: apmail-jakarta-httpcomponents-commits-archive@jakarta.apache.org Received: (qmail 36228 invoked by uid 500); 10 Sep 2007 09:20:03 -0000 Mailing-List: contact httpcomponents-commits-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: httpcomponents-dev@jakarta.apache.org Delivered-To: mailing list httpcomponents-commits@jakarta.apache.org Received: (qmail 36219 invoked by uid 99); 10 Sep 2007 09:20:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2007 02:20:03 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Sep 2007 09:20:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D4B1E1A9832; Mon, 10 Sep 2007 02:19:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r574185 - in /jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message: BasicHeaderValueFormatter.java BasicHeaderValueParser.java BasicLineFormatter.java BasicLineParser.java Date: Mon, 10 Sep 2007 09:19:47 -0000 To: httpcomponents-commits@jakarta.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070910091948.D4B1E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olegk Date: Mon Sep 10 02:19:47 2007 New Revision: 574185 URL: http://svn.apache.org/viewvc?rev=574185&view=rev Log: Minor non-functional changes to make coding style somewhat more consistent within the same java package Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueParser.java jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineFormatter.java jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java?rev=574185&r1=574184&r2=574185&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java Mon Sep 10 02:19:47 2007 @@ -137,7 +137,7 @@ * * @return a length estimate, in number of characters */ - protected int estimateElementsLen(HeaderElement[] elems) { + protected int estimateElementsLen(final HeaderElement[] elems) { if ((elems == null) || (elems.length < 1)) return 0; @@ -164,7 +164,7 @@ */ public final static String formatHeaderElement(final HeaderElement elem, - final boolean quote, + boolean quote, HeaderValueFormatter formatter) { if (formatter == null) formatter = BasicHeaderValueFormatter.DEFAULT; @@ -214,7 +214,7 @@ * * @return a length estimate, in number of characters */ - protected int estimateHeaderElementLen(HeaderElement elem) { + protected int estimateHeaderElementLen(final HeaderElement elem) { if (elem == null) return 0; @@ -294,7 +294,7 @@ * * @return a length estimate, in number of characters */ - protected int estimateParametersLen(NameValuePair[] nvps) { + protected int estimateParametersLen(final NameValuePair[] nvps) { if ((nvps == null) || (nvps.length < 1)) return 0; @@ -330,8 +330,8 @@ // non-javadoc, see interface HeaderValueFormatter public CharArrayBuffer formatNameValuePair(CharArrayBuffer buffer, - NameValuePair nvp, - boolean quote) { + final NameValuePair nvp, + final boolean quote) { if (nvp == null) { throw new IllegalArgumentException ("NameValuePair must not be null."); @@ -362,7 +362,7 @@ * * @return a length estimate, in number of characters */ - protected int estimateNameValuePairLen(NameValuePair nvp) { + protected int estimateNameValuePairLen(final NameValuePair nvp) { if (nvp == null) return 0; Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueParser.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueParser.java?rev=574185&r1=574184&r2=574185&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueParser.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicHeaderValueParser.java Mon Sep 10 02:19:47 2007 @@ -84,13 +84,13 @@ * @return array holding the header elements, never null */ public final static - HeaderElement[] parseElements(String value, + HeaderElement[] parseElements(final String value, HeaderValueParser parser) throws ParseException { if (value == null) { throw new IllegalArgumentException - ("Value to parse may not be null."); + ("Value to parse may not be null"); } if (parser == null) @@ -163,13 +163,13 @@ * @return the parsed header element */ public final static - HeaderElement parseHeaderElement(String value, + HeaderElement parseHeaderElement(final String value, HeaderValueParser parser) throws ParseException { if (value == null) { throw new IllegalArgumentException - ("Value to parse may not be null."); + ("Value to parse may not be null"); } if (parser == null) @@ -228,13 +228,13 @@ * @return array holding the parameters, never null */ public final static - NameValuePair[] parseParameters(String value, + NameValuePair[] parseParameters(final String value, HeaderValueParser parser) throws ParseException { if (value == null) { throw new IllegalArgumentException - ("Value to parse may not be null."); + ("Value to parse may not be null"); } if (parser == null) @@ -308,13 +308,13 @@ * @return the parsed name-value pair */ public final static - NameValuePair parseNameValuePair(String value, + NameValuePair parseNameValuePair(final String value, HeaderValueParser parser) throws ParseException { if (value == null) { throw new IllegalArgumentException - ("Value to parse may not be null."); + ("Value to parse may not be null"); } if (parser == null) @@ -388,7 +388,7 @@ * * @return a name-value pair representing the arguments */ - protected NameValuePair createNameValuePair(String name, String value) { + protected NameValuePair createNameValuePair(final String name, final String value) { return new BasicNameValuePair(name, value); } Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineFormatter.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineFormatter.java?rev=574185&r1=574184&r2=574185&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineFormatter.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineFormatter.java Mon Sep 10 02:19:47 2007 @@ -115,11 +115,11 @@ // non-javadoc, see interface LineFormatter - public CharArrayBuffer appendProtocolVersion(CharArrayBuffer buffer, - ProtocolVersion version) { + public CharArrayBuffer appendProtocolVersion(final CharArrayBuffer buffer, + final ProtocolVersion version) { if (version == null) { throw new IllegalArgumentException - ("Protocol version must not be null."); + ("Protocol version may not be null"); } // can't use initBuffer, that would clear the argument! @@ -150,7 +150,7 @@ * @return the estimated length of the formatted protocol version, * in characters */ - protected int estimateProtocolVersionLen(ProtocolVersion version) { + protected int estimateProtocolVersionLen(final ProtocolVersion version) { return version.getProtocol().length() + 4; // room for "HTTP/1.1" } @@ -178,7 +178,7 @@ RequestLine reqline) { if (reqline == null) { throw new IllegalArgumentException - ("Request line must not be null."); + ("Request line may not be null"); } CharArrayBuffer result = initBuffer(buffer); @@ -196,8 +196,8 @@ * never null * @param reqline the request line to format, never null */ - protected void doFormatRequestLine(CharArrayBuffer buffer, - RequestLine reqline) { + protected void doFormatRequestLine(final CharArrayBuffer buffer, + final RequestLine reqline) { final String method = reqline.getMethod(); final String uri = reqline.getUri(); @@ -234,11 +234,11 @@ // non-javadoc, see interface LineFormatter - public CharArrayBuffer formatStatusLine(CharArrayBuffer buffer, - StatusLine statline) { + public CharArrayBuffer formatStatusLine(final CharArrayBuffer buffer, + final StatusLine statline) { if (statline == null) { throw new IllegalArgumentException - ("Status line must not be null."); + ("Status line may not be null"); } CharArrayBuffer result = initBuffer(buffer); @@ -256,8 +256,8 @@ * never null * @param statline the status line to format, never null */ - protected void doFormatStatusLine(CharArrayBuffer buffer, - StatusLine statline) { + protected void doFormatStatusLine(final CharArrayBuffer buffer, + final StatusLine statline) { int len = estimateProtocolVersionLen(statline.getProtocolVersion()) + 1 + 3 + 1; // room for "HTTP/1.1 200 " @@ -300,7 +300,7 @@ Header header) { if (header == null) { throw new IllegalArgumentException - ("Header must not be null."); + ("Header may not be null"); } CharArrayBuffer result = null; @@ -324,8 +324,8 @@ * never null * @param header the header to format, never null */ - protected void doFormatHeader(CharArrayBuffer buffer, - Header header) { + protected void doFormatHeader(final CharArrayBuffer buffer, + final Header header) { final String name = header.getName(); final String value = header.getValue(); Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java?rev=574185&r1=574184&r2=574185&view=diff ============================================================================== --- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java (original) +++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/message/BasicLineParser.java Mon Sep 10 02:19:47 2007 @@ -266,7 +266,7 @@ public final static - RequestLine parseRequestLine(String value, + RequestLine parseRequestLine(final String value, LineParser parser) throws ParseException { @@ -347,16 +347,16 @@ * * @return a new status line with the given data */ - protected RequestLine createRequestLine(String method, - String uri, - ProtocolVersion ver) { + protected RequestLine createRequestLine(final String method, + final String uri, + final ProtocolVersion ver) { return new BasicRequestLine(method, uri, ver); } public final static - StatusLine parseStatusLine(String value, + StatusLine parseStatusLine(final String value, LineParser parser) throws ParseException { @@ -447,21 +447,22 @@ * * @return a new status line with the given data */ - protected StatusLine createStatusLine(ProtocolVersion ver, - int status, String reason) { + protected StatusLine createStatusLine(final ProtocolVersion ver, + final int status, + final String reason) { return new BasicStatusLine(ver, status, reason); } public final static - Header parseHeader(String value, + Header parseHeader(final String value, LineParser parser) throws ParseException { if (value == null) { throw new IllegalArgumentException - ("Value to parse may not be null."); + ("Value to parse may not be null"); } if (parser == null) @@ -504,7 +505,7 @@ * if there was no whitespace. It is the end of the buffer if * the rest of the line is whitespace. */ - protected int skipWhitespace(CharArrayBuffer buffer, int index) { + protected int skipWhitespace(final CharArrayBuffer buffer, int index) { while ((index < buffer.length()) && HTTP.isWhitespace(buffer.charAt(index))) { index++;