Menu
▾
▴
[Pzfilereader-svn] SF.net SVN: pzfilereader: [206] trunk/PZFileReader/src
|
From: <zep...@us...> - 2006-11-27 13:22:41
|
Revision: 206
http://svn.sourceforge.net/pzfilereader/?rev=206&view=rev
Author: zepernick
Date: 2006-11-27 05:22:39 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
renamed IDataSet to DataSet
Modified Paths:
--------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java
trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFile.java
trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java
trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimited.java
trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java
Added Paths:
-----------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java
Removed Paths:
-------------
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/IDataSet.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -81,7 +81,7 @@
this.ignoreFirstRecord = ignoreFirstRecord;
}
- public IDataSet doParse() {
+ public DataSet doParse() {
try {
if (getDataSourceStream() != null) {
return doDelimitedFile(getDataSourceStream(), getDelimiter(), getQualifier(), isIgnoreFirstRecord(),
@@ -144,7 +144,7 @@
* puts together the dataset for a DELIMITED file. This is used for PZ XML
* mappings, and SQL table mappings
*/
- private IDataSet doDelimitedFile(final InputStream dataSource, final char delimiter, final char qualifier,
+ private DataSet doDelimitedFile(final InputStream dataSource, final char delimiter, final char qualifier,
final boolean ignoreFirstRecord, final boolean createMDFromFile) throws IOException, Exception {
if (dataSource == null) {
throw new NullPointerException("dataSource is null");
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -70,7 +70,7 @@
super(dataSourceStream);
}
- public IDataSet doParse() {
+ public DataSet doParse() {
try {
if (getDataSourceStream() != null) {
return doFixedLengthFile(getDataSourceStream());
@@ -105,7 +105,7 @@
* puts together the dataset for fixed length file. This is used for PZ XML
* mappings, and SQL table mappings
*/
- private IDataSet doFixedLengthFile(final InputStream dataSource) throws IOException {
+ private DataSet doFixedLengthFile(final InputStream dataSource) throws IOException {
InputStreamReader isr = null;
BufferedReader br = null;
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractPZParser.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -92,14 +92,14 @@
this.handlingShortLines = handleShortLines;
}
- public final IDataSet parse() {
+ public final DataSet parse() {
if (!initialised) {
init();
}
return doParse();
}
- protected abstract IDataSet doParse();
+ protected abstract DataSet doParse();
protected abstract void init();
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -124,7 +124,7 @@
}
}
- public IDataSet doParse() {
+ public DataSet doParse() {
return null;
}
}
Copied: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java (from rev 205, trunk/PZFileReader/src/main/java/net/sf/pzfilereader/IDataSet.java)
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java (rev 0)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DataSet.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -0,0 +1,284 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader.
+ *
+ * Based in London, we are world leaders in the design and development
+ * of bespoke applications for the securities financing markets.
+ *
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ * ___ _ _ _ _ _
+ * / _ \| |__ (_) ___ ___| |_| | __ _| |__
+ * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
+ * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
+ * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ * |__/
+ *
+ * www.ObjectLab.co.uk
+ *
+ * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.sf.pzfilereader;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Properties;
+
+import net.sf.pzfilereader.ordering.OrderBy;
+
+public interface DataSet {
+
+ /**
+ * Goes to the top of the data set. This will put the pointer one record
+ * before the first in the set. Next() will have to be called to get the
+ * first record after this call.
+ */
+ void goTop();
+
+ /**
+ * Goes to the last record in the dataset
+ */
+ void goBottom();
+
+ /**
+ * Moves to the next record in the set. Returns true if move was a success,
+ * false if not
+ *
+ * @return boolean
+ */
+ boolean next();
+
+ /**
+ * Moves back to the previous record in the set return true if move was a
+ * success, false if not
+ *
+ * @return boolean
+ */
+ boolean previous();
+
+ /**
+ * Returns the string value of a specified column
+ *
+ * @param column -
+ * Name of the column
+ * @exception NoSuchElementException
+ * @return String
+ */
+ String getString(final String column);
+
+ /**
+ * Returns the double value of a specified column
+ *
+ * @param column -
+ * Name of the column
+ * @exception NoSuchElementException
+ * @exception NumberFormatException
+ * @return double
+ */
+ double getDouble(final String column);
+
+ /**
+ * Returns the interger value of a specified column
+ *
+ * @param column -
+ * Name of the column
+ * @exception NoSuchElementException
+ * @exception NumberFormatException
+ * @return double
+ */
+ int getInt(final String column);
+
+ /**
+ * Returns the date value of a specified column. This assumes the date is in
+ * yyyyMMdd. If your date is not in this format, see
+ * getDate(String,SimpleDateFormat)
+ *
+ * @param column -
+ * Name of the column
+ * @exception ParseException
+ * @return Date
+ */
+ Date getDate(final String column) throws ParseException;
+
+ /**
+ * Returns the date value of a specified column. This should be used if the
+ * date is NOT in yyyyMMdd format. The SimpleDateFormat object will specify
+ * what kind of format the date is in.
+ *
+ * @param column -
+ * Name of the column
+ * @param sdf -
+ * SimpleDateFormat of the date
+ * @exception ParseException
+ * @see java.text.SimpleDateFormat
+ * @return Date
+ */
+ Date getDate(final String column, final SimpleDateFormat sdf) throws ParseException;
+
+
+ /**
+ * Returns the value of the column with the type of object
+ * specified
+ *
+ * @param column
+ * Name of the column
+ * @param classToConvertTo
+ * Class type to convert to
+ * @return Object
+ * Value of the column in the specified object
+ */
+ Object getObject(final String column, final Class classToConvertTo);
+
+ /**
+ * Returns a String array of column names in the DataSet. This will assume
+ * 'detail' <RECORD> ID.
+ *
+ * @return String[]
+ */
+ String[] getColumns();
+
+ /**
+ * Returns a String array of column names in the DataSet for a given
+ * <RECORD> id
+ *
+ * @param recordID
+ * @return String[]
+ */
+ String[] getColumns(final String recordID);
+
+ /**
+ * Returns the line number the pointer is on. These are the actual line
+ * numbers from the flat file, before any sorting.
+ *
+ * @exception NoSuchElementException
+ * @exception NumberFormatException
+ * @return int
+ */
+ int getRowNo();
+
+ /**
+ * Returns A Collection Of DataErrors that happened during processing
+ *
+ * @return Vector
+ */
+ List getErrors();
+
+ /**
+ * Removes a row from the dataset. Once the row is removed the pointer will
+ * be sitting on the record previous to the deleted row.
+ */
+ void remove();
+
+ /**
+ * Returns the index the pointer is on for the array
+ *
+ * @return int
+ */
+ int getIndex();
+
+ /**
+ * Returns the total number of rows parsed in from the file
+ *
+ *
+ * @return int - Row Count
+ */
+ int getRowCount();
+
+ /**
+ * Returns total number of records which contained a parse error in the
+ * file.
+ *
+ * @return int - Record Error Count
+ */
+ int getErrorCount();
+
+ /**
+ * Returns true or false as to whether or not the line number contains an
+ * error. The import will skip the line if it contains an error and it will
+ * not be processed
+ *
+ * @param lineNo -
+ * int line number
+ * @return boolean
+ */
+ boolean isAnError(final int lineNo);
+
+ /**
+ * Orders the data by column(s) specified. This will reposition the cursor
+ * to the top of the DataSet when executed. This is currently not supported
+ * when specying <RECORD> elements in the mapping. An exception will be
+ * thrown if this situation occurs
+ *
+ * @param ob -
+ * OrderBy object
+ * @exception Exception
+ * @see net.sf.pzfilereader.ordering.OrderBy
+ * @see net.sf.pzfilereader.ordering.OrderColumn
+ */
+ void orderRows(final OrderBy ob) throws Exception;
+
+ List getRows();
+
+ /**
+ * Sets data in the DataSet to lowercase
+ */
+ void setLowerCase();
+
+ /**
+ * Sets data in the DataSet to uppercase
+ */
+ void setUpperCase();
+
+ /**
+ * Checks to see if the row has the given <RECORD> id
+ *
+ * @param recordID
+ * @return boolean
+ */
+ boolean isRecordID(final String recordID);
+
+ /**
+ * Sets the absolute position of the record pointer
+ *
+ * @param localPointer -
+ * int
+ * @exception IndexOutOfBoundsException
+ */
+ void absolute(final int localPointer);
+
+ /**
+ * Setting this to True will parse text as is and throw a
+ * NumberFormatException. Setting to false, which is the default, will
+ * remove any non numeric charcter from the field. The remaining numeric
+ * chars's will be returned. If it is an empty string,or there are no
+ * numeric chars, 0 will be returned for getInt() and getDouble()
+ *
+ * @param strictNumericParse
+ * The strictNumericParse to set.
+ */
+ void setStrictNumericParse(final boolean strictNumericParse);
+
+ /**
+ * Sets the properties from the pzconvert.properties file.
+ * This file specifies the PZConverter implementation to use
+ * for a particular class
+ *
+ * @param props
+ * Property mapping for String to Object conversion
+ */
+ void setPZConvertProps(Properties props);
+}
\ No newline at end of file
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -54,7 +54,7 @@
* @author xhensevb
*
*/
-public class DefaultDataSet implements IDataSet {
+public class DefaultDataSet implements DataSet {
private final List rows = new ArrayList();
private final List errors = new ArrayList();
Deleted: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/IDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/IDataSet.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/IDataSet.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -1,284 +0,0 @@
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is supporting PZFileReader.
- *
- * Based in London, we are world leaders in the design and development
- * of bespoke applications for the securities financing markets.
- *
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
- * ___ _ _ _ _ _
- * / _ \| |__ (_) ___ ___| |_| | __ _| |__
- * | | | | '_ \| |/ _ \/ __| __| | / _` | '_ \
- * | |_| | |_) | | __/ (__| |_| |__| (_| | |_) |
- * \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- * |__/
- *
- * www.ObjectLab.co.uk
- *
- * $Id: ColorProvider.java 74 2006-10-24 22:19:05Z benoitx $
- *
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package net.sf.pzfilereader;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-
-import net.sf.pzfilereader.ordering.OrderBy;
-
-public interface IDataSet {
-
- /**
- * Goes to the top of the data set. This will put the pointer one record
- * before the first in the set. Next() will have to be called to get the
- * first record after this call.
- */
- void goTop();
-
- /**
- * Goes to the last record in the dataset
- */
- void goBottom();
-
- /**
- * Moves to the next record in the set. Returns true if move was a success,
- * false if not
- *
- * @return boolean
- */
- boolean next();
-
- /**
- * Moves back to the previous record in the set return true if move was a
- * success, false if not
- *
- * @return boolean
- */
- boolean previous();
-
- /**
- * Returns the string value of a specified column
- *
- * @param column -
- * Name of the column
- * @exception NoSuchElementException
- * @return String
- */
- String getString(final String column);
-
- /**
- * Returns the double value of a specified column
- *
- * @param column -
- * Name of the column
- * @exception NoSuchElementException
- * @exception NumberFormatException
- * @return double
- */
- double getDouble(final String column);
-
- /**
- * Returns the interger value of a specified column
- *
- * @param column -
- * Name of the column
- * @exception NoSuchElementException
- * @exception NumberFormatException
- * @return double
- */
- int getInt(final String column);
-
- /**
- * Returns the date value of a specified column. This assumes the date is in
- * yyyyMMdd. If your date is not in this format, see
- * getDate(String,SimpleDateFormat)
- *
- * @param column -
- * Name of the column
- * @exception ParseException
- * @return Date
- */
- Date getDate(final String column) throws ParseException;
-
- /**
- * Returns the date value of a specified column. This should be used if the
- * date is NOT in yyyyMMdd format. The SimpleDateFormat object will specify
- * what kind of format the date is in.
- *
- * @param column -
- * Name of the column
- * @param sdf -
- * SimpleDateFormat of the date
- * @exception ParseException
- * @see java.text.SimpleDateFormat
- * @return Date
- */
- Date getDate(final String column, final SimpleDateFormat sdf) throws ParseException;
-
-
- /**
- * Returns the value of the column with the type of object
- * specified
- *
- * @param column
- * Name of the column
- * @param classToConvertTo
- * Class type to convert to
- * @return Object
- * Value of the column in the specified object
- */
- Object getObject(final String column, final Class classToConvertTo);
-
- /**
- * Returns a String array of column names in the DataSet. This will assume
- * 'detail' <RECORD> ID.
- *
- * @return String[]
- */
- String[] getColumns();
-
- /**
- * Returns a String array of column names in the DataSet for a given
- * <RECORD> id
- *
- * @param recordID
- * @return String[]
- */
- String[] getColumns(final String recordID);
-
- /**
- * Returns the line number the pointer is on. These are the actual line
- * numbers from the flat file, before any sorting.
- *
- * @exception NoSuchElementException
- * @exception NumberFormatException
- * @return int
- */
- int getRowNo();
-
- /**
- * Returns A Collection Of DataErrors that happened during processing
- *
- * @return Vector
- */
- List getErrors();
-
- /**
- * Removes a row from the dataset. Once the row is removed the pointer will
- * be sitting on the record previous to the deleted row.
- */
- void remove();
-
- /**
- * Returns the index the pointer is on for the array
- *
- * @return int
- */
- int getIndex();
-
- /**
- * Returns the total number of rows parsed in from the file
- *
- *
- * @return int - Row Count
- */
- int getRowCount();
-
- /**
- * Returns total number of records which contained a parse error in the
- * file.
- *
- * @return int - Record Error Count
- */
- int getErrorCount();
-
- /**
- * Returns true or false as to whether or not the line number contains an
- * error. The import will skip the line if it contains an error and it will
- * not be processed
- *
- * @param lineNo -
- * int line number
- * @return boolean
- */
- boolean isAnError(final int lineNo);
-
- /**
- * Orders the data by column(s) specified. This will reposition the cursor
- * to the top of the DataSet when executed. This is currently not supported
- * when specying <RECORD> elements in the mapping. An exception will be
- * thrown if this situation occurs
- *
- * @param ob -
- * OrderBy object
- * @exception Exception
- * @see net.sf.pzfilereader.ordering.OrderBy
- * @see net.sf.pzfilereader.ordering.OrderColumn
- */
- void orderRows(final OrderBy ob) throws Exception;
-
- List getRows();
-
- /**
- * Sets data in the DataSet to lowercase
- */
- void setLowerCase();
-
- /**
- * Sets data in the DataSet to uppercase
- */
- void setUpperCase();
-
- /**
- * Checks to see if the row has the given <RECORD> id
- *
- * @param recordID
- * @return boolean
- */
- boolean isRecordID(final String recordID);
-
- /**
- * Sets the absolute position of the record pointer
- *
- * @param localPointer -
- * int
- * @exception IndexOutOfBoundsException
- */
- void absolute(final int localPointer);
-
- /**
- * Setting this to True will parse text as is and throw a
- * NumberFormatException. Setting to false, which is the default, will
- * remove any non numeric charcter from the field. The remaining numeric
- * chars's will be returned. If it is an empty string,or there are no
- * numeric chars, 0 will be returned for getInt() and getDouble()
- *
- * @param strictNumericParse
- * The strictNumericParse to set.
- */
- void setStrictNumericParse(final boolean strictNumericParse);
-
- /**
- * Sets the properties from the pzconvert.properties file.
- * This file specifies the PZConverter implementation to use
- * for a particular class
- *
- * @param props
- * Property mapping for String to Object conversion
- */
- void setPZConvertProps(Properties props);
-}
\ No newline at end of file
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/PZParser.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -46,7 +46,7 @@
*
* @return the data set resulting from parsing
*/
- IDataSet parse();
+ DataSet parse();
/**
* @return true, lines with less columns then the amount of column headers
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ExcelTransformer.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -22,7 +22,7 @@
import jxl.write.WritableFont;
import jxl.write.WritableSheet;
import jxl.write.WritableWorkbook;
-import net.sf.pzfilereader.IDataSet;
+import net.sf.pzfilereader.DataSet;
/**
* @author Paul Zepernick
@@ -31,7 +31,7 @@
*/
public class ExcelTransformer {
- private IDataSet ds;
+ private DataSet ds;
private File xlsFile;
@@ -43,7 +43,7 @@
* @param xlsFile
* Excel file to be created
*/
- public ExcelTransformer(final IDataSet ds, final File xlsFile) {
+ public ExcelTransformer(final DataSet ds, final File xlsFile) {
this.ds = ds;
this.xlsFile = xlsFile;
}
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-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFile.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -9,7 +9,7 @@
import net.sf.pzfilereader.DataError;
import net.sf.pzfilereader.DefaultPZParserFactory;
-import net.sf.pzfilereader.IDataSet;
+import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.PZParser;
import net.sf.pzfilereader.ordering.OrderBy;
import net.sf.pzfilereader.ordering.OrderColumn;
@@ -29,7 +29,7 @@
// text qualified by double quotes
// ignore first record
final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(new File("net/sf/pzfilereader/columninfile/PEOPLE-CommaDelimitedWithQualifier.txt"), ',', '\"');
- final IDataSet ds = pzparser.parse();
+ final DataSet ds = pzparser.parse();
// re order the data set by last name
orderby = new OrderBy();
@@ -59,7 +59,7 @@
// used for Junit test
- public IDataSet getDsForTest() throws Exception {
+ public DataSet getDsForTest() throws Exception {
final PZParser parser = DefaultPZParserFactory.getInstance().newDelimitedParser(
new File("src/test/java/net/sf/pzfilereader/columninfile/PEOPLE-CommaDelimitedWithQualifier.txt"), ',', '\"');
Modified: trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java
===================================================================
--- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/columninfile/DelimitedColumnNamesInFileTest.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -7,7 +7,7 @@
package net.sf.pzfilereader.columninfile;
import junit.framework.TestCase;
-import net.sf.pzfilereader.IDataSet;
+import net.sf.pzfilereader.DataSet;
/**
* @author zepernick
@@ -22,7 +22,7 @@
// tests to make sure we have 0 errors
public void testErrorCount() {
- IDataSet ds = null;
+ DataSet ds = null;
try {
final DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile();
@@ -41,7 +41,7 @@
// test to make sure we parsed the correct number
// of rows in the file
public void testRowCount() {
- IDataSet ds = null;
+ DataSet ds = null;
try {
final DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile();
@@ -59,7 +59,7 @@
// test to make sure we have the right number of column names from the file
public void testColumnNameCount() {
- IDataSet ds = null;
+ DataSet ds = null;
try {
final DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile();
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-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimited.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -9,7 +9,7 @@
import net.sf.pzfilereader.DataError;
import net.sf.pzfilereader.DefaultPZParserFactory;
-import net.sf.pzfilereader.IDataSet;
+import net.sf.pzfilereader.DataSet;
import net.sf.pzfilereader.PZParser;
/**
@@ -28,7 +28,7 @@
// ignore first record
tmpFile = new File("net/sf/pzfilereader/delim/tab/PEOPLE-TabDelimitedWithQualifier.txt");
final PZParser pzparser = DefaultPZParserFactory.getInstance().newDelimitedParser(tmpFile, '\t', '\"');
- final IDataSet ds = pzparser.parse();
+ final DataSet ds = pzparser.parse();
// re order the data set by last name
/*
@@ -59,7 +59,7 @@
// used for Junit test
- public IDataSet getDsForTest() throws Exception {
+ public DataSet getDsForTest() throws Exception {
final PZParser parser = DefaultPZParserFactory.getInstance().newDelimitedParser(
new File("src/test/java/net/sf/pzfilereader/delim/tab/PEOPLE-TabDelimitedWithQualifier.txt"), '\t', '\"');
Modified: trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java
===================================================================
--- trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java 2006-11-26 14:01:12 UTC (rev 205)
+++ trunk/PZFileReader/src/test/java/net/sf/pzfilereader/delim/tab/TabDelimitedTest.java 2006-11-27 13:22:39 UTC (rev 206)
@@ -7,7 +7,7 @@
package net.sf.pzfilereader.delim.tab;
import junit.framework.TestCase;
-import net.sf.pzfilereader.IDataSet;
+import net.sf.pzfilereader.DataSet;
/**
* @author zepernick
@@ -22,7 +22,7 @@
// tests to make sure we have 0 errors
public void testErrorCount() {
- IDataSet ds = null;
+ DataSet ds = null;
try {
final TabDelimited testTab = new TabDelimited();
@@ -41,7 +41,7 @@
// test to make sure we parsed the correct number
// of rows in the file
public void testRowCount() {
- IDataSet ds = null;
+ DataSet ds = null;
try {
final TabDelimited testTab = new TabDelimited();
@@ -59,7 +59,7 @@
// test to make sure we have the right number of column names from the file
public void testColumnNameCount() {
- IDataSet ds = null;
+ DataSet ds = null;
try {
final TabDelimited testTab = new TabDelimited();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
