From cfa7878be8e7a01593c86a8958dddf32ebcbcfc8 Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Tue, 30 Aug 2011 13:12:25 +0000
Subject: [PATCH] LMS-2462 fixed dependencies
SVN: 22716
---
.../cisd/common/parser/ExcelRowTokenizer.java | 12 ++++--------
.../systemsx/cisd/common/parser/ILineTokenizer.java | 2 +-
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java b/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java
index 5f7450f1470..1e2293d040e 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/ExcelRowTokenizer.java
@@ -31,7 +31,7 @@ public class ExcelRowTokenizer implements ILineTokenizer<Row>
{
}
- public String[] tokenize(Row row) throws ParsingException
+ public String[] tokenize(Row row) throws ParserException
{
return tokenizeRow(row);
}
@@ -48,7 +48,7 @@ public class ExcelRowTokenizer implements ILineTokenizer<Row>
return line;
}
- private static String extractCellValue(Cell cell) throws ParsingException
+ private static String extractCellValue(Cell cell) throws ParserException
{
switch (cell.getCellType())
{
@@ -65,13 +65,9 @@ public class ExcelRowTokenizer implements ILineTokenizer<Row>
"Excel formulas are not supported but one was found in cell "
+ extractCellPosition(cell));
case Cell.CELL_TYPE_ERROR:
- throw new ParsingException(new String[]
- { "There is an error in cell " + extractCellPosition(cell) },
- cell.getRowIndex());
+ throw new ParserException("There is an error in cell " + extractCellPosition(cell));
default:
- throw new ParsingException(new String[]
- { "Unknown data type of cell " + extractCellPosition(cell) },
- cell.getRowIndex());
+ throw new ParserException("Unknown data type of cell " + extractCellPosition(cell));
}
}
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java b/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java
index 5999199923f..c4d3d0e2868 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/ILineTokenizer.java
@@ -34,7 +34,7 @@ public interface ILineTokenizer<T>
public void init();
/** Splits given <code>line</code> into an array of tokens. */
- public String[] tokenize(T line) throws ParsingException;
+ public String[] tokenize(T line) throws ParserException;
/**
* Cleans up resources used by this <code>ILineTokenizer</code>.
--
GitLab