[Pzfilereader-svn] SF.net SVN: pzfilereader: [198] trunk/PZFileReader/src/test/java/net/sf/ pzfilereader

[<zep...@us...>]

Revision: 198
          http://svn.sourceforge.net/pzfilereader/?rev=198&view=rev
Author:   zepernick
Date:     2006-11-25 09:22:30 -0800 (Sat, 25 Nov 2006)

Log Message:
-----------
converted to idataset

Modified Paths:
--------------
    trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFile.java
    trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimited.java

Modified: trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFile.java
===================================================================
--- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFile.java	2006-11-25 17:21:43 UTC (rev 197)
+++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFile.java	2006-11-25 17:22:30 UTC (rev 198)
@@ -8,7 +8,6 @@
 import java.io.File;
 
 import net.sf.pzfilereader.DataError;
-import net.sf.pzfilereader.DataSet;
 import net.sf.pzfilereader.DefaultPZParserFactory;
 import net.sf.pzfilereader.IDataSet;
 import net.sf.pzfilereader.PZParser;
@@ -23,14 +22,14 @@
  */
 public class DelimitedColumnNamesInFile {
     public static void main(final String[] args) throws Exception {
-        DataSet ds = null;
         String[] colNames = null;
         OrderBy orderby = null;
 
         // delimited by a comma
         // text qualified by double quotes
         // ignore first record
-        ds = new DataSet(new File("net/sf/pzfilereader/columninfile/PEOPLE-CommaDelimitedWithQualifier.txt"), ",", "\"", false);
+        final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File("net/sf/pzfilereader/columninfile/PEOPLE-CommaDelimitedWithQualifier.txt"), ',', '\"');
+        final IDataSet ds = pzparser.parse();
 
         // re order the data set by last name
         orderby = new OrderBy();
@@ -56,9 +55,6 @@
             }
         }
 
-        // clear out the DataSet object for the JVM to collect
-        ds.freeMemory();
-
     }
 
     // used for Junit test

Modified: trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimited.java
===================================================================
--- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimited.java	2006-11-25 17:21:43 UTC (rev 197)
+++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimited.java	2006-11-25 17:22:30 UTC (rev 198)
@@ -8,7 +8,6 @@
 import java.io.File;
 
 import net.sf.pzfilereader.DataError;
-import net.sf.pzfilereader.DataSet;
 import net.sf.pzfilereader.DefaultPZParserFactory;
 import net.sf.pzfilereader.IDataSet;
 import net.sf.pzfilereader.PZParser;
@@ -21,7 +20,6 @@
  */
 public class TabDelimited {
     public static void main(final String[] args) throws Exception {
-        DataSet ds = null;
         String[] colNames = null;
         File tmpFile = null;
 
@@ -29,9 +27,8 @@
         // text qualified by double quotes
         // ignore first record
         tmpFile = new File("net/sf/pzfilereader/delim/tab/PEOPLE-TabDelimitedWithQualifier.txt");
-        System.out.println("tmp file path: " + tmpFile);
-        // ds = new DataSet(new FileInputStream(tmpFile),"\t","",true);
-        ds = new DataSet(tmpFile, "\t", "\"", true);
+        final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(tmpFile, '\t', '\"');
+        final IDataSet ds = pzparser.parse();
 
         // re order the data set by last name
         /*
@@ -58,9 +55,6 @@
             }
         }
 
-        // clear out the DataSet object for the JVM to collect
-        ds.freeMemory();
-
     }
 
     // used for Junit test


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