From 8867d2920912a2c0dc857ea8945fa35fcaa61a21 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Wed, 22 Dec 2010 11:52:59 +0000
Subject: [PATCH] LMS-1940 Skip null values in the default parser, making it
possible for parser factories to decide if lines should be parsed or not.
SVN: 19210
---
.../java/ch/systemsx/cisd/common/parser/DefaultParser.java | 6 +++++-
.../systemsx/cisd/common/parser/IParserObjectFactory.java | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/common/source/java/ch/systemsx/cisd/common/parser/DefaultParser.java b/common/source/java/ch/systemsx/cisd/common/parser/DefaultParser.java
index e82a2b20af0..e715fc77493 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/DefaultParser.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/DefaultParser.java
@@ -80,7 +80,11 @@ public class DefaultParser<E> implements IParser<E>
{
throw new ParsingException(parserException, tokens, number);
}
- elements.add(object);
+ // Skip null values
+ if (null != object)
+ {
+ elements.add(object);
+ }
}
}
lineTokenizer.destroy();
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 93fb8bf241d..894745a8178 100644
--- a/common/source/java/ch/systemsx/cisd/common/parser/IParserObjectFactory.java
+++ b/common/source/java/ch/systemsx/cisd/common/parser/IParserObjectFactory.java
@@ -53,7 +53,8 @@ public interface IParserObjectFactory<E>
};
/**
- * Parses given text line and returns an appropriate <i>Object</i>.
+ * Parses given text line and returns an appropriate <i>Object</i>. If null is return, the value
+ * is skipped. If an error is encountered, throw a ParserException.
*/
public E createObject(final String[] lineTokens) throws ParserException;
}
\ No newline at end of file
--
GitLab