Menu
▾
▴
[flatpack-svn] SF.net SVN: flatpack:[418] trunk
|
From: <be...@us...> - 2010-03-23 21:33:54
|
Revision: 418
http://flatpack.svn.sourceforge.net/flatpack/?rev=418&view=rev
Author: benoitx
Date: 2010-03-23 21:33:47 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
Fixing a lot of Sonar issues. (the easy ones!)
Modified Paths:
--------------
trunk/flatpack/pom.xml
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java
trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java
trunk/flatpack/src/main/java/net/sf/flatpack/Version.java
trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java
trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java
trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/AbstractWriter.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriter.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriterFactory.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/FixedLengthWriter.java
trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/xml/XMLRecordElement.java
trunk/src/site/changes.xml
Modified: trunk/flatpack/pom.xml
===================================================================
--- trunk/flatpack/pom.xml 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/pom.xml 2010-03-23 21:33:47 UTC (rev 418)
@@ -93,7 +93,7 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<includes>
- <include>**/*Test?.java</include>
+ <include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -51,14 +51,11 @@
*/
public abstract class AbstractDelimiterParser extends AbstractParser {
private char delimiter = 0;
-
private char qualifier = 0;
-
private boolean ignoreFirstRecord = false;
-
private int lineCount = 0;
- private final Logger logger = LoggerFactory.getLogger(AbstractDelimiterParser.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(AbstractDelimiterParser.class);
public AbstractDelimiterParser(final Reader dataSourceReader, final String dataDefinition, final char delimiter, final char qualifier,
final boolean ignoreFirstRecord) {
@@ -80,7 +77,7 @@
lineCount = 0;
return doDelimitedFile(getDataSourceReader(), shouldCreateMDFromFile());
} catch (final IOException e) {
- logger.error("error accessing/creating inputstream", e);
+ LOGGER.error("error accessing/creating inputstream", e);
}
return null;
}
@@ -124,7 +121,7 @@
*/
private DataSet doDelimitedFile(final Reader dataSource, final boolean createMDFromFile) throws IOException {
if (dataSource == null) {
- throw new NullPointerException("dataSource is null");
+ throw new IllegalArgumentException("dataSource is null");
}
BufferedReader br = null;
final DefaultDataSet ds = new DefaultDataSet(getPzMetaData(), this);
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -51,7 +51,7 @@
*
*/
public abstract class AbstractFixedLengthParser extends AbstractParser {
- private final Logger logger = LoggerFactory.getLogger(AbstractFixedLengthParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractFixedLengthParser.class);
protected AbstractFixedLengthParser(final Reader dataSourceReader, final String dataDefinition) {
super(dataSourceReader, dataDefinition);
@@ -65,7 +65,7 @@
try {
return doFixedLengthFile(getDataSourceReader());
} catch (final IOException e) {
- logger.error("error accessing/reading data", e);
+ LOGGER.error("error accessing/reading data", e);
}
return null;
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -71,17 +71,16 @@
private List readersToClose = null;
private boolean flagEmptyRows;
-
+
private boolean storeRawDataToDataError;
-
+
private boolean storeRawDataToDataSet;
protected AbstractParser(final Reader dataSourceReader) {
this.dataSourceReader = dataSourceReader;
}
- protected AbstractParser(final Reader dataSourceReader,
- final String dataDefinition) {
+ protected AbstractParser(final Reader dataSourceReader, final String dataDefinition) {
this.dataSourceReader = dataSourceReader;
this.dataDefinition = dataDefinition;
}
@@ -123,9 +122,9 @@
protected abstract void init();
- /**
- * @deprecated
- */
+ // /**
+ // * @deprecated
+ // */
// protected void setColumnMD(final Map map) {
// columnMD = map;
// }
@@ -156,12 +155,10 @@
protected void addToMetaData(final List columns) {
if (pzMetaData == null) {
- pzMetaData = new MetaData(columns, ParserUtils.buidColumnIndexMap(
- columns, this));
+ pzMetaData = new MetaData(columns, ParserUtils.buidColumnIndexMap(columns, this));
} else {
pzMetaData.setColumnsNames(columns);
- pzMetaData.setColumnIndexMap(ParserUtils.buidColumnIndexMap(
- columns, this));
+ pzMetaData.setColumnIndexMap(ParserUtils.buidColumnIndexMap(columns, this));
}
}
@@ -192,11 +189,10 @@
* @param errorLevel
* errorLevel 1,2,3 1=warning 2=error 3= severe error
*/
- protected void addError(final DefaultDataSet ds, final String errorDesc,
- final int lineNo, final int errorLevel) {
+ protected void addError(final DefaultDataSet ds, final String errorDesc, final int lineNo, final int errorLevel) {
addError(ds, errorDesc, lineNo, errorLevel, null);
}
-
+
/**
* Adds a new error to this DataSet. These can be collected, and retrieved
* after processing
@@ -210,8 +206,7 @@
* @param lineData
* Data of the line which failed the parse
*/
- protected void addError(final DefaultDataSet ds, final String errorDesc,
- final int lineNo, final int errorLevel, final String lineData) {
+ protected void addError(final DefaultDataSet ds, final String errorDesc, final int lineNo, final int errorLevel, final String lineData) {
if (errorLevel == 1 && isIgnoreParseWarnings()) {
// user has selected to not log warnings in the parser
return;
@@ -239,8 +234,7 @@
return columnNamesCaseSensitive;
}
- public void setColumnNamesCaseSensitive(
- final boolean columnNamesCaseSensitive) {
+ public void setColumnNamesCaseSensitive(final boolean columnNamesCaseSensitive) {
this.columnNamesCaseSensitive = columnNamesCaseSensitive;
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -59,6 +59,8 @@
*
*/
public class DefaultDataSet implements DataSet {
+ private static final String NEW_LINE = System.getProperty("line.separator");
+
private final List rows = new ArrayList();
private final List errors = new ArrayList();
@@ -247,7 +249,7 @@
return Integer.parseInt(s);
}
-
+
public long getLong(final String column) {
final String s = getStringValue(column);
@@ -291,7 +293,7 @@
// return row.getValue(ParserUtils.findColumn(column,
// cmds)).toUpperCase(Locale.getDefault());
s = s.toUpperCase(Locale.getDefault());
- }else if (lowerCase) {
+ } else if (lowerCase) {
// convert data to lowercase before returning
// return row.getValue(ParserUtils.findColumn(column,
// cmds)).toLowerCase(Locale.getDefault());
@@ -367,7 +369,7 @@
// with <RECORD> mappings");
// }
if (ob != null && rows != null) {
- final List cmds = metaData.getColumnsNames();
+ // final List cmds = metaData.getColumnsNames();
// final List cmds = ParserUtils.getColumnMetaData(PZConstants.DETAIL_ID, columnMD);
//ob.setColumnMD(cmds);
ob.setMetaData(getMetaData());
@@ -495,11 +497,11 @@
public String toString() {
final StringBuffer buf = new StringBuffer();
- buf.append("Errors:").append(errors.size()).append(System.getProperty("line.separator"));
- buf.append("Rows:").append(rows.size()).append(System.getProperty("line.separator"));
- buf.append("Position:").append(pointer).append(System.getProperty("line.separator"));
- buf.append("Conversion Props:").append(pzConvertProps).append(System.getProperty("line.separator"));
- buf.append("MetaData:").append(metaData).append(System.getProperty("line.separator"));
+ buf.append("Errors:").append(errors.size()).append(NEW_LINE);
+ buf.append("Rows:").append(rows.size()).append(NEW_LINE);
+ buf.append("Position:").append(pointer).append(NEW_LINE);
+ buf.append("Conversion Props:").append(pzConvertProps).append(NEW_LINE);
+ buf.append("MetaData:").append(metaData).append(NEW_LINE);
return buf.toString();
}
@@ -519,7 +521,7 @@
return false;
}
-
+
/**
* @throws FPInvalidUsageException Parser.isFlagEmptyRows() must be set to true before using this
* @throws FPException if cursor is on an invalid row
@@ -530,12 +532,12 @@
//throw an exception
throw new FPInvalidUsageException("Parser.isFlagEmptyRows(true) must be set before using isRowEmpty()");
}
-
+
if (pointer < 0) {
throw new FPException("Cursor on invalid row.. Make sure next() is called and returns true");
}
-
- return ((Row)rows.get(pointer)).isEmpty();
+
+ return ((Row) rows.get(pointer)).isEmpty();
}
/**
@@ -548,11 +550,11 @@
//throw an exception
throw new FPInvalidUsageException("Parser.isStoreRawDataToDataSet(true) must be set before using getRawData()");
}
-
+
if (pointer < 0) {
throw new FPException("Cursor on invalid row.. Make sure next() is called and returns true");
}
-
- return ((Row)rows.get(pointer)).getRawData();
+
+ return ((Row) rows.get(pointer)).getRawData();
}
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -43,6 +43,7 @@
*
*/
public InitialisationException() {
+ super();
}
/**
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/Version.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -18,6 +18,7 @@
*
* Static class which stores the version of this FlatPack
*/
-public class Version {
- public static final String VERSION = "3.2.0";
+public final class Version {
+ public static final String VERSION = "3.3.0";
+ private Version() {}
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -54,7 +54,7 @@
private boolean processedFirst = false;
- private final Logger logger = LoggerFactory.getLogger(BuffReaderDelimParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BuffReaderDelimParser.class);
public BuffReaderDelimParser(final File pzmapXML, final File dataSource, final char delimiter, final char qualifier,
final boolean ignoreFirstRecord) {
@@ -95,7 +95,7 @@
return ds;
} catch (final IOException ex) {
- logger.error("error accessing/creating inputstream", ex);
+ LOGGER.error("error accessing/creating inputstream", ex);
}
return null;
@@ -211,7 +211,7 @@
try {
close();
} catch (final IOException ex) {
- logger.warn("Problem trying to auto close file handles...", ex);
+ LOGGER.warn("Problem trying to auto close file handles...", ex);
} finally {
super.finalize();
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -58,7 +58,7 @@
private Map recordLengths = null;
- private final Logger logger = LoggerFactory.getLogger(BuffReaderFixedParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BuffReaderFixedParser.class);
public BuffReaderFixedParser(final InputStream pzmapXMLStream, final InputStream dataSourceStream) {
super(pzmapXMLStream, dataSourceStream);
@@ -85,7 +85,7 @@
return ds;
} catch (final IOException ex) {
- logger.error("error accessing/creating inputstream", ex);
+ LOGGER.error("error accessing/creating inputstream", ex);
}
return null;
@@ -181,7 +181,7 @@
try {
close();
} catch (final IOException ex) {
- logger.warn("Problem trying to auto close file handles...", ex);
+ LOGGER.warn("Problem trying to auto close file handles...", ex);
} finally {
super.finalize();
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -50,7 +50,7 @@
* @see net.sf.flatpack.converter#convertValue(java.lang.String)
*/
public Object convertValue(final String valueToConvert) {
- return new Integer(ParserUtils.stripNonLongChars(valueToConvert));
+ return Integer.valueOf(ParserUtils.stripNonLongChars(valueToConvert));
}
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -41,10 +41,8 @@
public class FPConvertException extends RuntimeException {
private static final long serialVersionUID = 1L;
- /**
- *
- */
public FPConvertException() {
+ super();
}
/**
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -62,9 +62,9 @@
/** collection of order elements to sort by */
private final List orderbys = new ArrayList();
-
+
private MetaData metaData;
-
+
private Parser parser;
/**
@@ -88,7 +88,6 @@
final Row row0 = (Row) arg0;
final Row row1 = (Row) arg1;
int result = 0;
-
for (int i = 0; i < orderbys.size(); i++) {
final OrderColumn oc = (OrderColumn) orderbys.get(i);
@@ -113,29 +112,30 @@
String str0 = row0.getValue(ParserUtils.getColumnIndex(row0.getMdkey(), metaData, oc.getColumnName(), parser)).toLowerCase(Locale.getDefault());
String str1 = row1.getValue(ParserUtils.getColumnIndex(row1.getMdkey(), metaData, oc.getColumnName(), parser)).toLowerCase(Locale.getDefault());
switch (oc.getSelectedColType()) {
- case OrderColumn.COLTYPE_STRING:
- comp0 = str0;
- comp1 = str1;
- break;
- case OrderColumn.COLTYPE_NUMERIC:
- comp0 = Double.valueOf(ParserUtils.stripNonDoubleChars(str0));
- comp1 = Double.valueOf(ParserUtils.stripNonDoubleChars(str1));
- break;
- case OrderColumn.COLTYPE_DATE:
- final SimpleDateFormat sdf = new SimpleDateFormat(oc.getDateFormatPattern());
- try {
- comp0 = sdf.parse(str0);
- } catch(ParseException e) {
- comp0 = getBadDateDefault();
-
- }
-
- try {
- comp1 = sdf.parse(str1);
- } catch(ParseException e) {
- comp1 = getBadDateDefault();
- }
- break;
+ case OrderColumn.COLTYPE_STRING:
+ default:
+ comp0 = str0;
+ comp1 = str1;
+ break;
+ case OrderColumn.COLTYPE_NUMERIC:
+ comp0 = Double.valueOf(ParserUtils.stripNonDoubleChars(str0));
+ comp1 = Double.valueOf(ParserUtils.stripNonDoubleChars(str1));
+ break;
+ case OrderColumn.COLTYPE_DATE:
+ final SimpleDateFormat sdf = new SimpleDateFormat(oc.getDateFormatPattern());
+ try {
+ comp0 = sdf.parse(str0);
+ } catch (ParseException e) {
+ comp0 = getBadDateDefault();
+
+ }
+
+ try {
+ comp1 = sdf.parse(str1);
+ } catch (ParseException e) {
+ comp1 = getBadDateDefault();
+ }
+ break;
}
// multiply by the sort indicator to get a ASC or DESC result
@@ -158,8 +158,6 @@
defaultBadDt.set(Calendar.DAY_OF_MONTH, 1);
return defaultBadDt.getTime();
}
-
-
/**
* @param metaData the metaData to set
@@ -168,7 +166,6 @@
this.metaData = metaData;
}
-
/**
* @param parser the parser to set
*/
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -38,13 +38,9 @@
* @author Paul Zepernick
*/
public class ExcelTransformer {
-
- private DataSet ds;
-
- private File xlsFile;
-
+ private final DataSet ds;
+ private final File xlsFile;
private String[] exportOnlyColumns;
-
private String[] excludeFromExportColumns;
/**
@@ -148,7 +144,11 @@
* @param excludeFromExportColumns the excludeFromExportColumns to set
*/
public void setExcludeFromExportColumns(final String[] excludeFromExportColumns) {
- this.excludeFromExportColumns = excludeFromExportColumns;
+ if (excludeFromExportColumns != null) {
+ this.excludeFromExportColumns = (String[]) excludeFromExportColumns.clone();
+ } else {
+ this.excludeFromExportColumns = null;
+ }
}
/**
@@ -158,7 +158,10 @@
* @param exportOnlyColumns the exportOnlyColumns to set
*/
public void setExportOnlyColumns(final String[] exportOnlyColumns) {
- this.exportOnlyColumns = exportOnlyColumns;
+ if (exportOnlyColumns != null) {
+ this.exportOnlyColumns = (String[]) exportOnlyColumns.clone();
+ } else {
+ this.exportOnlyColumns = null;
+ }
}
-
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -6,8 +6,30 @@
* @author Paul Zepernick
*/
public class FPException extends RuntimeException{
-
- public FPException(final String msg) {
- super(msg);
+ private static final long serialVersionUID = -4269317129024968528L;
+
+ public FPException() {
}
+
+ /**
+ * @param message
+ */
+ public FPException(String message) {
+ super(message);
+ }
+
+ /**
+ * @param cause
+ */
+ public FPException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public FPException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -35,7 +35,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
import net.sf.flatpack.structure.ColumnMetaData;
@@ -75,53 +74,53 @@
return splitResult;
}
- /**
- * 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 use the PZMetaData
- */
- public static String getCMDKey(final Map columnMD, final String line) {
- if (columnMD.size() == 1) {
- // no <RECORD> elements were specified for this parse, just return the
- // detail id
- return FPConstants.DETAIL_ID;
- }
- final Iterator mapEntries = columnMD.entrySet().iterator();
- // loop through the XMLRecordElement objects and see if we need a
- // different MD object
- while (mapEntries.hasNext()) {
- final Entry entry = (Entry) mapEntries.next();
- if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
- continue; // skip this key will be assumed if none of the
- // others match
- }
- final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue();
+// /**
+// * 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 use the PZMetaData
+// */
+// public static String getCMDKey(final Map columnMD, final String line) {
+// if (columnMD.size() == 1) {
+// // no <RECORD> elements were specified for this parse, just return the
+// // detail id
+// return FPConstants.DETAIL_ID;
+// }
+// final Iterator mapEntries = columnMD.entrySet().iterator();
+// // loop through the XMLRecordElement objects and see if we need a
+// // different MD object
+// while (mapEntries.hasNext()) {
+// final Entry entry = (Entry) mapEntries.next();
+// if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
+// continue; // skip this key will be assumed if none of the
+// // others match
+// }
+// final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue();
+//
+// if (recordXMLElement.getEndPositition() > line.length()) {
+// // make sure our substring is not going to fail
+// continue;
+// }
+// final int subfrm = recordXMLElement.getStartPosition() - 1; // convert
+// // to 0
+// // based
+// final int subto = recordXMLElement.getEndPositition();
+// if (line.substring(subfrm, subto).equals(recordXMLElement.getIndicator())) {
+// // we found the MD object we want to return
+// return (String) entry.getKey();
+// }
+//
+// }
+//
+// // must be a detail line
+// return FPConstants.DETAIL_ID;
+//
+// }
- if (recordXMLElement.getEndPositition() > line.length()) {
- // make sure our substring is not going to fail
- continue;
- }
- final int subfrm = recordXMLElement.getStartPosition() - 1; // convert
- // to 0
- // based
- final int subto = recordXMLElement.getEndPositition();
- if (line.substring(subfrm, subto).equals(recordXMLElement.getIndicator())) {
- // we found the MD object we want to return
- return (String) entry.getKey();
- }
-
- }
-
- // must be a detail line
- return FPConstants.DETAIL_ID;
-
- }
-
/**
* Returns the key to the list of ColumnMetaData objects. Returns the
* correct MetaData per the mapping file and the data contained on the line
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -49,7 +49,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -59,8 +58,8 @@
import java.util.Map.Entry;
import net.sf.flatpack.Parser;
-import net.sf.flatpack.converter.FPConvertException;
import net.sf.flatpack.converter.Converter;
+import net.sf.flatpack.converter.FPConvertException;
import net.sf.flatpack.structure.ColumnMetaData;
import net.sf.flatpack.xml.MetaData;
import net.sf.flatpack.xml.XMLRecordElement;
@@ -131,7 +130,7 @@
int endBlock = 0;
boolean blockWasInQualifier = false;
- final String doubleQualifier = String.valueOf(qualifier) + String.valueOf(qualifier);
+ final String doubleQualifier = "" + qualifier + qualifier;
for (int i = 0; i < size; i++) {
final char currentChar = trimmedLine.charAt(i);
@@ -267,7 +266,6 @@
return trimmed;
}
-
/**
* Removes empty space from the beginning of a string, except for tabs
@@ -294,7 +292,7 @@
return trimmed;
}
-
+
/**
* Removes empty space from the end of a string
*
@@ -314,7 +312,7 @@
}
if (offset < value.length() - 1) {
- trimmed = value.substring(0,offset + 1);
+ trimmed = value.substring(0, offset + 1);
}
return trimmed;
@@ -360,53 +358,53 @@
return s.toString();
}
- /**
- * 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
- * @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
+ // * @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 with the ColumnMetaData. Can be null
- * @return ArrayList - ColumnMetaData
- * @deprecated use the getPZMetaDataFromFile
- */
- public static Map getColumnMDFromFile(final String line, final char delimiter, final char qualifier, final Parser p) {
- List lineData = null;
- final List results = new ArrayList();
- final Map columnMD = new LinkedHashMap();
+ // /**
+ // * 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 with the ColumnMetaData. Can be null
+ // * @return ArrayList - ColumnMetaData
+ // * @deprecated use the getPZMetaDataFromFile
+ // */
+ // public static Map getColumnMDFromFile(final String line, final char delimiter, final char qualifier, final Parser p) {
+ // List lineData = null;
+ // final List results = new ArrayList();
+ // final Map columnMD = new LinkedHashMap();
+ //
+ // lineData = splitLine(line, delimiter, qualifier, FPConstants.SPLITLINE_SIZE_INIT);
+ // for (int i = 0; i < lineData.size(); i++) {
+ // final ColumnMetaData cmd = new ColumnMetaData();
+ // cmd.setColName((String) lineData.get(i));
+ // results.add(cmd);
+ // }
+ //
+ // columnMD.put(FPConstants.DETAIL_ID, results);
+ // columnMD.put(FPConstants.COL_IDX, buidColumnIndexMap(results, p));
+ //
+ // return columnMD;
+ // }
- lineData = splitLine(line, delimiter, qualifier, FPConstants.SPLITLINE_SIZE_INIT);
- for (int i = 0; i < lineData.size(); i++) {
- final ColumnMetaData cmd = new ColumnMetaData();
- cmd.setColName((String) lineData.get(i));
- results.add(cmd);
- }
-
- columnMD.put(FPConstants.DETAIL_ID, results);
- columnMD.put(FPConstants.COL_IDX, buidColumnIndexMap(results, p));
-
- return columnMD;
- }
-
/**
* 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
@@ -429,7 +427,7 @@
final ColumnMetaData cmd = new ColumnMetaData();
cmd.setColName((String) lineData.get(i));
if (dupCheck.contains(cmd.getColName())) {
- throw new FPException("Duplicate Column Name In File: " + cmd.getColName());
+ throw new FPException("Duplicate Column Name In File: " + cmd.getColName());
}
results.add(cmd);
dupCheck.add(cmd.getColName());
@@ -488,25 +486,25 @@
return results;
}
- /**
- * @param columnName
- * @param columnMD -
- * vector of ColumnMetaData objects
- * @return int - position of the column in the file
- * @throws NoSuchElementException
- * @deprecated surely not...
- */
- public static int findColumn(final String columnName, final List columnMD) {
- for (int i = 0; i < columnMD.size(); i++) {
- final ColumnMetaData cmd = (ColumnMetaData) columnMD.get(i);
- if (cmd.getColName().equalsIgnoreCase(columnName)) {
- return i;
- }
- }
+ // /**
+ // * @param columnName
+ // * @param columnMD -
+ // * vector of ColumnMetaData objects
+ // * @return int - position of the column in the file
+ // * @throws NoSuchElementException
+ // * @deprecated surely not...
+ // */
+ // public static int findColumn(final String columnName, final List columnMD) {
+ // for (int i = 0; i < columnMD.size(); i++) {
+ // final ColumnMetaData cmd = (ColumnMetaData) columnMD.get(i);
+ // if (cmd.getColName().equalsIgnoreCase(columnName)) {
+ // return i;
+ // }
+ // }
+ //
+ // throw new NoSuchElementException("Column Name: " + columnName + " does not exist");
+ // }
- throw new NoSuchElementException("Column Name: " + columnName + " does not exist");
- }
-
/**
* Determines if the given line is the first part of a multiline record
*
@@ -583,40 +581,40 @@
return false;
}
- /**
- * Returns a map with the MD id's and their record lengths. This is used for
- * fixed length parsing
- *
- * @param columnMD
- * @return Map
- * @deprecated use PZMetaData
- */
- public static Map calculateRecordLengths(final Map columnMD) {
- final Map recordLengths = new HashMap();
- List cmds = null;
+ // /**
+ // * Returns a map with the MD id's and their record lengths. This is used for
+ // * fixed length parsing
+ // *
+ // * @param columnMD
+ // * @return Map
+ // * @deprecated use PZMetaData
+ // */
+ // public static Map calculateRecordLengths(final Map columnMD) {
+ // final Map recordLengths = new HashMap();
+ // List cmds = null;
+ //
+ // final Iterator columnMDIt = columnMD.entrySet().iterator();
+ // while (columnMDIt.hasNext()) {
+ // final Entry entry = (Entry) columnMDIt.next();
+ // if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
+ // cmds = (List) columnMD.get(FPConstants.DETAIL_ID);
+ // } else {
+ // cmds = ((XMLRecordElement) entry.getValue()).getColumns();
+ // }
+ //
+ // int recordLength = 0;
+ // for (int i = 0; i < cmds.size(); i++) {
+ // recordLength += ((ColumnMetaData) cmds.get(i)).getColLength();
+ // }
+ //
+ // recordLengths.put(entry.getKey(), new Integer(recordLength));
+ //
+ // }
+ //
+ // return recordLengths;
+ //
+ // }
- final Iterator columnMDIt = columnMD.entrySet().iterator();
- while (columnMDIt.hasNext()) {
- final Entry entry = (Entry) columnMDIt.next();
- if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
- cmds = (List) columnMD.get(FPConstants.DETAIL_ID);
- } else {
- cmds = ((XMLRecordElement) entry.getValue()).getColumns();
- }
-
- int recordLength = 0;
- for (int i = 0; i < cmds.size(); i++) {
- recordLength += ((ColumnMetaData) cmds.get(i)).getColLength();
- }
-
- recordLengths.put(entry.getKey(), new Integer(recordLength));
-
- }
-
- return recordLengths;
-
- }
-
public static Map calculateRecordLengths(final MetaData columnMD) {
final Map recordLengths = new HashMap();
List cmds = null;
@@ -627,23 +625,19 @@
recordLength += ((ColumnMetaData) i.next()).getColLength();
}
- recordLengths.put(FPConstants.DETAIL_ID, new Integer(recordLength));
+ recordLengths.put(FPConstants.DETAIL_ID, Integer.valueOf(recordLength));
final Iterator columnMDIt = columnMD.xmlRecordIterator();
while (columnMDIt.hasNext()) {
final Entry entry = (Entry) columnMDIt.next();
- // if (entry.getKey().equals(PZConstants.DETAIL_ID) || entry.getKey().equals(PZConstants.COL_IDX)) {
- // cmds = (List) columnMD.get(PZConstants.DETAIL_ID);
- // } else {
cmds = ((XMLRecordElement) entry.getValue()).getColumns();
- // }
recordLength = 0;
for (int i = 0; i < cmds.size(); i++) {
recordLength += ((ColumnMetaData) cmds.get(i)).getColLength();
}
- recordLengths.put(entry.getKey(), new Integer(recordLength));
+ recordLengths.put(entry.getKey(), Integer.valueOf(recordLength));
}
@@ -651,54 +645,54 @@
}
- /**
- * 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 lineElements
- * @return List - ColumMetaData
- * @deprecated use the PZMetaData
- */
- public static String getCMDKeyForDelimitedFile(final Map columnMD, final List lineElements) {
- if (columnMD.size() == 1) {
- // no <RECORD> elments were specifed for this parse, just return the
- // detail id
- return FPConstants.DETAIL_ID;
- }
- final Iterator mapEntries = columnMD.entrySet().iterator();
- // loop through the XMLRecordElement objects and see if we need a
- // different MD object
- while (mapEntries.hasNext()) {
- final Entry entry = (Entry) mapEntries.next();
- if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
- continue; // skip this key will be assumed if none of the
- // others match
- }
- final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue();
+ // /**
+ // * 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 lineElements
+ // * @return List - ColumMetaData
+ // * @deprecated use the PZMetaData
+ // */
+ // public static String getCMDKeyForDelimitedFile(final Map columnMD, final List lineElements) {
+ // if (columnMD.size() == 1) {
+ // // no <RECORD> elments were specifed for this parse, just return the
+ // // detail id
+ // return FPConstants.DETAIL_ID;
+ // }
+ // final Iterator mapEntries = columnMD.entrySet().iterator();
+ // // loop through the XMLRecordElement objects and see if we need a
+ // // different MD object
+ // while (mapEntries.hasNext()) {
+ // final Entry entry = (Entry) mapEntries.next();
+ // if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
+ // continue; // skip this key will be assumed if none of the
+ // // others match
+ // }
+ // final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue();
+ //
+ // if (recordXMLElement.getElementCount() > 0 && recordXMLElement.getElementCount() == lineElements.size()) {
+ // //determing which <record> mapping to use by the number of elements
+ // //contained on the line
+ // return (String) entry.getKey();
+ // } else if (recordXMLElement.getElementNumber() > lineElements.size()) {
+ // // make sure the element referenced in the mapping exists
+ // continue;
+ // }
+ //
+ // final String lineElement = (String) lineElements.get(recordXMLElement.getElementNumber() - 1);
+ // if (lineElement.equals(recordXMLElement.getIndicator())) {
+ // // we found the MD object we want to return
+ // return (String) entry.getKey();
+ // }
+ //
+ // }
+ //
+ // // must be a detail line
+ // return FPConstants.DETAIL_ID;
+ // }
- if (recordXMLElement.getElementCount() > 0 && recordXMLElement.getElementCount() == lineElements.size()) {
- //determing which <record> mapping to use by the number of elements
- //contained on the line
- return (String) entry.getKey();
- } else if (recordXMLElement.getElementNumber() > lineElements.size()) {
- // make sure the element referenced in the mapping exists
- continue;
- }
-
- final String lineElement = (String) lineElements.get(recordXMLElement.getElementNumber() - 1);
- if (lineElement.equals(recordXMLElement.getIndicator())) {
- // we found the MD object we want to return
- return (String) entry.getKey();
- }
-
- }
-
- // must be a detail line
- return FPConstants.DETAIL_ID;
- }
-
public static String getCMDKeyForDelimitedFile(final MetaData columnMD, final List lineElements) {
if (!columnMD.isAnyRecordFormatSpecified()) {
// no <RECORD> elments were specifed for this parse, just return the
@@ -737,22 +731,22 @@
return FPConstants.DETAIL_ID;
}
- /**
- * Returns a list of ColumMetaData objects for the given key
- *
- * @param key
- * @param columnMD
- * @return List
- * @deprecated use the PZMetaData
- */
- public static List getColumnMetaData(final String key, final Map columnMD) {
- if (key == null || key.equals(FPConstants.DETAIL_ID) || key.equals(FPConstants.COL_IDX)) {
- return (List) columnMD.get(FPConstants.DETAIL_ID);
- }
+ // /**
+ // * Returns a list of ColumMetaData objects for the given key
+ // *
+ // * @param key
+ // * @param columnMD
+ // * @return List
+ // * @deprecated use the PZMetaData
+ // */
+ // public static List getColumnMetaData(final String key, final Map columnMD) {
+ // if (key == null || key.equals(FPConstants.DETAIL_ID) || key.equals(FPConstants.COL_IDX)) {
+ // return (List) columnMD.get(FPConstants.DETAIL_ID);
+ // }
+ //
+ // return ((XMLRecordElement) columnMD.get(key)).getColumns();
+ // }
- return ((XMLRecordElement) columnMD.get(key)).getColumns();
- }
-
public static List getColumnMetaData(final String key, final MetaData columnMD) {
if (key == null || key.equals(FPConstants.DETAIL_ID) || key.equals(FPConstants.COL_IDX)) {
return columnMD.getColumnsNames();
@@ -761,41 +755,41 @@
return columnMD.getListColumnsForRecord(key);
}
- /**
- * 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
- * @deprecated use PZMetaData
- */
- public static int getColumnIndex(final String key, final Map columnMD, final String colName, final Parser p) {
- int idx = -1;
- String column = colName;
- if (p != null && !p.isColumnNamesCaseSensitive()) {
- column = colName.toLowerCase(Locale.getDefault());
- }
- if (key != null && !key.equals(FPConstants.DETAIL_ID) && !key.equals(FPConstants.COL_IDX)) {
- idx = ((XMLRecordElement) columnMD.get(key)).getColumnIndex(column);
- } else if (key == null || key.equals(FPConstants.DETAIL_ID)) {
- final Map map = (Map) columnMD.get(FPConstants.COL_IDX);
- final Integer i = (Integer) map.get(column);
- if (i != null) { //happens when the col name does not exist in the mapping
- idx = i.intValue();
- }
- }
+ // /**
+ // * 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
+ // * @deprecated use PZMetaData
+ // */
+ // public static int getColumnIndex(final String key, final Map columnMD, final String colName, final Parser p) {
+ // int idx = -1;
+ // String column = colName;
+ // if (p != null && !p.isColumnNamesCaseSensitive()) {
+ // column = colName.toLowerCase(Locale.getDefault());
+ // }
+ // if (key != null && !key.equals(FPConstants.DETAIL_ID) && !key.equals(FPConstants.COL_IDX)) {
+ // idx = ((XMLRecordElement) columnMD.get(key)).getColumnIndex(column);
+ // } else if (key == null || key.equals(FPConstants.DETAIL_ID)) {
+ // final Map map = (Map) columnMD.get(FPConstants.COL_IDX);
+ // final Integer i = (Integer) map.get(column);
+ // if (i != null) { //happens when the col name does not exist in the mapping
+ // idx = i.intValue();
+ // }
+ // }
+ //
+ // if (idx < 0) {
+ // throw new NoSuchElementException("Column " + colName + " does not exist, check case/spelling. key:" + key);
+ // }
+ // return idx;
+ // }
- if (idx < 0) {
- throw new NoSuchElementException("Column " + colName + " does not exist, check case/spelling. key:" + key);
- }
- return idx;
- }
-
public static int getColumnIndex(final String key, final MetaData columnMD, final String colName, final Parser p) {
int idx = -1;
String column = colName;
@@ -830,9 +824,9 @@
* @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);
- }
+ // 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.
@@ -861,7 +855,7 @@
reader.close();
}
} catch (final IOException ex) {
- throw new RuntimeException(ex);
+ throw new FPException(ex);
}
}
@@ -877,7 +871,7 @@
reader.close();
}
} catch (final IOException ex) {
- throw new RuntimeException(ex);
+ throw new FPException(ex);
}
}
@@ -944,7 +938,7 @@
//on lookups
colName = colName.toLowerCase(Locale.getDefault());
}
- map.put(colName, new Integer(idx));
+ map.put(colName, Integer.valueOf(idx));
}
}
return map;
@@ -958,9 +952,9 @@
* @return a new Map
* @deprecated Please use buildColumnIndexMap(List, PZParser)
*/
- public static Map buidColumnIndexMap(final List columns) {
- return buidColumnIndexMap(columns, null);
- }
+ // public static Map buidColumnIndexMap(final List columns) {
+ // return buidColumnIndexMap(columns, null);
+ // }
/**
* Removes chars from the String that could not
@@ -990,7 +984,7 @@
// just a minus sign
final int sLen = newString.length();
final String s = newString.toString();
- if (sLen == 0 || (sLen == 1 && s.equals("-"))) {
+ if (sLen == 0 || (sLen == 1 && "-".equals(s))) {
return "0";
}
@@ -1015,7 +1009,7 @@
}
final int sLen = newString.length();
final String s = newString.toString();
- if (sLen == 0 || (sLen == 1 && s.equals(".")) || (sLen == 1 && s.equals("-"))) {
+ if (sLen == 0 || (sLen == 1 && (".".equals(s) || "-".equals(s)))) {
return "0";
}
@@ -1037,7 +1031,7 @@
return pzConvertProps;
}
-
+
/**
* Checks a list of <String> elements to see if every element
* in the list is empty.
@@ -1050,11 +1044,11 @@
public static boolean isListElementsEmpty(final List l) {
final Iterator it = l.iterator();
while (it.hasNext()) {
- final String s = (String)it.next();
+ final String s = (String) it.next();
if (s != null && s.trim().length() > 0) {
return false;
}
- }
+ }
return true;
}
@@ -1105,9 +1099,8 @@
ResultSet rs = null;
final List cmds = new ArrayList();
try {
- final String sql =
- "SELECT * FROM DATAFILE INNER JOIN DATASTRUCTURE ON " + "DATAFILE.DATAFILE_NO = DATASTRUCTURE.DATAFILE_NO "
- + "WHERE DATAFILE.DATAFILE_DESC = ? " + "ORDER BY DATASTRUCTURE_COL_ORDER";
+ final String sql = "SELECT * FROM DATAFILE INNER JOIN DATASTRUCTURE ON " + "DATAFILE.DATAFILE_NO = DATASTRUCTURE.DATAFILE_NO "
+ + "WHERE DATAFILE.DATAFILE_DESC = ? " + "ORDER BY DATASTRUCTURE_COL_ORDER";
stmt = con.prepareStatement(sql); // always use PreparedStatement
// as the DB can do clever things.
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/writer/AbstractWriter.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/writer/AbstractWriter.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/writer/AbstractWriter.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -10,7 +10,7 @@
* @author Dirk Holmes and Holger Holger Hoffstatte
*/
public abstract class AbstractWriter extends Object implements Writer {
- private BufferedWriter writer;
+ private final BufferedWriter writer;
private Map rowMap;
public AbstractWriter(final java.io.Writer output) {
@@ -53,7 +53,8 @@
writer.newLine();
}
- protected void write(Object value) throws IOException {
+ protected void write(final Object val) throws IOException {
+ Object value = val;
if (value == null) {
value = "";
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriter.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriter.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriter.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -93,7 +93,7 @@
}
}
- public void nextRecord() throws IOException {
+ public final void nextRecord() throws IOException {
if (!columnTitlesWritten) {
this.writeColumnTitles();
columnTitlesWritten = true;
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriterFactory.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriterFactory.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriterFactory.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -77,7 +77,7 @@
metaData.setColName(columnTitle);
columnMetaDatas.add(metaData);
- final Integer columnIndex = new Integer(columnMetaDatas.indexOf(metaData));
+ final Integer columnIndex = Integer.valueOf(columnMetaDatas.indexOf(metaData));
columnIndices.put(columnIndex, columnTitle);
}
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/writer/FixedLengthWriter.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/writer/FixedLengthWriter.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/writer/FixedLengthWriter.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -48,7 +48,8 @@
super.nextRecord();
}
- protected char[] formattedValue(Object value, final ColumnMetaData element) {
+ protected char[] formattedValue(final Object val, final ColumnMetaData element) {
+ Object value = val;
if (value == null) {
// TODO DO: maybe have a way to substitute default values here?
value = "";
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -177,7 +177,7 @@
}
if (showDebug) {
- showDebug(mdIndex);
+ setShowDebug(mdIndex);
}
return mdIndex;
@@ -226,7 +226,7 @@
cmd.setColLength(Integer.parseInt(xmlColumn.getAttributeValue("length")));
} catch (final Exception ex) {
throw new IllegalArgumentException("LENGTH ATTRIBUTE ON COLUMN ELEMENT MUST BE AN INTEGER. GOT: "
- + xmlColumn.getAttributeValue("length"));
+ + xmlColumn.getAttributeValue("length"), ex);
}
}
columnResults.add(cmd);
@@ -245,7 +245,7 @@
showDebug = b;
}
- private static void showDebug(final Map xmlResults) {
+ private static void setShowDebug(final Map xmlResults) {
final Iterator mapIt = xmlResults.entrySet().iterator();
while (mapIt.hasNext()) {
XMLRecordElement xmlrecEle = null;
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/xml/XMLRecordElement.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/xml/XMLRecordElement.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/xml/XMLRecordElement.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -102,15 +102,15 @@
return columns;
}
- /**
- * @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, null);
- }
+// /**
+// * @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, null);
+// }
/**
* @param columnsToUse
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/src/site/changes.xml 2010-03-23 21:33:47 UTC (rev 418)
@@ -7,6 +7,9 @@
<title>Changes</title>
</properties>
<body>
+ <release version="3.3.0" date="in svn" description="Maintenance">
+ <action dev="benoitx" type="fix">Use JDK 1.5.</action>
+ </release>
<release version="3.2.0" date="2010-03-03" description="New parse options">
<action dev="benoitx" type="add">Added a getBigDecimal method on DataSet.</action>
<action dev="zepernick" type="fix">Fixed SF Bug 1869636. The parameters for the XML Map and
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
