Menu
▾
▴
[Pzfilereader-svn] SF.net SVN: pzfilereader: [297] trunk/PZFileReader/src/main/java/net/sf/ pzfilereader
|
From: <zep...@us...> - 2007-04-21 15:41:42
|
Revision: 297
http://svn.sourceforge.net/pzfilereader/?rev=297&view=rev
Author: zepernick
Date: 2007-04-21 08:41:43 -0700 (Sat, 21 Apr 2007)
Log Message:
-----------
Implemented the change to allow the user to specify if the column
lookups should or should not be case sensitive. This required passing
the PZParser object around to several places in util methods and
in the DataSet. I think it will be handy to have it there for
future changes so that we can easily obtain all the options the
user has flagged for the parse.
Deprecated old signatures of any method the PZParser parmeter
was added to. It is possible to leave the PZParser null so anyone
using a deprecated method can just pass a null in for the parser.
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/DBDelimiterPZParser.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/DelimiterPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/XMLRecordElement.java
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractDelimiterPZParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -169,7 +169,7 @@
throw new NullPointerException("dataSource is null");
}
BufferedReader br = null;
- final DefaultDataSet ds = new DefaultDataSet(getColumnMD());
+ final DefaultDataSet ds = new DefaultDataSet(getColumnMD(), this);
try {
//gather the conversion properties
ds.setPZConvertProps(ParserUtils.loadConvertProperties());
@@ -189,7 +189,7 @@
continue;
} else if (!processedFirst && createMDFromFile) {
processedFirst = true;
- setColumnMD(ParserUtils.getColumnMDFromFile(line, delimiter, qualifier));
+ setColumnMD(ParserUtils.getColumnMDFromFile(line, delimiter, qualifier, this));
ds.setColumnMD(getColumnMD());
continue;
}
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/AbstractFixedLengthPZParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -109,7 +109,7 @@
private DataSet doFixedLengthFile(final Reader dataSource) throws IOException {
BufferedReader br = null;
- final DefaultDataSet ds = new DefaultDataSet(getColumnMD());
+ final DefaultDataSet ds = new DefaultDataSet(getColumnMD(), this);
try {
//gather the conversion properties
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBDelimiterPZParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -78,7 +78,7 @@
final List cmds = ParserUtils.buildMDFromSQLTable(con, getDataDefinition());
addToColumnMD(PZConstants.DETAIL_ID, cmds);
- addToColumnMD(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(cmds));
+ addToColumnMD(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(cmds, this));
if (cmds.isEmpty()) {
throw new FileNotFoundException("DATA DEFINITION CAN NOT BE FOUND IN THE DATABASE " + getDataDefinition());
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DBFixedLengthPZParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -97,7 +97,7 @@
final List cmds = ParserUtils.buildMDFromSQLTable(con, getDataDefinition());
addToColumnMD(PZConstants.DETAIL_ID, cmds);
- addToColumnMD(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(cmds));
+ addToColumnMD(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(cmds, this));
if (cmds.isEmpty()) {
throw new FileNotFoundException("DATA DEFINITION CAN NOT BE FOUND IN THE DATABASE " + getDataDefinition());
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DefaultDataSet.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -75,9 +75,12 @@
private boolean strictNumericParse = false;
private Map columnMD;
+
+ private PZParser pzparser;
- public DefaultDataSet(final Map columnMD2) {
+ public DefaultDataSet(final Map columnMD2, final PZParser pzparser) {
this.columnMD = columnMD2;
+ this.pzparser = pzparser;
}
public void addRow(final Row row) {
@@ -147,7 +150,7 @@
*/
public Date getDate(final String column, final SimpleDateFormat sdf) throws ParseException {
final Row row = (Row) rows.get(pointer);
- final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
+ final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser));
if (s.trim().equals("")) {
//don't do the parse on empties
return null;
@@ -164,7 +167,7 @@
final StringBuffer newString = new StringBuffer();
final Row row = (Row) rows.get(pointer);
- final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
+ final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser));
if (!strictNumericParse) {
newString.append(ParserUtils.stripNonDoubleChars(s));
@@ -178,7 +181,7 @@
public Object getObject(String column, Class classToConvertTo) {
final Row row = (Row) rows.get(pointer);
- final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
+ final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser));
return ParserUtils.runPzConverter(pzConvertProps, s, classToConvertTo);
}
@@ -221,7 +224,7 @@
public int getInt(final String column) {
final StringBuffer newString = new StringBuffer();
final Row row = (Row) rows.get(pointer);
- final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
+ final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser));
if (!strictNumericParse) {
newString.append(ParserUtils.stripNonLongChars(s));
@@ -257,7 +260,7 @@
*/
public String getString(final String column) {
final Row row = (Row) rows.get(pointer);
- final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column));
+ final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser));
if (upperCase) {
// convert data to uppercase before returning
@@ -280,7 +283,7 @@
public void setValue(String column, String value) {
final Row row = (Row) rows.get(pointer);
- final int colIndex = ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column);
+ final int colIndex = ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser);
row.setValue(colIndex, value);
}
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DelimiterPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DelimiterPZParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/DelimiterPZParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -39,7 +39,6 @@
import java.io.InputStreamReader;
import java.io.Reader;
-import net.sf.pzfilereader.util.ParserUtils;
import net.sf.pzfilereader.xml.PZMapParser;
import org.jdom.JDOMException;
@@ -125,7 +124,7 @@
if (this.pzmapReader != null) {
try {
- setColumnMD(PZMapParser.parse(this.pzmapReader));
+ setColumnMD(PZMapParser.parse(this.pzmapReader, this));
} finally {
if (closeMapReader) {
//only close the reader if it is one we created
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/FixedLengthPZParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -104,7 +104,7 @@
}
try {
- setColumnMD(PZMapParser.parse(this.pzmapReader));
+ setColumnMD(PZMapParser.parse(this.pzmapReader, this));
} finally {
if (closeMapReader) {
//only close the reader if it is one we created
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderDelimPZParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -125,7 +125,7 @@
continue;
} else if (!processedFirst && shouldCreateMDFromFile()) {
processedFirst = true;
- setColumnMD(ParserUtils.getColumnMDFromFile(line, getDelimiter(), getQualifier()));
+ setColumnMD(ParserUtils.getColumnMDFromFile(line, getDelimiter(), getQualifier(), this));
continue;
}
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/brparse/BuffReaderPZDataSet.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -51,7 +51,7 @@
private final Logger logger = LoggerFactory.getLogger(BuffReaderPZDataSet.class);
public BuffReaderPZDataSet(final Map columnMD2, final BuffReaderDelimPZParser brDelimPzParser) {
- super(columnMD2);
+ super(columnMD2, brDelimPzParser);
//register the parser with the dataset so we can fetch rows from
//the bufferedreader as needed
this.brDelimPzParser = brDelimPzParser;
@@ -59,7 +59,7 @@
}
public BuffReaderPZDataSet(final Map columnMD2, final BuffReaderFixedPZParser brFixedPzParser) {
- super(columnMD2);
+ super(columnMD2, brFixedPzParser);
//register the parser with the dataset so we can fetch rows from
//the bufferedreader as needed
this.brFixedPzParser = brFixedPzParser;
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/util/ParserUtils.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -56,6 +56,7 @@
import java.util.Properties;
import java.util.Map.Entry;
+import net.sf.pzfilereader.PZParser;
import net.sf.pzfilereader.converter.PZConvertException;
import net.sf.pzfilereader.converter.PZConverter;
import net.sf.pzfilereader.structure.ColumnMetaData;
@@ -74,18 +75,6 @@
}
/**
- * @deprecated should only use the splitLine with a CHAR.
- * @param line
- * @param delimiter
- * @param qualifier
- * @return List
- */
- public static List splitLine(final String line, final String delimiter, final String qualifier) {
- return splitLine(line, delimiter != null ? delimiter.charAt(0) : 0, qualifier != null ? qualifier.charAt(0) : 0,
- PZConstants.SPLITLINE_SIZE_INIT);
- }
-
- /**
* Returns an ArrayList of items in a delimited string. If there is no
* qualifier around the text, the qualifier parameter can be left null, or
* empty. There should not be any line breaks in the string. Each line of
@@ -353,8 +342,25 @@
* @param qualifier
* @exception Exception
* @return ArrayList - ColumnMetaData
+ * @deprecated Use getColumnMDFromFile(String, char, char, PZParser)
*/
public static Map getColumnMDFromFile(final String line, final char delimiter, final char qualifier) {
+ return getColumnMDFromFile(line, delimiter, qualifier, null);
+ }
+
+ /**
+ * Returns a list of ColumnMetaData objects. This is for use with delimited
+ * files. The first line of the file which contains data will be used as the
+ * column names
+ *
+ * @param line
+ * @param delimiter
+ * @param qualifier
+ * @param p
+ * PZParser used to specify additional option when working witht the ColumnMetaData. Can be null
+ * @return ArrayList - ColumnMetaData
+ */
+ public static Map getColumnMDFromFile(final String line, final char delimiter, final char qualifier, final PZParser p) {
List lineData = null;
final List results = new ArrayList();
final Map columnMD = new LinkedHashMap();
@@ -367,7 +373,7 @@
}
columnMD.put(PZConstants.DETAIL_ID, results);
- columnMD.put(PZConstants.COL_IDX, buidColumnIndexMap(results));
+ columnMD.put(PZConstants.COL_IDX, buidColumnIndexMap(results, p));
return columnMD;
}
@@ -452,23 +458,7 @@
* @param qualifier -
* qualifier being used
* @return boolean
- * @deprecated use the char version
*/
- public static boolean isMultiLine(final char[] chrArry, final String delimiter, final String qualifier) {
- return isMultiLine(chrArry, delimiter != null ? delimiter.charAt(0) : 0, qualifier != null ? qualifier.charAt(0) : 0);
- }
-
- /**
- * Determines if the given line is the first part of a multiline record
- *
- * @param chrArry -
- * char data of the line
- * @param delimiter -
- * delimiter being used
- * @param qualifier -
- * qualifier being used
- * @return boolean
- */
public static boolean isMultiLine(final char[] chrArry, final char delimiter, final char qualifier) {
// check if the last char is the qualifier, if so then this a good
@@ -567,20 +557,6 @@
}
- /**
- * Returns the key to the list of ColumnMetaData objects. Returns the
- * correct MetaData per the mapping file and the data contained on the line
- *
- *
- * @param columnMD
- * @param line
- * @return List - ColumMetaData
- * @deprecated Moved to FixedWidthParserUtils.getCMDKey()
- *
- */
- public static String getCMDKeyForFixedLengthFile(final Map columnMD, final String line) {
- return FixedWidthParserUtils.getCMDKey(columnMD, line);
- }
/**
* Returns the key to the list of ColumnMetaData objects. Returns the
@@ -643,19 +619,25 @@
* Use this method to find the index of a column.
*
* @author Benoit Xhenseval
+ * @author Paul Zepernick
* @param key
* @param columnMD
* @param colName
+ * @param p
+ * Can be null. Used to specify potential options on how the column should be retrieved
* @return -1 if it does not find it
*/
- public static int getColumnIndex(final String key, final Map columnMD, final String colName) {
+ public static int getColumnIndex(final String key, final Map columnMD, final String colName, final PZParser p) {
int idx = -1;
+ String column = colName;
+ if (p != null && !p.isColumnNamesCaseSensitive()) {
+ column = colName.toLowerCase(Locale.getDefault());
+ }
if (key != null && !key.equals(PZConstants.DETAIL_ID) && !key.equals(PZConstants.COL_IDX)) {
- idx = ((XMLRecordElement) columnMD.get(key)).getColumnIndex(colName.toLowerCase(
- Locale.getDefault()));
+ idx = ((XMLRecordElement) columnMD.get(key)).getColumnIndex(column);
} else if (key == null || key.equals(PZConstants.DETAIL_ID)) {
final Map map = (Map) columnMD.get(PZConstants.COL_IDX);
- final Integer i = (Integer) map.get(colName.toLowerCase(Locale.getDefault()));
+ final Integer i = (Integer) map.get(column);
if (i != null) { //happens when the col name does not exist in the mapping
idx = i.intValue();
}
@@ -666,6 +648,20 @@
}
return idx;
}
+
+ /**
+ * Use this method to find the index of a column.
+ *
+ * @author Benoit Xhenseval
+ * @param key
+ * @param columnMD
+ * @param colName
+ * @return -1 if it does not find it
+ * @deprecated use getColumnIndex(String, Map, String, PZParser)
+ */
+ public static int getColumnIndex(final String key, final Map columnMD, final String colName) {
+ return getColumnIndex(key, columnMD, colName, null);
+ }
/**
* Create an InputStream based on a File.
@@ -757,24 +753,45 @@
* Build a map of name/position based on a list of ColumnMetaData.
*
* @author Benoit Xhenseval
+ * @author Paul Zepernick
* @param columns
+ * @param p
+ * Reference to Parser which can provide additional options on how the
+ * map should be build. This can be NULL.
* @return a new Map
*/
- public static Map buidColumnIndexMap(final List columns) {
+ public static Map buidColumnIndexMap(final List columns, final PZParser p) {
Map map = null;
if (columns != null && !columns.isEmpty()) {
map = new HashMap();
int idx = 0;
for (final Iterator it = columns.iterator(); it.hasNext(); idx++) {
final ColumnMetaData meta = (ColumnMetaData) it.next();
- map.put(meta.getColName().toLowerCase(
- Locale.getDefault()), new Integer(idx));
+ String colName = meta.getColName();
+ if (p != null && !p.isColumnNamesCaseSensitive()) {
+ //user has selected to make column names case sensitive
+ //on lookups
+ colName = colName.toLowerCase(Locale.getDefault());
+ }
+ map.put(colName, new Integer(idx));
}
}
return map;
}
/**
+ * Build a map of name/position based on a list of ColumnMetaData.
+ *
+ * @author Benoit Xhenseval
+ * @param columns
+ * @return a new Map
+ * @deprecated Please use buildColumnIndexMap(List, PZParser)
+ */
+ public static Map buidColumnIndexMap(final List columns) {
+ return buidColumnIndexMap(columns, null);
+ }
+
+ /**
* Removes chars from the String that could not
* be parsed into a Long value
*
@@ -890,6 +907,7 @@
* tables
* @param dataDefinition
* Name of the data definition stored in the Datafile table
+ * @throws SQLException
* @return List
*/
public static List buildMDFromSQLTable(final Connection con, final String dataDefinition) throws SQLException{
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/PZMapParser.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -32,13 +32,9 @@
*/
package net.sf.pzfilereader.xml;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.PrintWriter;
import java.io.Reader;
import java.util.ArrayList;
import java.util.Iterator;
@@ -47,6 +43,7 @@
import java.util.Map;
import java.util.Map.Entry;
+import net.sf.pzfilereader.PZParser;
import net.sf.pzfilereader.structure.ColumnMetaData;
import net.sf.pzfilereader.util.PZConstants;
import net.sf.pzfilereader.util.ParserUtils;
@@ -92,7 +89,7 @@
InputStreamReader isr = null;
try {
isr = new InputStreamReader(xmlStream);
- return parse(isr);
+ return parse(isr, null);
} finally {
if (isr != null) {
isr.close();
@@ -106,11 +103,13 @@
* returns a Map containing Lists of ColumnMetaData.
*
* @param xmlStreamReader
+ * @param pzparser
+ * Can be null. Allows additional opts to be set durring the XML map read
* @return Map <records> with their corrisponding
* @throws IOException
* @throws JDOMException
*/
- public static Map parse(final Reader xmlStreamReader) throws JDOMException, IOException {
+ public static Map parse(final Reader xmlStreamReader, final PZParser pzparser) throws JDOMException, IOException {
//use for debug when JDOM complains about the xml
/* final BufferedReader br = new BufferedReader(xmlStreamReader);
final FileWriter fw = new FileWriter("c:/test.pz");
@@ -148,7 +147,7 @@
mdIndex.put(PZConstants.DETAIL_ID, columns); // always force detail
// to the top of
// the map no matter what
- mdIndex.put(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(columns));
+ mdIndex.put(PZConstants.COL_IDX, ParserUtils.buidColumnIndexMap(columns, pzparser));
// get all of the "record" elements and the columns under them
final Iterator recordDescriptors = root.getChildren("RECORD").iterator();
@@ -166,7 +165,7 @@
columns = getColumnChildren(xmlElement);
final XMLRecordElement xmlre = new XMLRecordElement();
- xmlre.setColumns(columns);
+ xmlre.setColumns(columns, pzparser);
xmlre.setIndicator(xmlElement.getAttributeValue("indicator"));
xmlre.setElementNumber(convertAttributeToInt(xmlElement.getAttribute("elementNumber")));
xmlre.setStartPosition(convertAttributeToInt(xmlElement.getAttribute("startPosition")));
Modified: trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/XMLRecordElement.java
===================================================================
--- trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/XMLRecordElement.java 2007-03-22 11:32:57 UTC (rev 296)
+++ trunk/PZFileReader/src/main/java/net/sf/pzfilereader/xml/XMLRecordElement.java 2007-04-21 15:41:43 UTC (rev 297)
@@ -17,6 +17,7 @@
import java.util.List;
import java.util.Map;
+import net.sf.pzfilereader.PZParser;
import net.sf.pzfilereader.util.ParserUtils;
/**
@@ -108,11 +109,23 @@
/**
* @param columns
* The columns to set.
+ * @deprecated Please use setColumns(List, PZParser)
*/
public void setColumns(final List columns) {
this.columns = columns;
- this.columnIndex = ParserUtils.buidColumnIndexMap(columns);
+ this.columnIndex = ParserUtils.buidColumnIndexMap(columns, null);
}
+
+ /**
+ * @param columns
+ * The columns to set.
+ * @param p
+ * PZParser being used. Can be null.
+ */
+ public void setColumns(final List columns, final PZParser p) {
+ this.columns = columns;
+ this.columnIndex = ParserUtils.buidColumnIndexMap(columns, p);
+ }
/**
* Returns the index of the column name.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
