Skip to content
Snippets Groups Projects
Commit df763c11 authored by ribeaudc's avatar ribeaudc
Browse files

Implementations of IReaderParser should not catch the IOException.

SVN: 207
parent b60ed927
No related branches found
No related tags found
No related merge requests found
...@@ -22,8 +22,6 @@ import java.io.Reader; ...@@ -22,8 +22,6 @@ import java.io.Reader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
/** /**
* A default <code>IReaderParser</code> implementation. * A default <code>IReaderParser</code> implementation.
* <p> * <p>
...@@ -97,12 +95,12 @@ public class DefaultReaderParser<E> implements IReaderParser<E> ...@@ -97,12 +95,12 @@ public class DefaultReaderParser<E> implements IReaderParser<E>
// Parser // Parser
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
public final List<E> parse(Reader reader) public final List<E> parse(Reader reader) throws IOException
{ {
return parse(reader, COMMENT_AND_EMPTY_LINE_FILTER); return parse(reader, COMMENT_AND_EMPTY_LINE_FILTER);
} }
public final List<E> parse(Reader reader, ILineFilter lineFilter) public final List<E> parse(Reader reader, ILineFilter lineFilter) throws IOException
{ {
BufferedReader bufferedReader; BufferedReader bufferedReader;
if (reader instanceof BufferedReader) if (reader instanceof BufferedReader)
...@@ -135,9 +133,6 @@ public class DefaultReaderParser<E> implements IReaderParser<E> ...@@ -135,9 +133,6 @@ public class DefaultReaderParser<E> implements IReaderParser<E>
} }
} }
return elements; return elements;
} catch (IOException ex)
{
throw new CheckedExceptionTunnel(ex);
} finally } finally
{ {
// Destroys line tokenizer. // Destroys line tokenizer.
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package ch.systemsx.cisd.common.parser; package ch.systemsx.cisd.common.parser;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.util.List; import java.util.List;
...@@ -41,7 +42,7 @@ public interface IReaderParser<E> ...@@ -41,7 +42,7 @@ public interface IReaderParser<E>
* @return a <code>List</code> of elements. * @return a <code>List</code> of elements.
* @throws CheckedExceptionTunnel if an <code>IOException</code> occurs. * @throws CheckedExceptionTunnel if an <code>IOException</code> occurs.
*/ */
public List<E> parse(Reader reader, ILineFilter lineFilter) throws CheckedExceptionTunnel; public List<E> parse(Reader reader, ILineFilter lineFilter) throws IOException;
/** /**
* Parses given <code>Reader</code>. Encapsulates given <code>Reader</code> in a {@link BufferedReader} for * Parses given <code>Reader</code>. Encapsulates given <code>Reader</code> in a {@link BufferedReader} for
...@@ -53,7 +54,7 @@ public interface IReaderParser<E> ...@@ -53,7 +54,7 @@ public interface IReaderParser<E>
* @return a <code>List</code> of elements. * @return a <code>List</code> of elements.
* @throws CheckedExceptionTunnel if an <code>IOException</code> occurs. * @throws CheckedExceptionTunnel if an <code>IOException</code> occurs.
*/ */
public List<E> parse(Reader reader) throws CheckedExceptionTunnel; public List<E> parse(Reader reader) throws IOException;
/** /**
* Sets the <code>IParserObjectFactory</code>. * Sets the <code>IParserObjectFactory</code>.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment