Author: rdonkin
Date: Sat Jun 21 01:53:43 2008
New Revision: 670166
URL: http://svn.apache.org/viewvc?rev=670166&view=rev
Log:
Renamed method so that it's clear which parameters are referred to.
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java?rev=670166&r1=670165&r2=670166&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/ContentDescriptor.java
Sat Jun 21 01:53:43 2008
@@ -73,7 +73,7 @@
/**
* Returns the map of parameters of the content-type header.
*/
- Map getParameters();
+ Map getContentTypeParameters();
/**
* Returns the body descriptors content-length.
Modified:
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java?rev=670166&r1=670165&r2=670166&view=diff
==============================================================================
---
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java
(original)
+++
james/mime4j/trunk/src/main/java/org/apache/james/mime4j/DefaultBodyDescriptor.java
Sat Jun 21 01:53:43 2008
@@ -216,7 +216,7 @@
*
* @return parameters
*/
- public Map getParameters() {
+ public Map getContentTypeParameters() {
return parameters;
}
Modified:
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java?rev=670166&r1=670165&r2=670166&view=diff
==============================================================================
---
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java
(original)
+++
james/mime4j/trunk/src/test/java/org/apache/james/mime4j/BodyDescriptorTest.java
Sat Jun 21 01:53:43 2008
@@ -40,26 +40,26 @@
bd = newBodyDescriptor();
bd.addField("Content-Type ", "text/plain; charset=ISO-8859-1; "
+ "boundary=foo; param1=value1; param2=value2; param3=value3");
- assertEquals(3, bd.getParameters().size());
- assertEquals("value1", (String) bd.getParameters().get("param1"));
- assertEquals("value2", (String) bd.getParameters().get("param2"));
- assertEquals("value3", (String) bd.getParameters().get("param3"));
+ assertEquals(3, bd.getContentTypeParameters().size());
+ assertEquals("value1", (String)
bd.getContentTypeParameters().get("param1"));
+ assertEquals("value2", (String)
bd.getContentTypeParameters().get("param2"));
+ assertEquals("value3", (String)
bd.getContentTypeParameters().get("param3"));
bd = newBodyDescriptor();
bd.addField("Content-Type ", "text/plain; param1=value1;
param2=value2;"
+ " param3=value3");
- assertEquals(3, bd.getParameters().size());
- assertEquals("value1", (String) bd.getParameters().get("param1"));
- assertEquals("value2", (String) bd.getParameters().get("param2"));
- assertEquals("value3", (String) bd.getParameters().get("param3"));
+ assertEquals(3, bd.getContentTypeParameters().size());
+ assertEquals("value1", (String)
bd.getContentTypeParameters().get("param1"));
+ assertEquals("value2", (String)
bd.getContentTypeParameters().get("param2"));
+ assertEquals("value3", (String)
bd.getContentTypeParameters().get("param3"));
bd = newBodyDescriptor();
bd.addField("Content-Type ", "text/plain; "
+ "param1= \" value with\tspaces \" ; "
+ "param2=\"\\\"value4 with escaped \\\" \\\"\";");
- assertEquals(2, bd.getParameters().size());
- assertEquals(" value with\tspaces ", (String)
bd.getParameters().get("param1"));
- assertEquals("\"value4 with escaped \" \"", (String)
bd.getParameters().get("param2"));
+ assertEquals(2, bd.getContentTypeParameters().size());
+ assertEquals(" value with\tspaces ", (String)
bd.getContentTypeParameters().get("param1"));
+ assertEquals("\"value4 with escaped \" \"", (String)
bd.getContentTypeParameters().get("param2"));
/*
* Make sure escaped characters (except ") are still escaped.
@@ -67,8 +67,8 @@
*/
bd = newBodyDescriptor();
bd.addField("Content-Type ", "text/plain; param=\"\\n\\\\\\\"\"");
- assertEquals(1, bd.getParameters().size());
- assertEquals("\\n\\\"", (String) bd.getParameters().get("param"));
+ assertEquals(1, bd.getContentTypeParameters().size());
+ assertEquals("\\n\\\"", (String)
bd.getContentTypeParameters().get("param"));
}
public void testAddField() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
