From df763c11bc3fdb41f6b9c2aef5b5b4bfab99f10d Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Fri, 25 May 2007 08:14:59 +0000
Subject: [PATCH] Implementations of IReaderParser should not catch the
IOException.
SVN: 207
---
.../systemsx/cisd/common/parser/DefaultReaderParser.java | 9 ++-------
.../ch/systemsx/cisd/common/parser/IReaderParser.java | 5 +++--
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/DefaultReaderParser.java b/common/source/java/ch/systemsx/cisd/common/parser/DefaultReaderParser.java
index 89f5ce4fe16..b7289b7bfd9 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/DefaultReaderParser.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/DefaultReaderParser.java
@@ -22,8 +22,6 @@ import java.io.Reader;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.common.exceptions.CheckedExceptionTunnel;
-
/**
* A default <code>IReaderParser</code> implementation.
* <p>
@@ -97,12 +95,12 @@ public class DefaultReaderParser<E> implements IReaderParser<E>
// 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);
}
- public final List<E> parse(Reader reader, ILineFilter lineFilter)
+ public final List<E> parse(Reader reader, ILineFilter lineFilter) throws IOException
{
BufferedReader bufferedReader;
if (reader instanceof BufferedReader)
@@ -135,9 +133,6 @@ public class DefaultReaderParser<E> implements IReaderParser<E>
}
}
return elements;
- } catch (IOException ex)
- {
- throw new CheckedExceptionTunnel(ex);
} finally
{
// Destroys line tokenizer.
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/IReaderParser.java b/common/source/java/ch/systemsx/cisd/common/parser/IReaderParser.java
index 41333464749..f9e21c7312d 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/IReaderParser.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/IReaderParser.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.common.parser;
import java.io.BufferedReader;
+import java.io.IOException;
import java.io.Reader;
import java.util.List;
@@ -41,7 +42,7 @@ public interface IReaderParser<E>
* @return a <code>List</code> of elements.
* @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
@@ -53,7 +54,7 @@ public interface IReaderParser<E>
* @return a <code>List</code> of elements.
* @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>.
--
GitLab