Author: olegk
Date: Wed Feb 3 19:51:59 2010
New Revision: 906208
URL: http://svn.apache.org/viewvc?rev=906208&view=rev
Log:
MIME4J-129, MIME4J-157: Moved MimeTokenStream functionality back to
BasicMimeTokenStream; renamed BasicMimeTokenStream to MimeTokenStream
Added:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java
- copied, changed from r906202,
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java
Removed:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeTokenStream.java
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java
Modified:
james/mime4j/trunk/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java
Modified:
james/mime4j/trunk/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
(original)
+++
james/mime4j/trunk/benchmark/src/main/java/org/apache/james/mime4j/LongMultipartReadBench.java
Wed Feb 3 19:51:59 2010
@@ -29,12 +29,12 @@
import org.apache.james.mime4j.message.MessageImpl;
import org.apache.james.mime4j.message.SimpleContentHandler;
import org.apache.james.mime4j.parser.MimeStreamParser;
-import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.storage.DefaultStorageProvider;
import org.apache.james.mime4j.storage.MemoryStorageProvider;
import org.apache.james.mime4j.stream.AbstractContentHandler;
import org.apache.james.mime4j.stream.BodyDescriptor;
import org.apache.james.mime4j.stream.ContentHandler;
+import org.apache.james.mime4j.stream.MimeTokenStream;
public class LongMultipartReadBench {
@@ -148,8 +148,8 @@
@Override
public void body(BodyDescriptor bd, InputStream is)
throws IOException {
- byte[] b = new byte[4096];
- while (is.read(b) != -1);
+ byte[] b = new byte[4096];
+ while (is.read(b) != -1);
}
@Override
Modified:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
(original)
+++
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/parser/MimeStreamParser.java
Wed Feb 3 19:51:59 2010
@@ -29,6 +29,7 @@
import org.apache.james.mime4j.stream.BodyDescriptor;
import org.apache.james.mime4j.stream.ContentHandler;
import org.apache.james.mime4j.stream.MimeEntityConfig;
+import org.apache.james.mime4j.stream.MimeTokenStream;
import org.apache.james.mime4j.stream.MutableBodyDescriptorFactory;
/**
Copied:
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java
(from r906202,
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java)
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java?p2=james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java&p1=james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java&r1=906202&r2=906208&rev=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/BasicMimeTokenStream.java
(original)
+++
james/mime4j/trunk/core/src/main/java/org/apache/james/mime4j/stream/MimeTokenStream.java
Wed Feb 3 19:51:59 2010
@@ -66,13 +66,13 @@
* }
* }
* </pre>
- * <p>Instances of {...@link BasicMimeTokenStream} are reusable: Invoking the
+ * <p>Instances of {...@link MimeTokenStream} are reusable: Invoking the
* method {...@link #parse(InputStream)} resets the token streams internal
* state. However, they are definitely <em>not</em> thread safe. If you
* have a multi threaded application, then the suggested use is to have
* one instance per thread.</p>
*/
-public class BasicMimeTokenStream implements EntityStates, RecursionMode {
+public class MimeTokenStream implements EntityStates, RecursionMode {
private final MimeEntityConfig config;
private final DecodeMonitor monitor;
@@ -82,7 +82,7 @@
private int state = T_END_OF_STREAM;
private EntityStateMachine currentStateMachine;
private int recursionMode = M_RECURSE;
- private MimeEntity rootentity;
+ private MimeEntity rootentity;
/**
* Constructs a standard (lax) stream.
@@ -90,21 +90,21 @@
* Use {...@link MimeTokenStream#createStrictValidationStream()} to create
* a stream that strictly validates the input.
*/
- public BasicMimeTokenStream() {
+ public MimeTokenStream() {
this(new MimeEntityConfig());
}
- public BasicMimeTokenStream(final MimeEntityConfig config) {
+ public MimeTokenStream(final MimeEntityConfig config) {
this(config, null, null);
}
- public BasicMimeTokenStream(
+ public MimeTokenStream(
final MimeEntityConfig config,
final MutableBodyDescriptorFactory bodyDescFactory) {
this(config, null, bodyDescFactory);
}
- public BasicMimeTokenStream(
+ public MimeTokenStream(
final MimeEntityConfig config,
final DecodeMonitor monitor,
final MutableBodyDescriptorFactory bodyDescFactory) {
@@ -143,8 +143,8 @@
MutableBodyDescriptor newBodyDescriptor = newBodyDescriptor();
int start = T_START_MESSAGE;
if (contentType != null) {
- start = T_END_HEADER;
- newBodyDescriptor.addField(new RawField("Content-Type",
contentType));
+ start = T_END_HEADER;
+ newBodyDescriptor.addField(new RawField("Content-Type",
contentType));
}
doParse(stream, newBodyDescriptor, start);
}
@@ -164,7 +164,7 @@
return result;
}
- public void doParse(InputStream stream,
+ public void doParse(InputStream stream,
MutableBodyDescriptor newBodyDescriptor, int start) {
LineNumberSource lineSource = null;
if (config.isCountLineNumbers()) {
@@ -173,7 +173,7 @@
stream = lineInput;
}
- rootentity = new MimeEntity(
+ rootentity = new MimeEntity(
lineSource,
stream,
newBodyDescriptor,
@@ -182,7 +182,7 @@
config,
monitor);
- rootentity.setRecursionMode(recursionMode);
+ rootentity.setRecursionMode(recursionMode);
currentStateMachine = rootentity;
entities.clear();
entities.add(currentStateMachine);
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/parser/MaximalBodyDescriptorTest.java
Wed Feb 3 19:51:59 2010
@@ -24,10 +24,10 @@
import org.apache.james.mime4j.ExampleMail;
import org.apache.james.mime4j.dom.datetime.DateTime;
import org.apache.james.mime4j.parser.MaximalBodyDescriptor;
-import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.stream.BaseTestForBodyDescriptors;
import org.apache.james.mime4j.stream.BodyDescriptor;
import org.apache.james.mime4j.stream.MimeEntityConfig;
+import org.apache.james.mime4j.stream.MimeTokenStream;
import org.apache.james.mime4j.stream.MutableBodyDescriptor;
public class MaximalBodyDescriptorTest extends BaseTestForBodyDescriptors {
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/BaseTestForBodyDescriptors.java
Wed Feb 3 19:51:59 2010
@@ -21,10 +21,6 @@
import junit.framework.TestCase;
-import org.apache.james.mime4j.stream.BodyDescriptor;
-import org.apache.james.mime4j.stream.MutableBodyDescriptor;
-import org.apache.james.mime4j.stream.RawField;
-
public abstract class BaseTestForBodyDescriptors extends TestCase {
protected abstract MutableBodyDescriptor newBodyDescriptor();
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeEntityTest.java
Wed Feb 3 19:51:59 2010
@@ -22,20 +22,15 @@
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import junit.framework.TestCase;
+
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.MimeException;
import org.apache.james.mime4j.io.BufferedLineReaderInputStream;
+import org.apache.james.mime4j.io.LineNumberInputStream;
import org.apache.james.mime4j.io.MaxHeaderLengthLimitException;
import org.apache.james.mime4j.io.MaxHeaderLimitException;
import org.apache.james.mime4j.io.MaxLineLimitException;
-import org.apache.james.mime4j.io.LineNumberInputStream;
-import org.apache.james.mime4j.stream.EntityStateMachine;
-import org.apache.james.mime4j.stream.EntityStates;
-import org.apache.james.mime4j.stream.MimeEntity;
-import org.apache.james.mime4j.stream.MimeEntityConfig;
-import org.apache.james.mime4j.stream.RecursionMode;
-
-import junit.framework.TestCase;
public class MimeEntityTest extends TestCase {
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserExampleMessagesTest.java
Wed Feb 3 19:51:59 2010
@@ -33,7 +33,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.parser.MimeStreamParser;
-import org.apache.james.mime4j.stream.MimeEntityConfig;
import org.apache.log4j.BasicConfigurator;
/**
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamParserTest.java
Wed Feb 3 19:51:59 2010
@@ -19,14 +19,6 @@
package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.parser.MimeStreamParser;
-import org.apache.james.mime4j.stream.AbstractContentHandler;
-import org.apache.james.mime4j.stream.BodyDescriptor;
-import org.apache.james.mime4j.stream.RawField;
-import org.apache.james.mime4j.util.ByteSequence;
-import org.apache.james.mime4j.util.ContentUtil;
-import org.apache.log4j.BasicConfigurator;
-
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -34,6 +26,11 @@
import junit.framework.TestCase;
+import org.apache.james.mime4j.parser.MimeStreamParser;
+import org.apache.james.mime4j.util.ByteSequence;
+import org.apache.james.mime4j.util.ContentUtil;
+import org.apache.log4j.BasicConfigurator;
+
public class MimeStreamParserTest extends TestCase {
@Override
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeStreamTokenMessageRfc822Test.java
Wed Feb 3 19:51:59 2010
@@ -19,14 +19,12 @@
package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.MimeTokenStream;
-import org.apache.james.mime4j.stream.RecursionMode;
-
import java.io.ByteArrayInputStream;
import junit.framework.TestCase;
+import org.apache.james.mime4j.ExampleMail;
+
public class MimeStreamTokenMessageRfc822Test extends TestCase {
MimeTokenStream stream;
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenEmbeddedMessageTest.java
Wed Feb 3 19:51:59 2010
@@ -19,14 +19,13 @@
package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.MimeTokenStream;
-
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import junit.framework.TestCase;
+import org.apache.james.mime4j.ExampleMail;
+
public class MimeTokenEmbeddedMessageTest extends TestCase {
MimeTokenStream stream;
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenNoRecurseTest.java
Wed Feb 3 19:51:59 2010
@@ -24,7 +24,6 @@
import junit.framework.TestCase;
-import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.util.CharsetUtil;
public class MimeTokenNoRecurseTest extends TestCase {
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamBodyDescriptorTest.java
Wed Feb 3 19:51:59 2010
@@ -19,14 +19,12 @@
package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.MimeTokenStream;
-import org.apache.james.mime4j.stream.BodyDescriptor;
-
import java.io.ByteArrayInputStream;
import junit.framework.TestCase;
+import org.apache.james.mime4j.ExampleMail;
+
public class MimeTokenStreamBodyDescriptorTest extends TestCase {
MimeTokenStream parser;
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamReaderTest.java
Wed Feb 3 19:51:59 2010
@@ -24,12 +24,11 @@
import java.io.InputStream;
import java.io.Reader;
+import junit.framework.TestCase;
+
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.ExampleMail;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.MimeTokenStream;
-
-import junit.framework.TestCase;
public class MimeTokenStreamReaderTest extends TestCase {
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MimeTokenStreamTest.java
Wed Feb 3 19:51:59 2010
@@ -19,15 +19,12 @@
package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.ExampleMail;
-import org.apache.james.mime4j.parser.MimeTokenStream;
-import org.apache.james.mime4j.stream.EntityStates;
-import org.apache.james.mime4j.stream.RecursionMode;
-
import java.io.ByteArrayInputStream;
import junit.framework.TestCase;
+import org.apache.james.mime4j.ExampleMail;
+
public class MimeTokenStreamTest extends TestCase {
MimeTokenStream stream;
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartStreamTest.java
Wed Feb 3 19:51:59 2010
@@ -28,7 +28,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.util.CharsetUtil;
public class MultipartStreamTest extends TestCase {
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/MultipartTokensTest.java
Wed Feb 3 19:51:59 2010
@@ -27,7 +27,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.james.mime4j.MimeException;
-import org.apache.james.mime4j.parser.MimeTokenStream;
import org.apache.james.mime4j.util.CharsetUtil;
public class MultipartTokensTest extends TestCase {
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/StrictMimeTokenStreamTest.java
Wed Feb 3 19:51:59 2010
@@ -19,10 +19,6 @@
package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.parser.MimeTokenStream;
-import org.apache.james.mime4j.stream.Event;
-import org.apache.james.mime4j.stream.MimeParseEventException;
-
import java.io.ByteArrayInputStream;
import junit.framework.TestCase;
Modified:
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java
URL:
http://svn.apache.org/viewvc/james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java?rev=906208&r1=906207&r2=906208&view=diff
==============================================================================
---
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java
(original)
+++
james/mime4j/trunk/core/src/test/java/org/apache/james/mime4j/stream/TestHandler.java
Wed Feb 3 19:51:59 2010
@@ -19,14 +19,11 @@
package org.apache.james.mime4j.stream;
-import org.apache.james.mime4j.stream.BodyDescriptor;
-import org.apache.james.mime4j.stream.ContentHandler;
-import org.apache.james.mime4j.stream.RawField;
-import org.apache.james.mime4j.util.ContentUtil;
-
import java.io.IOException;
import java.io.InputStream;
+import org.apache.james.mime4j.util.ContentUtil;
+
/**
* Helper class to run comparison of parsed results
*/
