[Pzfilereader-svn] SF.net SVN: pzfilereader: [164] trunk/PZFileReader/src

[<be...@us...>]

Revision: 164
          http://svn.sourceforge.net/pzfilereader/?rev=164&view=rev
Author:   benoitx
Date:     2006-10-31 12:47:02 -0800 (Tue, 31 Oct 2006)

Log Message:
-----------
do not use null for empty fields, use an empty String.

Modified Paths:
--------------
    trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/BXParser.java
    trunk/PZFileReader/src/test/java/net/sf/pzfilereader/parserutils/BXParserTest.java

Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/BXParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/BXParser.java	2006-10-31 20:02:48 UTC (rev 163)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/BXParser.java	2006-10-31 20:47:02 UTC (rev 164)
@@ -25,7 +25,7 @@
         int size = trimmedLine.length();
 
         if (size == 0) {
-            list.add(null);
+            list.add("");
             return list;
         }
 
@@ -56,9 +56,7 @@
 
                     trimmed = trimmed.replaceAll(doubleQualifier, String.valueOf(qualifier));
 
-                    if (trimmed.length() == 1 && trimmed.charAt(0) == delimiter) {
-                        list.add(null);
-                    } else if (trimmed.length() == 1 && trimmed.charAt(0) == qualifier) {
+                    if (trimmed.length() == 1 && (trimmed.charAt(0) == delimiter || trimmed.charAt(0) == qualifier)) {
                         list.add("");
                     } else {
                         list.add(trimmed);
@@ -102,7 +100,7 @@
                 list.add(str.trim());
             }
         } else if (trimmedLine.charAt(size - 1) == delimiter) {
-            list.add(null);
+            list.add("");
         }
 
         return list;

Modified: trunk/PZFileReader/src/test/java/net/sf/pzfilereader/parserutils/BXParserTest.java
===================================================================
--- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/parserutils/BXParserTest.java	2006-10-31 20:02:48 UTC (rev 163)
+++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/parserutils/BXParserTest.java	2006-10-31 20:47:02 UTC (rev 164)
@@ -103,12 +103,12 @@
     public void testSomeExtremeCases() {
         check(null, ',', '\"', new String[] {});
         check("a", ',', '\"', new String[] { "a" });
-        check("", ',', '\"', new String[] { null });
-        check(" ", ',', '\"', new String[] { null });
-        check("    ", ',', '\"', new String[] { null });
-        check(",", ',', '\"', new String[] { null, null });
-        check(",,", ',', '\"', new String[] { null, null, null });
-        check(",a,", ',', '\"', new String[] { null, "a", null });
+        check("", ',', '\"', new String[] { "" });
+        check(" ", ',', '\"', new String[] { "" });
+        check("    ", ',', '\"', new String[] { "" });
+        check(",", ',', '\"', new String[] { "", "" });
+        check(",,", ',', '\"', new String[] { "", "", "" });
+        check(",a,", ',', '\"', new String[] { "", "a", "" });
 
         check("\"a,b,c\"", ',', '\"', new String[] { "a,b,c" });
         check("\"a,b\",\"c\"", ',', '\"', new String[] { "a,b", "c" });
@@ -126,8 +126,8 @@
         check("  a, b ,c ", ',', '\"', new String[] { "a", "b", "c" });
         check("\"a\",     b  ,    \"c\"", ',', '\"', new String[] { "a", "b", "c" });
 
-        check("\"\",,,,\"last one\"", ',', '\"', new String[] { "", null, null, null, "last one" });
-        check("\"first\",\"second\",", ',', '\"', new String[] { "first", "second", null });
+        check("\"\",,,,\"last one\"", ',', '\"', new String[] { "", "", "", "", "last one" });
+        check("\"first\",\"second\",", ',', '\"', new String[] { "first", "second", "" });
         check("\"  a,b,c\"", ',', '\"', new String[] { "  a,b,c" });
         check("\"  a,b,c\",d", ',', '\"', new String[] { "  a,b,c", "d" });
         check("\"a, b,\"\"c\"", ',', '\"', new String[] { "a, b,\"c" });


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.