rwaldhoff 01/08/14 11:01:30
Modified: httpclient/src/java/org/apache/commons/httpclient Tag:
rlwrefactoring Header.java HeaderElement.java
httpclient/src/test/org/apache/commons/httpclient Tag:
rlwrefactoring TestHeader.java
Log:
adding toExternalForm to header (to mirror Cookie)
misc javadoc fixes and cleanup
Revision Changes Path
No revision
No revision
1.2.2.2 +17 -5
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java
Index: Header.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- Header.java 2001/08/13 15:50:41 1.2.2.1
+++ Header.java 2001/08/14 18:01:29 1.2.2.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java,v
1.2.2.1 2001/08/13 15:50:41 rwaldhoff Exp $
- * $Revision: 1.2.2.1 $
- * $Date: 2001/08/13 15:50:41 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/Header.java,v
1.2.2.2 2001/08/14 18:01:29 rwaldhoff Exp $
+ * $Revision: 1.2.2.2 $
+ * $Date: 2001/08/14 18:01:29 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -49,12 +49,24 @@
// --------------------------------------------------------- Public Methods
/**
- * Get a String representation of the header.
+ * Get a String representation of the header, suitable
+ * for use in an HTTP head.
*/
- public String toString() {
+ public String toExternalForm() {
return (name + ": " + value + "\r\n");
}
+ /**
+ * Returns a String representation of me.
+ * @see #toExternalForm
+ */
+ public String toString() {
+ return toExternalForm();
+ }
+
+ /**
+ * Returns an array of values, as parsed by {@link HeaderElement}.
+ */
public String[] getValues() throws HttpException {
HeaderElement[] elts = HeaderElement.parse(getValue());
String[] values = new String[elts.length];
1.3.2.1 +3 -6
jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HeaderElement.java
Index: HeaderElement.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HeaderElement.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- HeaderElement.java 2001/08/02 16:27:06 1.3
+++ HeaderElement.java 2001/08/14 18:01:29 1.3.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HeaderElement.java,v
1.3 2001/08/02 16:27:06 rwaldhoff Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/02 16:27:06 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HeaderElement.java,v
1.3.2.1 2001/08/14 18:01:29 rwaldhoff Exp $
+ * $Revision: 1.3.2.1 $
+ * $Date: 2001/08/14 18:01:29 $
*
* ====================================================================
*
@@ -189,9 +189,6 @@
// ----------------------------------------------------- Instance Variables
- /**
- * Name.
- */
protected NameValuePair[] parameters = null;
// ------------------------------------------------------------- Properties
No revision
No revision
1.1.2.1 +10 -10
jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java
Index: TestHeader.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- TestHeader.java 2001/08/03 16:57:29 1.1
+++ TestHeader.java 2001/08/14 18:01:30 1.1.2.1
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java,v
1.1 2001/08/03 16:57:29 rwaldhoff Exp $
- * $Revision: 1.1 $
- * $Date: 2001/08/03 16:57:29 $
+ * $Header:
/home/cvs/jakarta-commons/httpclient/src/test/org/apache/commons/httpclient/TestHeader.java,v
1.1.2.1 2001/08/14 18:01:30 rwaldhoff Exp $
+ * $Revision: 1.1.2.1 $
+ * $Date: 2001/08/14 18:01:30 $
* ====================================================================
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
@@ -18,7 +18,7 @@
* Simple tests for {@link NameValuePair}.
*
* @author Rodney Waldhoff
- * @version $Id: TestHeader.java,v 1.1 2001/08/03 16:57:29 rwaldhoff Exp $
+ * @version $Id: TestHeader.java,v 1.1.2.1 2001/08/14 18:01:30 rwaldhoff Exp $
*/
public class TestHeader extends TestNVP {
@@ -52,14 +52,14 @@
// ----------------------------------------------------------- Test Methods
- public void testToStringNull() {
- NameValuePair header = makePair();
- assertEquals("null: null\r\n",header.toString());
+ public void testToExternalFormNull() {
+ Header header = (Header)makePair();
+ assertEquals("null: null\r\n",header.toExternalForm());
}
- public void testToString() {
- NameValuePair header = makePair("a","b");
- assertEquals("a: b\r\n",header.toString());
+ public void testToExternalForm() {
+ Header header = (Header)makePair("a","b");
+ assertEquals("a: b\r\n",header.toExternalForm());
}
public void testNotEqualToNVP() {
