rwaldhoff 01/08/08 10:45:23
Modified: httpclient/src/java/org/apache/commons/httpclient
ConnectionInterceptor.java HttpClient.java
Log:
'i' before 'e' except after 'c'
We had "received" spelled "recieved" in a number of places, including method names.
I deprecated the "recieved" form and added "received" instead, but we should
probably remove recievedExpection and recievedResponse from the ConnectionInterceptor
interface so that implementations don't need to keep the misspelled form around.
Revision Changes Path
1.3 +30 -25
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ConnectionInterceptor.java
Index: ConnectionInterceptor.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ConnectionInterceptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ConnectionInterceptor.java 2001/05/11 22:04:21 1.2
+++ ConnectionInterceptor.java 2001/08/08 17:45:23 1.3
@@ -1,13 +1,13 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ConnectionInterceptor.java,v
1.2 2001/05/11 22:04:21 jericho Exp $
- * $Revision: 1.2 $
- * $Date: 2001/05/11 22:04:21 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/ConnectionInterceptor.java,v
1.3 2001/08/08 17:45:23 rwaldhoff Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/08/08 17:45:23 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -15,7 +15,7 @@
* are met:
*
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
+ * notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
@@ -23,15 +23,15 @@
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
+ * from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
@@ -59,7 +59,7 @@
*
* [Additional notices, if required by prior licensing conditions]
*
- */
+ */
package org.apache.commons.httpclient;
@@ -67,7 +67,7 @@
/**
* The connection interceptor.
- *
+ *
* @author Remy Maucherat
*/
@@ -91,15 +91,17 @@
/**
* Retry.
- *
+ *
* @return boolean true if a retry should be attempted
*/
public boolean retry(int status);
/**
- * Recieved an informational status code.
- *
+ * Received an informational status code.
+ *
+ * @param status the HTTP status code
+ * @param headers the headers mapped by name
* @return boolean true if a retry should be attempted
*/
public boolean info(int status, Hashtable headers);
@@ -107,8 +109,8 @@
/**
* Unexpected error.
- *
- * @param status Status code; can be equal to -1 if status code is not
+ *
+ * @param status Status code; can be equal to -1 if status code is not
* known
* @param e Underlying exception; can be null
* @return boolean true if processing of the request should be stopped
@@ -118,38 +120,41 @@
/**
* Sent request.
- *
- * @param requestLine Request line sent
- * @param headers Headers sent
*/
public void sentRequest();
/**
- * Recieved response.
- *
- * @param responseLine Response line recieved
- * @param headers Headers recieved
+ * Received response.
+ * @deprecated Use {@link #receivedResponse}
*/
public void recievedResponse();
+ /**
+ * Received response.
+ */
+ public void receivedResponse();
+
/**
- * Recieved expectation.
+ * Received expectation.
+ * @deprecated Use {@link #receivedExpectation}
*/
public void recievedExpectation();
+ /**
+ * Received expectation.
+ */
+ public void receivedExpectation();
/**
* Required authentication.
*/
public void requiredAuthentication();
-
/**
* Authenticate.
*/
public void authenticate();
-
}
1.27 +6 -6
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java
Index: HttpClient.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- HttpClient.java 2001/08/08 17:32:52 1.26
+++ HttpClient.java 2001/08/08 17:45:23 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java,v
1.26 2001/08/08 17:32:52 rwaldhoff Exp $
- * $Revision: 1.26 $
- * $Date: 2001/08/08 17:32:52 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpClient.java,v
1.27 2001/08/08 17:45:23 rwaldhoff Exp $
+ * $Revision: 1.27 $
+ * $Date: 2001/08/08 17:45:23 $
*
* ====================================================================
*
@@ -483,7 +483,7 @@
if (method.getStatusCode() == HttpStatus.SC_CONTINUE) {
if (!sentRequestBody) {
if (connectionInterceptor != null) {
- connectionInterceptor.recievedExpectation();
+ connectionInterceptor.receivedExpectation();
}
sendRequestBody(method, query);
sentRequestBody = true;
@@ -501,7 +501,7 @@
}
if (connectionInterceptor != null) {
- connectionInterceptor.recievedResponse();
+ connectionInterceptor.receivedResponse();
}
// Retrieve the authenticate challenge, if any
@@ -557,7 +557,7 @@
methodProcessed = true;
} else {
if (!methodProcessed) {
- log.debug("HttpClient.exectuteMethod(): Method not
processed. Recieved status code \"" + method.getStatusCode() + "\". May retry.");
+ log.debug("HttpClient.exectuteMethod(): Method not
processed. Received status code \"" + method.getStatusCode() + "\". May retry.");
if (connectionInterceptor != null) {
connectionInterceptor.retry
(method.getStatusCode());
