From f2953db96d2b580f35a72bfd7bd9d6b4b9a829ac Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Mon, 21 May 2007 12:02:26 +0000
Subject: [PATCH] TODO added.
SVN: 118
---
.../cisd/common/parser/DefaultReaderParser.java | 17 +++--------------
.../common/parser/IParserObjectFactory.java | 4 ++--
.../cisd/common/parser/IPropertyMapper.java | 1 +
.../common/parser/IPropertyMapperFactory.java | 2 ++
4 files changed, 8 insertions(+), 16 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 421be80ab5f..0ed2a9677a8 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/DefaultReaderParser.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/DefaultReaderParser.java
@@ -82,18 +82,6 @@ public class DefaultReaderParser<E> implements IReaderParser<E>
return lineTokenizer.tokenize(lineNumber, line);
}
- /** Inits the parsing. */
- protected void initParsing() {
- // Inits <code>ILineTokenizer</code>
- lineTokenizer.init();
- String line;
- //
- if (mapperFactory.getHeaderLine() < 0)
- {
-
- }
- }
-
///////////////////////////////////////////////////////
// Parser
///////////////////////////////////////////////////////
@@ -116,13 +104,14 @@ public class DefaultReaderParser<E> implements IReaderParser<E>
List<E> elements = new ArrayList<E>();
synchronized (lineTokenizer)
{
- initParsing();
+ // Inits <code>ILineTokenizer</code>
+ lineTokenizer.init();
String line;
try
{
for (int lineNumber = 0; (line = bufferedReader.readLine()) != null; lineNumber++)
{
- if (mapperFactory.getHeaderLine() > -1)
+ if (mapperFactory != null && mapperFactory.getHeaderLine() > -1)
{
String[] tokens = parseLine(lineNumber, line);
factory.setPropertyMapper(mapperFactory.createPropertyMapper(tokens));
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/IParserObjectFactory.java b/common/source/java/ch/systemsx/cisd/common/parser/IParserObjectFactory.java
index 0183eeed7ae..b7ef78fdb38 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/IParserObjectFactory.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/IParserObjectFactory.java
@@ -38,9 +38,9 @@ public interface IParserObjectFactory<E>
public final static IParserObjectFactory<String[]> DO_NOTHING_OBJECT_FACTORY = new IParserObjectFactory<String[]>()
{
- // /////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////
// IParserObjectFactory
- // /////////////////////////////////////////////////////
+ ///////////////////////////////////////////////////////
public String[] createObject(String[] lineTokens)
{
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapper.java b/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapper.java
index 838dda1e09f..0c202ac7eca 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapper.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapper.java
@@ -37,6 +37,7 @@ public interface IPropertyMapper
*
* @author Christian Ribeaud
*/
+ // TODO Christian: we should maybe add a type...
public final static class Property {
public final int column;
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapperFactory.java b/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapperFactory.java
index d2c3c54de32..9d3a6ee5fb8 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapperFactory.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/IPropertyMapperFactory.java
@@ -21,6 +21,8 @@ package ch.systemsx.cisd.common.parser;
*
* @author Christian Ribeaud
*/
+// TODO Christian: actually this only can understand file with a header. We should
+// be more generic.
public interface IPropertyMapperFactory
{
public int getHeaderLine();
--
GitLab