You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(112) |
Nov
(44) |
Dec
(49) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(14) |
Feb
(12) |
Mar
(12) |
Apr
(12) |
May
(6) |
Jun
(11) |
Jul
(10) |
Aug
(6) |
Sep
(17) |
Oct
(3) |
Nov
(22) |
Dec
|
2008 |
Jan
(3) |
Feb
(7) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
(6) |
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
(1) |
Mar
(9) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(4) |
Nov
(2) |
Dec
|
2011 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
2012 |
Jan
(3) |
Feb
|
Mar
(2) |
Apr
(8) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <zep...@us...> - 2008-02-13 17:35:38
|
Revision: 393 http://flatpack.svn.sourceforge.net/flatpack/?rev=393&view=rev Author: zepernick Date: 2008-02-13 09:35:41 -0800 (Wed, 13 Feb 2008) Log Message: ----------- prevent duplicate column names when using column names from file header Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2008-02-13 17:30:39 UTC (rev 392) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2008-02-13 17:35:41 UTC (rev 393) @@ -47,6 +47,7 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; @@ -54,6 +55,7 @@ import java.util.Map; import java.util.NoSuchElementException; import java.util.Properties; +import java.util.Set; import java.util.Map.Entry; import net.sf.flatpack.Parser; @@ -394,15 +396,17 @@ public static MetaData getPZMetaDataFromFile(final String line, final char delimiter, final char qualifier, final Parser p) { List lineData = null; final List results = new ArrayList(); + final Set dupCheck = new HashSet(); 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)); - if (results.contains(cmd)) { + if (dupCheck.contains(cmd)) { throw new FPException("Duplicate Column Name In File: " + cmd); } results.add(cmd); + dupCheck.add(cmd); } return new MetaData(results, buidColumnIndexMap(results, p)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2008-02-13 17:30:41
|
Revision: 392 http://flatpack.svn.sourceforge.net/flatpack/?rev=392&view=rev Author: zepernick Date: 2008-02-13 09:30:39 -0800 (Wed, 13 Feb 2008) Log Message: ----------- prevent duplicate column names when using column names from file header Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java Added Paths: ----------- trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java Added: trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java (rev 0) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java 2008-02-13 17:30:39 UTC (rev 392) @@ -0,0 +1,13 @@ +package net.sf.flatpack.util; + +/** + * Generic exception for FlatPack + * + * @author Paul Zepernick + */ +public class FPException extends RuntimeException{ + + public FPException(final String msg) { + super(msg); + } +} Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2008-02-04 15:25:15 UTC (rev 391) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2008-02-13 17:30:39 UTC (rev 392) @@ -399,6 +399,9 @@ for (int i = 0; i < lineData.size(); i++) { final ColumnMetaData cmd = new ColumnMetaData(); cmd.setColName((String) lineData.get(i)); + if (results.contains(cmd)) { + throw new FPException("Duplicate Column Name In File: " + cmd); + } results.add(cmd); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2008-02-04 15:25:15
|
Revision: 391 http://flatpack.svn.sourceforge.net/flatpack/?rev=391&view=rev Author: zepernick Date: 2008-02-04 07:25:15 -0800 (Mon, 04 Feb 2008) Log Message: ----------- added patch from Dirk Olmes to prevent duplicate column names in the XML map Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2008-02-04 15:23:40 UTC (rev 390) +++ trunk/src/site/changes.xml 2008-02-04 15:25:15 UTC (rev 391) @@ -8,6 +8,9 @@ </properties> <body> <release version="3.2.0-SNAPSHOT" date="2007-11-17" description="New parse options"> + <action dev="zepernick" type="fix">Applied patch from Dirk Olmes to prevent duplicate + column names in the XML mapping. IllegalArgumentException is now thrown if a duplicate + column name exists in the map. Thanks Dirk...</action> <action dev="zepernick" type="fix">doParse() on DBFixedLengthParser was returning a null and was never getting a DataSet returned</action> <action dev="zepernick" type="change">Added an option on the Paser setFlagEmptyRows(). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2008-02-04 15:23:42
|
Revision: 390 http://flatpack.svn.sourceforge.net/flatpack/?rev=390&view=rev Author: zepernick Date: 2008-02-04 07:23:40 -0800 (Mon, 04 Feb 2008) Log Message: ----------- added patch from Dirk Olmes to prevent duplicate column names in the XML map Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java 2008-01-21 15:30:39 UTC (rev 389) +++ trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java 2008-02-04 15:23:40 UTC (rev 390) @@ -37,10 +37,12 @@ import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; +import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.Map.Entry; import net.sf.flatpack.Parser; @@ -197,6 +199,7 @@ // helper to retrieve the "COLUMN" elements from the given parent private static List getColumnChildren(final Element parent) { final List columnResults = new ArrayList(); + final Set columnNames = new HashSet(); final Iterator xmlChildren = parent.getChildren("COLUMN").iterator(); while (xmlChildren.hasNext()) { @@ -204,11 +207,17 @@ final Element xmlColumn = (Element) xmlChildren.next(); // make sure the name attribute is present on the column - if (xmlColumn.getAttributeValue("name") == null) { + final String columnName = xmlColumn.getAttributeValue("name"); + if (columnName == null) { throw new IllegalArgumentException("Name attribute is required on the column tag!"); } - cmd.setColName(xmlColumn.getAttributeValue("name")); + // make sure the names in columnInfo are unique + if (columnNames.contains(columnName)) { + throw new IllegalArgumentException("Duplicate name column '" + columnName + "'"); + } + + cmd.setColName(columnName); // check to see if the column length can be set if (xmlColumn.getAttributeValue("length") != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2008-01-21 15:31:40
|
Revision: 389 http://flatpack.svn.sourceforge.net/flatpack/?rev=389&view=rev Author: zepernick Date: 2008-01-21 07:30:39 -0800 (Mon, 21 Jan 2008) Log Message: ----------- throw UnsupportedOperationException for getRowCount() Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDataSet.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDataSet.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDataSet.java 2008-01-09 19:33:26 UTC (rev 388) +++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDataSet.java 2008-01-21 15:30:39 UTC (rev 389) @@ -169,5 +169,12 @@ public void setValue(final String column, final String value) { throw new UnsupportedOperationException("setValue() is Not Implemented"); } + + /** + * Not Supported! + */ + public int getRowCount() { + throw new UnsupportedOperationException("getRowCount() is Not Implemented"); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2008-01-09 19:33:20
|
Revision: 388 http://flatpack.svn.sourceforge.net/flatpack/?rev=388&view=rev Author: zepernick Date: 2008-01-09 11:33:26 -0800 (Wed, 09 Jan 2008) Log Message: ----------- fixed a bug in the database fixed length parser Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2008-01-09 19:32:52 UTC (rev 387) +++ trunk/src/site/changes.xml 2008-01-09 19:33:26 UTC (rev 388) @@ -8,6 +8,8 @@ </properties> <body> <release version="3.2.0-SNAPSHOT" date="2007-11-17" description="New parse options"> + <action dev="zepernick" type="fix">doParse() on DBFixedLengthParser was returning a null + and was never getting a DataSet returned</action> <action dev="zepernick" type="change">Added an option on the Paser setFlagEmptyRows(). This will make the DataSet.isRowEmpty() method available. This method will return true when there is no data on any columns in the row.</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2008-01-09 19:32:46
|
Revision: 387 http://flatpack.svn.sourceforge.net/flatpack/?rev=387&view=rev Author: zepernick Date: 2008-01-09 11:32:52 -0800 (Wed, 09 Jan 2008) Log Message: ----------- fixed a bug in the database fixed length parser Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/DBFixedLengthParser.java trunk/flatpack/src/main/java/net/sf/flatpack/xml/MetaData.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DBFixedLengthParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/DBFixedLengthParser.java 2007-11-25 22:55:14 UTC (rev 386) +++ trunk/flatpack/src/main/java/net/sf/flatpack/DBFixedLengthParser.java 2008-01-09 19:32:52 UTC (rev 387) @@ -110,7 +110,7 @@ } } - public DataSet doParse() { - return null; - } +// public DataSet doParse() { +// return null; +// } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/xml/MetaData.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/xml/MetaData.java 2007-11-25 22:55:14 UTC (rev 386) +++ trunk/flatpack/src/main/java/net/sf/flatpack/xml/MetaData.java 2008-01-09 19:32:52 UTC (rev 387) @@ -4,6 +4,7 @@ package net.sf.flatpack.xml; import java.util.Collections; +import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -28,6 +29,7 @@ public MetaData(final List columnNames, final Map columnIndexMap) { this.columnsNames = Collections.unmodifiableList(columnNames); this.columnIndexMap = Collections.unmodifiableMap(columnIndexMap); + this.xmlRecordElements = new HashMap(); } MetaData(final List columnNames, final Map columnIndexMap, final Map xmlRecordElements) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-25 22:55:10
|
Revision: 386 http://flatpack.svn.sourceforge.net/flatpack/?rev=386&view=rev Author: zepernick Date: 2007-11-25 14:55:14 -0800 (Sun, 25 Nov 2007) Log Message: ----------- fixed spelling in comment Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/DBDelimiterParser.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DBDelimiterParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/DBDelimiterParser.java 2007-11-23 15:00:32 UTC (rev 385) +++ trunk/flatpack/src/main/java/net/sf/flatpack/DBDelimiterParser.java 2007-11-25 22:55:14 UTC (rev 386) @@ -68,7 +68,7 @@ protected void init() { try { //check to see if the user is using a InputStream. This is - //here for backwards compatability + //here for backwards compatibility if (dataSourceStream != null) { final Reader r = new InputStreamReader(dataSourceStream); setDataSourceReader(r); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-23 15:01:19
|
Revision: 385 http://flatpack.svn.sourceforge.net/flatpack/?rev=385&view=rev Author: zepernick Date: 2007-11-23 07:00:32 -0800 (Fri, 23 Nov 2007) Log Message: ----------- added test for new DataError option Modified Paths: -------------- trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java Modified: trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java =================================================================== --- trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java 2007-11-23 14:53:20 UTC (rev 384) +++ trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java 2007-11-23 15:00:32 UTC (rev 385) @@ -1,9 +1,11 @@ package net.sf.flatpack.pzparser; import java.io.StringReader; +import java.util.Iterator; import java.util.NoSuchElementException; import junit.framework.TestCase; +import net.sf.flatpack.DataError; import net.sf.flatpack.DataSet; import net.sf.flatpack.DefaultParserFactory; import net.sf.flatpack.Parser; @@ -104,6 +106,25 @@ } catch(FPInvalidUsageException e){} } + + public void testStoreRawDataToDataError() { + DataSet ds; + final String cols = "column1,column2,column3\r\nVAL1,VAL2,VAL3,VAL4"; + Parser p = DefaultParserFactory.getInstance().newDelimitedParser(new StringReader(cols), ',', FPConstants.NO_QUALIFIER); + p.setStoreRawDataToDataError(true); + ds = p.parse(); + Iterator errors = ds.getErrors().iterator(); + DataError de = (DataError)errors.next(); + + assertNotNull("DataError should contain line data...", de.getRawData()); + + p = DefaultParserFactory.getInstance().newDelimitedParser(new StringReader(cols), ',', FPConstants.NO_QUALIFIER); + p.setStoreRawDataToDataError(false); + ds = p.parse(); + errors = ds.getErrors().iterator(); + de = (DataError)errors.next(); + assertNull("DataError should have <null> line data...", de.getRawData()); + } public static void main(final String[] args) { junit.textui.TestRunner.run(PZParserOptsTest.class); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-23 14:53:35
|
Revision: 384 http://flatpack.svn.sourceforge.net/flatpack/?rev=384&view=rev Author: zepernick Date: 2007-11-23 06:53:20 -0800 (Fri, 23 Nov 2007) Log Message: ----------- updated current version Modified Paths: -------------- trunk/common-build/project.xml Modified: trunk/common-build/project.xml =================================================================== --- trunk/common-build/project.xml 2007-11-23 14:51:24 UTC (rev 383) +++ trunk/common-build/project.xml 2007-11-23 14:53:20 UTC (rev 384) @@ -27,7 +27,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd"> <pomVersion>3</pomVersion> <groupId>net.sf.flatpack</groupId> - <currentVersion>3.1.1</currentVersion> + <currentVersion>3.2.0-SNAPSHOT</currentVersion> <organization> <name>ObjectLab Financial Ltd</name> <url>http://www.objectlab.co.uk</url> @@ -198,6 +198,11 @@ <versions> <version> + <id>3.2.0-SNAPSHOT</id> + <name>3.2.0-SNAPSHOT</name> + <tag>3.2.0-SNAPSHOT</tag> + </version> + <version> <id>3.1.1</id> <name>3.1.1</name> <tag>3.1.1</tag> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-23 14:51:28
|
Revision: 383 http://flatpack.svn.sourceforge.net/flatpack/?rev=383&view=rev Author: zepernick Date: 2007-11-23 06:51:24 -0800 (Fri, 23 Nov 2007) Log Message: ----------- wrong visibility on method Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/DataError.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DataError.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/DataError.java 2007-11-23 14:43:51 UTC (rev 382) +++ trunk/flatpack/src/main/java/net/sf/flatpack/DataError.java 2007-11-23 14:51:24 UTC (rev 383) @@ -118,7 +118,7 @@ * * @return the rawData */ - protected String getRawData() { + public String getRawData() { return rawData; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-23 14:43:49
|
Revision: 382 http://flatpack.svn.sourceforge.net/flatpack/?rev=382&view=rev Author: zepernick Date: 2007-11-23 06:43:51 -0800 (Fri, 23 Nov 2007) Log Message: ----------- added missing tests to the suite Modified Paths: -------------- trunk/flatpack/src/test/java/net/sf/flatpack/AllJunitTests.java Modified: trunk/flatpack/src/test/java/net/sf/flatpack/AllJunitTests.java =================================================================== --- trunk/flatpack/src/test/java/net/sf/flatpack/AllJunitTests.java 2007-11-23 14:10:03 UTC (rev 381) +++ trunk/flatpack/src/test/java/net/sf/flatpack/AllJunitTests.java 2007-11-23 14:43:51 UTC (rev 382) @@ -18,7 +18,13 @@ // $JUnit-BEGIN$ suite.addTest(new TestSuite(net.sf.flatpack.columninfile.DelimitedColumnNamesInFileTest.class)); suite.addTest(new TestSuite(net.sf.flatpack.delim.tab.TabDelimitedTest.class)); + suite.addTest(new TestSuite(net.sf.flatpack.parserutils.FixedWidthParserUtilsTest.class)); + suite.addTest(new TestSuite(net.sf.flatpack.parserutils.ParserUtilsLTrimTest.class)); + suite.addTest(new TestSuite(net.sf.flatpack.parserutils.ParserUtilsSplitLineTest.class)); + suite.addTest(new TestSuite(net.sf.flatpack.parserutils.ParserUtilsTest.class)); + suite.addTest(new TestSuite(net.sf.flatpack.pzparser.PZParserOptsTest.class)); // $JUnit-END$ return suite; } } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-23 14:10:00
|
Revision: 381 http://flatpack.svn.sourceforge.net/flatpack/?rev=381&view=rev Author: zepernick Date: 2007-11-23 06:10:03 -0800 (Fri, 23 Nov 2007) Log Message: ----------- added an option to store the raw data in the DataError object when a parse error occurs Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2007-11-23 14:08:40 UTC (rev 380) +++ trunk/src/site/changes.xml 2007-11-23 14:10:03 UTC (rev 381) @@ -11,6 +11,8 @@ <action dev="zepernick" type="change">Added an option on the Paser setFlagEmptyRows(). This will make the DataSet.isRowEmpty() method available. This method will return true when there is no data on any columns in the row.</action> + <action dev="zepernick" type="change">New Parser option to log the raw line data in the + DataError object for parse errors. Parser.setStoreRawDataToDataError()</action> </release> <release version="3.1.1" date="2007-10-01" description="Fix"> <action dev="zepernick" type="fix">[1818818] ClassCastException when accessing header or trailer records</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-23 14:08:39
|
Revision: 380 http://flatpack.svn.sourceforge.net/flatpack/?rev=380&view=rev Author: zepernick Date: 2007-11-23 06:08:40 -0800 (Fri, 23 Nov 2007) Log Message: ----------- added an option to store the raw data in the DataError object when a parse error occurs Modified Paths: -------------- 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/DataError.java trunk/flatpack/src/main/java/net/sf/flatpack/Parser.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 Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2007-11-23 14:08:40 UTC (rev 380) @@ -165,7 +165,8 @@ columns = columns.subList(0, columnCount); addError(ds, "TRUNCATED LINE TO CORRECT NUMBER OF COLUMNS", lineCount, 1); } else { - addError(ds, "TOO MANY COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), lineCount, 2); + addError(ds, "TOO MANY COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), lineCount, 2, + isStoreRawDataToDataError() ? line : null); continue; } } else if (columns.size() < columnCount) { @@ -179,7 +180,8 @@ addError(ds, "PADDED LINE TO CORRECT NUMBER OF COLUMNS", lineCount, 1); } else { - addError(ds, "TOO FEW COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), lineCount, 2); + addError(ds, "TOO FEW COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), lineCount, 2, + isStoreRawDataToDataError() ? line : null); continue; } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2007-11-23 14:08:40 UTC (rev 380) @@ -115,7 +115,8 @@ line = line.substring(0, recordLength); addError(ds, "TRUNCATED LINE TO CORRECT LENGTH", lineCount, 1); } else { - addError(ds, "LINE TOO LONG. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2); + addError(ds, "LINE TOO LONG. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2, + isStoreRawDataToDataError() ? line : null); continue; } } else if (line.length() < recordLength) { @@ -127,7 +128,8 @@ addError(ds, "PADDED LINE TO CORRECT RECORD LENGTH", lineCount, 1); } else { - addError(ds, "LINE TOO SHORT. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2); + addError(ds, "LINE TOO SHORT. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2, + isStoreRawDataToDataError() ? line : null); continue; } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2007-11-23 14:08:40 UTC (rev 380) @@ -71,6 +71,8 @@ private List readersToClose = null; private boolean flagEmptyRows; + + private boolean storeRawDataToDataError; protected AbstractParser(final Reader dataSourceReader) { this.dataSourceReader = dataSourceReader; @@ -178,23 +180,41 @@ } /** - * Adds a new error to this DataSet. These can be collected, and retreived + * Adds a new error to this DataSet. These can be collected, and retrieved * after processing * - * @param errorDesc - + * @param errorDesc * String description of error - * @param lineNo - - * int line number error occured on - * @param errorLevel - - * int errorLevel 1,2,3 1=warning 2=error 3= severe error + * @param lineNo + * line number error occurred on + * @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) { + addError(ds, errorDesc, lineNo, errorLevel, null); + } + + /** + * Adds a new error to this DataSet. These can be collected, and retrieved + * after processing + * + * @param errorDesc + * String description of error + * @param lineNo + * line number error occurred on + * @param errorLevel + * errorLevel 1,2,3 1=warning 2=error 3= severe error' + * @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) { if (errorLevel == 1 && isIgnoreParseWarnings()) { // user has selected to not log warnings in the parser return; } - final DataError de = new DataError(errorDesc, lineNo, errorLevel); + final DataError de = new DataError(errorDesc, lineNo, errorLevel, lineData); ds.addError(de); } @@ -259,4 +279,18 @@ public void setFlagEmptyRows(boolean flagEmptyRows) { this.flagEmptyRows = flagEmptyRows; } + + /** + * @return the storeRawDataToDataError + */ + public boolean isStoreRawDataToDataError() { + return storeRawDataToDataError; + } + + /** + * @param storeRawDataToDataError the storeRawDataToDataError to set + */ + public void setStoreRawDataToDataError(boolean storeRawDataToDataError) { + this.storeRawDataToDataError = storeRawDataToDataError; + } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DataError.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/DataError.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/DataError.java 2007-11-23 14:08:40 UTC (rev 380) @@ -33,7 +33,7 @@ package net.sf.flatpack; /** - * This class holds errors that occured while parsing or processing a data file. + * This class holds errors that occurred while parsing or processing a data file. * * @author Paul Zepernick * @version 2.0 @@ -44,21 +44,39 @@ private final int lineNo; private final int errorLevel; + + private final String rawData; /** * * @param errorDesc - * Text description of the error that occured + * Text description of the error that occurred * @param lineNo - * Line number in the data file the error occured on + * Line number in the data file the error occurred on * @param errorLevel * Level of the error (1=warning, 2=moderate, 3=severe) */ public DataError(final String errorDesc, final int lineNo, final int errorLevel) { - this.errorDesc = errorDesc; - this.lineNo = lineNo; - this.errorLevel = errorLevel; + this(errorDesc, lineNo, errorLevel, null); } + + /** + * + * @param errorDesc + * Text description of the error that occurred + * @param lineNo + * Line number in the data file the error occurred on + * @param errorLevel + * Level of the error (1=warning, 2=moderate, 3=severe) + * @param rawData + * String of data which the parse failed on + */ + public DataError(final String errorDesc, final int lineNo, final int errorLevel, final String rawData) { + this.errorDesc = errorDesc; + this.lineNo = lineNo; + this.errorLevel = errorLevel; + this.rawData = rawData; + } /** * Returns the errorDesc. @@ -93,4 +111,14 @@ System.getProperty("line.separator")); return buf.toString(); } + + /** + * Option must be set on parser, otherwise this is + * null by default + * + * @return the rawData + */ + protected String getRawData() { + return rawData; + } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/Parser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/Parser.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/Parser.java 2007-11-23 14:08:40 UTC (rev 380) @@ -151,4 +151,13 @@ * @param flagEmptyRows */ void setFlagEmptyRows(final boolean flagEmptyRows); + + /** + * when true, the parser will place the data of the line which failed the parse and + * place it into the DataError object. DataError.getRawData() can be called to retrieve + * the line. + * + * @param storeRawDataToDataError + */ + void setStoreRawDataToDataError(final boolean storeRawDataToDataError); } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/Version.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2007-11-23 14:08:40 UTC (rev 380) @@ -19,5 +19,5 @@ * Static class which stores the version of this FlatPack */ public class Version { - public static final String VERSION = "3.1.1"; + public static final String VERSION = "3.2.0-SNAPSHOT"; } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2007-11-23 14:08:40 UTC (rev 380) @@ -152,7 +152,8 @@ addError(ds, "TRUNCATED LINE TO CORRECT NUMBER OF COLUMNS", getLineCount(), 1); } else { //log the error - addError(ds, "TOO MANY COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), getLineCount(), 2); + addError(ds, "TOO MANY COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), getLineCount(), 2, + isStoreRawDataToDataError() ? line : null); continue; } } else if (columns.size() < columnCount) { @@ -166,7 +167,8 @@ addError(ds, "PADDED LINE TO CORRECT NUMBER OF COLUMNS", getLineCount(), 1); } else { - addError(ds, "TOO FEW COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), getLineCount(), 2); + addError(ds, "TOO FEW COLUMNS WANTED: " + columnCount + " GOT: " + columns.size(), getLineCount(), 2, + isStoreRawDataToDataError() ? line : null); continue; } } @@ -177,6 +179,11 @@ row.setCols(columns); row.setRowNumber(getLineCount()); + if (isFlagEmptyRows()) { + //user has elected to have the parser flag rows that are empty + row.setEmpty(ParserUtils.isListElementsEmpty(columns)); + } + return row; } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2007-11-17 16:15:41 UTC (rev 379) +++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2007-11-23 14:08:40 UTC (rev 380) @@ -116,12 +116,13 @@ // be included in the // dataset if (isIgnoreExtraColumns()) { - //user has choosen to ignore the fact that we have too many bytes in the fixed + //user has chosen to ignore the fact that we have too many bytes in the fixed //width file. Truncate the line to the correct length line = line.substring(0, recordLength); addError(ds, "TRUNCATED LINE TO CORRECT LENGTH", lineCount, 1); } else { - addError(ds, "LINE TOO LONG. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2); + addError(ds, "LINE TOO LONG. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2, + isStoreRawDataToDataError() ? line : null); continue; } } else if (line.length() < recordLength) { @@ -133,7 +134,8 @@ addError(ds, "PADDED LINE TO CORRECT RECORD LENGTH", lineCount, 1); } else { - addError(ds, "LINE TOO SHORT. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2); + addError(ds, "LINE TOO SHORT. LINE IS " + line.length() + " LONG. SHOULD BE " + recordLength, lineCount, 2, + isStoreRawDataToDataError() ? line : null); continue; } } @@ -145,6 +147,11 @@ row.addColumn(FixedWidthParserUtils.splitFixedText(cmds, line)); row.setRowNumber(lineCount); + + if (isFlagEmptyRows()) { + //user has elected to have the parser flag rows that are empty + row.setEmpty(ParserUtils.isListElementsEmpty(row.getCols())); + } return row; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-17 16:15:36
|
Revision: 379 http://flatpack.svn.sourceforge.net/flatpack/?rev=379&view=rev Author: zepernick Date: 2007-11-17 08:15:41 -0800 (Sat, 17 Nov 2007) Log Message: ----------- Added an option on the Parser setFlagEmptyRows(). This will make the DataSet.isRowEmpty() method available. This method will return true when there is no data on any columns in the row. Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2007-11-17 16:15:17 UTC (rev 378) +++ trunk/src/site/changes.xml 2007-11-17 16:15:41 UTC (rev 379) @@ -7,6 +7,11 @@ <title>Changes</title> </properties> <body> + <release version="3.2.0-SNAPSHOT" date="2007-11-17" description="New parse options"> + <action dev="zepernick" type="change">Added an option on the Paser setFlagEmptyRows(). + This will make the DataSet.isRowEmpty() method available. This method will return + true when there is no data on any columns in the row.</action> + </release> <release version="3.1.1" date="2007-10-01" description="Fix"> <action dev="zepernick" type="fix">[1818818] ClassCastException when accessing header or trailer records</action> <action dev="zepernick" type="fix">Fixed bug in delimited parse when using Reader for data and map. Parameters This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-17 16:15:13
|
Revision: 378 http://flatpack.svn.sourceforge.net/flatpack/?rev=378&view=rev Author: zepernick Date: 2007-11-17 08:15:17 -0800 (Sat, 17 Nov 2007) Log Message: ----------- Added an option on the Parser setFlagEmptyRows(). This will make the DataSet.isRowEmpty() method available. This method will return true when there is no data on any columns in the row. Added Paths: ----------- trunk/flatpack/src/main/java/net/sf/flatpack/util/FPInvalidUsageException.java Added: trunk/flatpack/src/main/java/net/sf/flatpack/util/FPInvalidUsageException.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/util/FPInvalidUsageException.java (rev 0) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/FPInvalidUsageException.java 2007-11-17 16:15:17 UTC (rev 378) @@ -0,0 +1,13 @@ +package net.sf.flatpack.util; + +/** + * Thrown when using a parsing option inappropriately + * + * @author Paul Zepernick + */ +public class FPInvalidUsageException extends RuntimeException{ + + public FPInvalidUsageException(final String msg) { + super(msg); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-17 16:14:16
|
Revision: 377 http://flatpack.svn.sourceforge.net/flatpack/?rev=377&view=rev Author: zepernick Date: 2007-11-17 08:14:04 -0800 (Sat, 17 Nov 2007) Log Message: ----------- Added an option on the Parser setFlagEmptyRows(). This will make the DataSet.isRowEmpty() method available. This method will return true when there is no data on any columns in the row. Modified Paths: -------------- 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/DataSet.java trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java trunk/flatpack/src/main/java/net/sf/flatpack/Parser.java trunk/flatpack/src/main/java/net/sf/flatpack/structure/Row.java trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java trunk/flatpack/src/test/java/net/sf/flatpack/parserutils/ParserUtilsTest.java trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2007-11-17 16:14:04 UTC (rev 377) @@ -35,6 +35,7 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.Reader; +import java.util.Iterator; import java.util.List; import net.sf.flatpack.structure.Row; @@ -45,14 +46,17 @@ import org.slf4j.LoggerFactory; /** - * @author xhensevb - * @author zepernick + * @author Benoit Xhenseval + * @author Paul Zepernick * */ 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); @@ -156,7 +160,7 @@ // Incorrect record length on line log the error. Line // will not be included in the dataset log the error if (isIgnoreExtraColumns()) { - //user has choosen to ignore the fact that we have too many columns in the data from + //user has chosen to ignore the fact that we have too many columns in the data from //what the mapping has described. sublist the array to remove un-needed columns columns = columns.subList(0, columnCount); addError(ds, "TRUNCATED LINE TO CORRECT NUMBER OF COLUMNS", lineCount, 1); @@ -187,6 +191,12 @@ row.setRowNumber(lineCount); /** add the row to the array */ ds.addRow(row); + + if (isFlagEmptyRows()) { + //user has elected to have the parser flag rows that are empty + row.setEmpty(ParserUtils.isListElementsEmpty(columns)); + } + } } finally { if (br != null) { @@ -206,7 +216,7 @@ * Open reader being used to read through the file * @param qual * Qualifier being used for parse - * @parma delim + * @param delim * Delimiter being used for parse * @return String * Record from delimited file @@ -267,24 +277,6 @@ break; } qualiFound = false; - //tried to replace the code below due to checkstyle error - //} else { - // not a space, if this char is the - // delimiter, then we have reached the end - // of - // the record - // if (chrArry[i] == delim) { - // processingMultiLine = false; - // fix put in, setting to false caused - // bug when processing multiple - // multi-line - // columns on the same record - // processingMultiLine = ParserUtils.isMultiLine(chrArry, delim, qual); - // break; - // } - // qualiFound = false; - // continue; - // } } else if (chrArry[i] == qual) { qualiFound = true; } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2007-11-17 16:14:04 UTC (rev 377) @@ -139,6 +139,12 @@ final List cmds = ParserUtils.getColumnMetaData(mdkey, getPzMetaData()); row.addColumn(FixedWidthParserUtils.splitFixedText(cmds, line)); row.setRowNumber(lineCount); + + if (isFlagEmptyRows()) { + //user has elected to have the parser flag rows that are empty + row.setEmpty(ParserUtils.isListElementsEmpty(row.getCols())); + } + // add the row to the array ds.addRow(row); } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2007-11-17 16:14:04 UTC (rev 377) @@ -70,6 +70,8 @@ private List readersToClose = null; + private boolean flagEmptyRows; + protected AbstractParser(final Reader dataSourceReader) { this.dataSourceReader = dataSourceReader; } @@ -243,4 +245,18 @@ public void setPzMetaData(final MetaData pzMap) { this.pzMetaData = pzMap; } + + /** + * @return the flagEmptyRows + */ + public boolean isFlagEmptyRows() { + return flagEmptyRows; + } + + /** + * @param flagEmptyRows the flagEmptyRows to set + */ + public void setFlagEmptyRows(boolean flagEmptyRows) { + this.flagEmptyRows = flagEmptyRows; + } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DataSet.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/DataSet.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/DataSet.java 2007-11-17 16:14:04 UTC (rev 377) @@ -264,7 +264,7 @@ /** * 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 + * remove any non numeric character 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() * @@ -320,4 +320,12 @@ * @return boolean */ boolean contains(final String column); + + /** + * Checks to see if there was no data on the row which was parsed. This + * will thrown an exception if Parser.FlagEmptyRows() is not set to true. + * + * @return + */ + boolean isRowEmpty(); } \ No newline at end of file Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2007-11-17 16:14:04 UTC (rev 377) @@ -46,6 +46,7 @@ import net.sf.flatpack.structure.ColumnMetaData; import net.sf.flatpack.structure.Row; import net.sf.flatpack.util.FPConstants; +import net.sf.flatpack.util.FPInvalidUsageException; import net.sf.flatpack.util.FPStringUtils; import net.sf.flatpack.util.ParserUtils; import net.sf.flatpack.xml.MetaData; @@ -494,4 +495,17 @@ return false; } + + /** + * @throws FPInvalidUsageException + */ + public boolean isRowEmpty() { + if (!parser.isFlagEmptyRows()) { + //flag empty rows needs to be set for this functionality + //throw an exception + throw new FPInvalidUsageException("Parser.isFlagEmptyRows(true) must be set before using isRowEmpty()"); + } + + return ((Row)rows.get(pointer)).isEmpty(); + } } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/Parser.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/Parser.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/Parser.java 2007-11-17 16:14:04 UTC (rev 377) @@ -36,15 +36,16 @@ * PZParser is ready to parse the data and return an object that can then be * traversed. The default parser should NOT handle short lines, the user can * change it prior to calling parse. - * + * * @author Benoit Xhenseval + * @author Paul Zepernick */ public interface Parser { /** - * Start the parsing. Will return "null" if the - * parse fails and the DataSet cannot be created - * + * Start the parsing. Will return "null" if the parse fails and the DataSet + * cannot be created + * * @return the data set resulting from parsing */ DataSet parse(); @@ -57,70 +58,97 @@ /** * @param handleShortLines - - * when flaged as true, lines with less columns then the amount + * when flagged as true, lines with less columns then the amount * of column headers will be added as empty's instead of * producing an error */ void setHandlingShortLines(final boolean handleShortLines); /** - * + * * @return true, detail lines with a length or column count > the mapping - * definition will be truncated and the reader will NOT register these - * lines as erros in the DataError collection. + * definition will be truncated and the reader will NOT register + * these lines as errors in the DataError collection. */ boolean isIgnoreExtraColumns(); /** - * - * @param ignoreExtraColumns when true, detail lines with a length or column - * count > the mapping definition will be truncated and the reader - * will NOT register these lines as erros in the DataError collection. + * + * @param ignoreExtraColumns + * when true, detail lines with a length or column count > the + * mapping definition will be truncated and the reader will NOT + * register these lines as errors in the DataError collection. */ void setIgnoreExtraColumns(final boolean ignoreExtraColumns); /** * Default is false - * - * @return true, column names will have to be an exact match when retrieving the value of a column. - * Example when true: Column name = AColumnName ; getString("acolumnname") would fail - * Example when false: Column name = AColumnName ; getString("acolumnname") would pass + * + * @return true, column names will have to be an exact match when retrieving + * the value of a column. Example when true: Column name = + * AColumnName ; getString("acolumnname") would fail Example when + * false: Column name = AColumnName ; getString("acolumnname") would + * pass */ boolean isColumnNamesCaseSensitive(); /** * Default is false - * - * @param columnNamesCaseSensitive when true, column names will have to be an exact match when retrieving - * the value of a column. - * Example when true: Column name = AColumnName ; getString("acolumnname") would fail - * Example when false: Column name = AColumnName ; getString("acolumnname") would pass + * + * @param columnNamesCaseSensitive + * when true, column names will have to be an exact match when + * retrieving the value of a column. Example when true: Column + * name = AColumnName ; getString("acolumnname") would fail + * Example when false: Column name = AColumnName ; + * getString("acolumnname") would pass */ void setColumnNamesCaseSensitive(final boolean columnNamesCaseSensitive); /** * Default is false - * - * @return true, warnings encountered durring parsing will not be included in the DataSet errors + * + * @return true, warnings encountered during parsing will not be included in + * the DataSet errors */ boolean isIgnoreParseWarnings(); /** - * - * @param ignoreParseWarnings when true, warnings encountered durring parsing will not be included - * in the DataSet errors + * + * @param ignoreParseWarnings + * when true, warnings encountered during parsing will not be + * included in the DataSet errors */ void setIgnoreParseWarnings(final boolean ignoreParseWarnings); /** - * - * @return true, empty Strings will get returned as NULL when calling DataSet.getString() + * + * @return true, empty Strings will get returned as NULL when calling + * DataSet.getString() */ boolean isNullEmptyStrings(); /** - * - * @param nullEmptyStrings when true, empty Strings will get returned as NULL when calling DataSet.getString() + * + * @param nullEmptyStrings + * when true, empty Strings will get returned as NULL when + * calling DataSet.getString() */ void setNullEmptyStrings(final boolean nullEmptyStrings); + + /** + * + * @return flagEmptyRows when true, will analyze the row to see if all + * elements are empty and place a flag on the DataSet indicating if + * the row is empty + */ + boolean isFlagEmptyRows(); + + /** + * when true, will analyze the row to see if all elements are empty and + * place a flag on the DataSet indicating if the row is empty. This will slow + * down the parse and should only be used when necessary. It is off by default. + * + * @param flagEmptyRows + */ + void setFlagEmptyRows(final boolean flagEmptyRows); } Modified: trunk/flatpack/src/main/java/net/sf/flatpack/structure/Row.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/structure/Row.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/structure/Row.java 2007-11-17 16:14:04 UTC (rev 377) @@ -1,16 +1,34 @@ /* - Copyright 2006 Paul Zepernick - - 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. + * ObjectLab, http://www.objectlab.co.uk/open is supporting FlatPack. + * + * 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.flatpack.structure; @@ -19,10 +37,9 @@ /** * This holds a collection of columns and their values along with the actual - * rownumber they appear in the flat file + * row number they appear in the flat file * * @author Paul Zepernick - * @version 2.0 */ public class Row { /** List to hold all columns that exist in the row */ @@ -33,13 +50,14 @@ /** key to the MD for this row, null will indicate it is "detail" MD */ private String mdkey; + + private boolean empty; /** * Constructs a new Row * */ public Row() { - mdkey = null; cols = new ArrayList(); } @@ -141,4 +159,22 @@ public void setMdkey(final String mdkey) { this.mdkey = mdkey; } + + /** + * All columns in the row are empty + * + * @return the empty + */ + public boolean isEmpty() { + return empty; + } + + /** + * When true, all columns in the row are empty + * + * @param empty the empty to set + */ + public void setEmpty(boolean empty) { + this.empty = empty; + } } \ No newline at end of file Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2007-11-17 16:14:04 UTC (rev 377) @@ -1004,6 +1004,26 @@ return pzConvertProps; } + + /** + * Checks a list of <String> elements to see if every element + * in the list is empty. + * + * @param l + * List of <String> + * @return boolean + * true when all elements are empty + */ + public static boolean isListElementsEmpty(final List l) { + final Iterator it = l.iterator(); + while (it.hasNext()) { + final String s = (String)it.next(); + if (s != null && s.trim().length() > 0) { + return false; + } + } + return true; + } /** * Converts a String value to the appropriate Object via Modified: trunk/flatpack/src/test/java/net/sf/flatpack/parserutils/ParserUtilsTest.java =================================================================== --- trunk/flatpack/src/test/java/net/sf/flatpack/parserutils/ParserUtilsTest.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/test/java/net/sf/flatpack/parserutils/ParserUtilsTest.java 2007-11-17 16:14:04 UTC (rev 377) @@ -2,9 +2,11 @@ import java.io.IOException; import java.math.BigDecimal; +import java.util.List; import java.util.Properties; import junit.framework.TestCase; +import net.sf.flatpack.util.FPConstants; import net.sf.flatpack.util.ParserUtils; /** @@ -54,6 +56,12 @@ assertEquals(ParserUtils.runPzConverter(convertProps, "$5.00C", Integer.class), new Integer("5")); assertEquals(ParserUtils.runPzConverter(convertProps, "$5.3556", BigDecimal.class), new BigDecimal("5.3556")); } + + public void testEmptyRow() { + final String data = ",,,"; + final List l = ParserUtils.splitLine(data, ',', FPConstants.NO_QUALIFIER, 4); + assertEquals("list should be empty and is not...", ParserUtils.isListElementsEmpty(l), true); + } public static void main(final String[] args) { junit.textui.TestRunner.run(ParserUtilsTest.class); Modified: trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java =================================================================== --- trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java 2007-11-17 14:48:09 UTC (rev 376) +++ trunk/flatpack/src/test/java/net/sf/flatpack/pzparser/PZParserOptsTest.java 2007-11-17 16:14:04 UTC (rev 377) @@ -8,6 +8,7 @@ import net.sf.flatpack.DefaultParserFactory; import net.sf.flatpack.Parser; import net.sf.flatpack.util.FPConstants; +import net.sf.flatpack.util.FPInvalidUsageException; /** * Test the different options that can be @@ -81,7 +82,29 @@ fail("Column was mapped as 'column2' and lookup was 'COLUMN2'...should NOT fail with case sensitivity turned OFF"); } } + + public void testEmptyRowCheck() { + DataSet ds; + final String cols = "column1,column2,column3\r\n,,"; + + //check to see if the flag empty rows works + Parser p = DefaultParserFactory.getInstance().newDelimitedParser(new StringReader(cols), ',', FPConstants.NO_QUALIFIER); + p.setFlagEmptyRows(true); + ds = p.parse(); + ds.next(); + assertEquals("Row should return empty...", ds.isRowEmpty(), true); + + //do not set to flag empty rows, but make the check anyhow to make sure we get an exception + p = DefaultParserFactory.getInstance().newDelimitedParser(new StringReader(cols), ',', FPConstants.NO_QUALIFIER); + ds = p.parse(); + ds.next(); + try { + ds.isRowEmpty(); + fail("should have got FPInvalidUsageException..."); + } catch(FPInvalidUsageException e){} + } + public static void main(final String[] args) { junit.textui.TestRunner.run(PZParserOptsTest.class); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-17 14:48:09
|
Revision: 376 http://flatpack.svn.sourceforge.net/flatpack/?rev=376&view=rev Author: zepernick Date: 2007-11-17 06:48:09 -0800 (Sat, 17 Nov 2007) Log Message: ----------- fixed some spelling errors in the comments Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2007-11-06 00:19:56 UTC (rev 375) +++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2007-11-17 14:48:09 UTC (rev 376) @@ -225,7 +225,7 @@ /** * reads from the specified point in the line and returns how many chars to - * the specified delimter + * the specified delimiter * * @param line * @param start @@ -357,7 +357,7 @@ * @param delimiter * @param qualifier * @param p - * PZParser used to specify additional option when working witht the ColumnMetaData. Can be null + * PZParser used to specify additional option when working with the ColumnMetaData. Can be null * @return ArrayList - ColumnMetaData * @deprecated use the getPZMetaDataFromFile */ @@ -388,7 +388,7 @@ * @param delimiter * @param qualifier * @param p - * PZParser used to specify additional option when working witht the ColumnMetaData. Can be null + * PZParser used to specify additional option when working with the ColumnMetaData. Can be null * @return PZMetaData */ public static MetaData getPZMetaDataFromFile(final String line, final char delimiter, final char qualifier, final Parser p) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2007-11-06 00:19:52
|
Revision: 375 http://flatpack.svn.sourceforge.net/flatpack/?rev=375&view=rev Author: benoitx Date: 2007-11-05 16:19:56 -0800 (Mon, 05 Nov 2007) Log Message: ----------- made a copy Added Paths: ----------- tags/3.1.1/ Copied: tags/3.1.1 (from rev 374, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2007-11-06 00:19:16
|
Revision: 374 http://flatpack.svn.sourceforge.net/flatpack/?rev=374&view=rev Author: benoitx Date: 2007-11-05 16:19:16 -0800 (Mon, 05 Nov 2007) Log Message: ----------- prepare build for 3.1.1 Modified Paths: -------------- trunk/flatpack/qalab.xml trunk/flatpack-samples/qalab.xml Modified: trunk/flatpack/qalab.xml =================================================================== --- trunk/flatpack/qalab.xml 2007-11-06 00:04:22 UTC (rev 373) +++ trunk/flatpack/qalab.xml 2007-11-06 00:19:16 UTC (rev 374) @@ -317,6 +317,14 @@ project="default" statvalue="31" type="cobertura-line"/> <summaryresult date="2007-09-30" filecount="45" module="default" project="default" statvalue="23" type="cobertura-branch"/> + <summaryresult date="2007-11-06" filecount="53" module="default" + project="default" statvalue="11" type="checkstyle"/> + <summaryresult date="2007-11-06" filecount="6" module="default" + project="default" statvalue="118" type="simian"/> + <summaryresult date="2007-11-06" filecount="45" module="default" + project="default" statvalue="31" type="cobertura-line"/> + <summaryresult date="2007-11-06" filecount="45" module="default" + project="default" statvalue="23" type="cobertura-branch"/> </summary> <file id="default-default-com_pz_reader_ordering_package.html" module="default" path="com/pz/reader/ordering/package.html" project="default"> @@ -656,6 +664,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_DataSet.java" module="default" path="net/sf/flatpack/DataSet.java" project="default"> @@ -729,6 +738,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_LargeDataSet.java" module="default" path="net/sf/flatpack/LargeDataSet.java" project="default"> @@ -838,6 +849,9 @@ <result date="2007-09-30" statvalue="6" type="checkstyle"/> <result date="2007-09-30" statvalue="28" type="cobertura-line"/> <result date="2007-09-30" statvalue="25" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="6" type="checkstyle"/> + <result date="2007-11-06" statvalue="28" type="cobertura-line"/> + <result date="2007-11-06" statvalue="25" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_xml_PZMapParser.java" module="default" path="net/sf/flatpack/xml/PZMapParser.java" project="default"> @@ -882,6 +896,8 @@ <result date="2007-09-29" statvalue="50" type="cobertura-branch"/> <result date="2007-09-30" statvalue="71" type="cobertura-line"/> <result date="2007-09-30" statvalue="50" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="71" type="cobertura-line"/> + <result date="2007-11-06" statvalue="50" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_structure_Row.java" module="default" path="net/sf/flatpack/structure/Row.java" project="default"> @@ -915,6 +931,7 @@ <result date="2007-09-09" statvalue="45" type="cobertura-line"/> <result date="2007-09-29" statvalue="45" type="cobertura-line"/> <result date="2007-09-30" statvalue="45" type="cobertura-line"/> + <result date="2007-11-06" statvalue="45" type="cobertura-line"/> </file> <file id="default-default-net_sf_flatpack_structure_ColumnMetaData.java" @@ -964,6 +981,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="54" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="54" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_Version.java" module="default" path="net/sf/flatpack/Version.java" project="default"> @@ -989,6 +1008,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_xml_XMLRecordElement.java" module="default" @@ -1004,6 +1024,7 @@ <result date="2007-09-09" statvalue="54" type="cobertura-line"/> <result date="2007-09-29" statvalue="54" type="cobertura-line"/> <result date="2007-09-30" statvalue="54" type="cobertura-line"/> + <result date="2007-11-06" statvalue="54" type="cobertura-line"/> </file> <file id="default-default-net_sf_flatpack_util_PZConstants.java" module="default" path="net/sf/flatpack/util/PZConstants.java" project="default"> @@ -1127,6 +1148,7 @@ <result date="2007-09-09" statvalue="2" type="checkstyle"/> <result date="2007-09-29" statvalue="2" type="checkstyle"/> <result date="2007-09-30" statvalue="2" type="checkstyle"/> + <result date="2007-11-06" statvalue="2" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_util_FixedWidthParserUtils.java" @@ -1254,6 +1276,8 @@ <result date="2007-09-29" statvalue="5" type="cobertura-branch"/> <result date="2007-09-30" statvalue="19" type="cobertura-line"/> <result date="2007-09-30" statvalue="5" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="19" type="cobertura-line"/> + <result date="2007-11-06" statvalue="5" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_DefaultPZParserFactory.java" @@ -1341,6 +1365,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="25" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="25" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_converter_package.html" module="default" path="net/sf/flatpack/converter/package.html" project="default"> @@ -1397,6 +1423,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_converter_PZConvertException.java" @@ -1469,6 +1496,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_converter_ConvertInteger.java" @@ -1501,6 +1529,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_brparse_BuffReaderPZParseFactory.java" @@ -1577,6 +1606,9 @@ <result date="2007-09-30" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="56" type="cobertura-line"/> <result date="2007-09-30" statvalue="40" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="57" type="cobertura-line"/> + <result date="2007-11-06" statvalue="39" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_util_FPStringUtils.java" module="default" path="net/sf/flatpack/util/FPStringUtils.java" project="default"> @@ -1625,6 +1657,8 @@ <result date="2007-09-29" statvalue="6" type="cobertura-branch"/> <result date="2007-09-30" statvalue="16" type="cobertura-line"/> <result date="2007-09-30" statvalue="6" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="16" type="cobertura-line"/> + <result date="2007-11-06" statvalue="6" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_AbstractParser.java" module="default" path="net/sf/flatpack/AbstractParser.java" project="default"> @@ -1648,6 +1682,8 @@ <result date="2007-09-29" statvalue="35" type="cobertura-branch"/> <result date="2007-09-30" statvalue="55" type="cobertura-line"/> <result date="2007-09-30" statvalue="35" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="55" type="cobertura-line"/> + <result date="2007-11-06" statvalue="35" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_DefaultParserFactory.java" module="default" @@ -1672,6 +1708,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="23" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="23" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_DelimiterParser.java" module="default" path="net/sf/flatpack/DelimiterParser.java" project="default"> @@ -1695,6 +1733,8 @@ <result date="2007-09-29" statvalue="42" type="cobertura-branch"/> <result date="2007-09-30" statvalue="38" type="cobertura-line"/> <result date="2007-09-30" statvalue="42" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="38" type="cobertura-line"/> + <result date="2007-11-06" statvalue="42" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_Parser.java" module="default" path="net/sf/flatpack/Parser.java" project="default"> @@ -1718,6 +1758,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_ParserFactory.java" module="default" path="net/sf/flatpack/ParserFactory.java" project="default"> @@ -1743,6 +1785,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_converter_Converter.java" module="default" path="net/sf/flatpack/converter/Converter.java" project="default"> @@ -1766,6 +1810,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_brparse_BuffReaderParseFactory.java" @@ -1781,6 +1827,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_converter_FPConvertException.java" @@ -1796,6 +1843,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_util_FPConstants.java" module="default" path="net/sf/flatpack/util/FPConstants.java" project="default"> @@ -1809,6 +1857,7 @@ <result date="2007-09-09" statvalue="100" type="cobertura-branch"/> <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-C:_project_flatpack_flatpack_src_test_java_net_sf_flatpack_columninfile_DelimitedColumnNamesInFileTest.java" @@ -1841,6 +1890,8 @@ <result date="2007-09-29" statvalue="83" type="cobertura-branch"/> <result date="2007-09-30" statvalue="84" type="cobertura-line"/> <result date="2007-09-30" statvalue="83" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="84" type="cobertura-line"/> + <result date="2007-11-06" statvalue="83" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_writer_AbstractWriterFactory.java" @@ -1857,6 +1908,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_writer_DelimiterWriter.java" @@ -1873,6 +1926,8 @@ <result date="2007-09-29" statvalue="90" type="cobertura-branch"/> <result date="2007-09-30" statvalue="89" type="cobertura-line"/> <result date="2007-09-30" statvalue="90" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="89" type="cobertura-line"/> + <result date="2007-11-06" statvalue="90" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_writer_DelimiterWriterFactory.java" @@ -1889,6 +1944,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="75" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="75" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_writer_FixedLengthWriter.java" @@ -1905,6 +1962,8 @@ <result date="2007-09-29" statvalue="94" type="cobertura-branch"/> <result date="2007-09-30" statvalue="93" type="cobertura-line"/> <result date="2007-09-30" statvalue="94" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="93" type="cobertura-line"/> + <result date="2007-11-06" statvalue="94" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_writer_FixedWriterFactory.java" @@ -1921,6 +1980,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="66" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="66" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_writer_Writer.java" module="default" path="net/sf/flatpack/writer/Writer.java" project="default"> @@ -1939,6 +2000,9 @@ <result date="2007-09-30" statvalue="2" type="checkstyle"/> <result date="2007-09-30" statvalue="100" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="2" type="checkstyle"/> + <result date="2007-11-06" statvalue="100" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_writer_WriterFactory.java" module="default" @@ -1954,6 +2018,8 @@ <result date="2007-09-29" statvalue="100" type="cobertura-branch"/> <result date="2007-09-30" statvalue="100" type="cobertura-line"/> <result date="2007-09-30" statvalue="100" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="100" type="cobertura-line"/> + <result date="2007-11-06" statvalue="100" type="cobertura-branch"/> </file> <file id="default-default-net_sf_flatpack_xml_MapParser.java" module="default" path="net/sf/flatpack/xml/MapParser.java" project="default"> @@ -1967,5 +2033,7 @@ <result date="2007-09-29" statvalue="38" type="cobertura-branch"/> <result date="2007-09-30" statvalue="50" type="cobertura-line"/> <result date="2007-09-30" statvalue="38" type="cobertura-branch"/> + <result date="2007-11-06" statvalue="50" type="cobertura-line"/> + <result date="2007-11-06" statvalue="38" type="cobertura-branch"/> </file> </qalab> Modified: trunk/flatpack-samples/qalab.xml =================================================================== --- trunk/flatpack-samples/qalab.xml 2007-11-06 00:04:22 UTC (rev 373) +++ trunk/flatpack-samples/qalab.xml 2007-11-06 00:19:16 UTC (rev 374) @@ -183,12 +183,20 @@ project="default" statvalue="2" type="pmd"/> <summaryresult date="2007-09-30" filecount="34" module="default" project="default" statvalue="155" type="checkstyle"/> - <summaryresult date="2007-09-30" filecount="9" module="default" - project="default" statvalue="13" type="findbugs"/> <summaryresult date="2007-09-30" filecount="6" module="default" + project="default" statvalue="9" type="findbugs"/> + <summaryresult date="2007-09-30" filecount="6" module="default" project="default" statvalue="92" type="simian"/> <summaryresult date="2007-09-30" filecount="2" module="default" project="default" statvalue="2" type="pmd"/> + <summaryresult date="2007-11-06" filecount="34" module="default" + project="default" statvalue="155" type="checkstyle"/> + <summaryresult date="2007-11-06" filecount="6" module="default" + project="default" statvalue="9" type="findbugs"/> + <summaryresult date="2007-11-06" filecount="6" module="default" + project="default" statvalue="92" type="simian"/> + <summaryresult date="2007-11-06" filecount="2" module="default" + project="default" statvalue="2" type="pmd"/> </summary> <file id="default-default-com_pz_reader_examples_numericsanddates_package.html" @@ -413,6 +421,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_largedataset_largecsvperformancetest_package.html" @@ -438,6 +447,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_multilinedelimitedrecord_package.html" @@ -463,6 +473,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_numericsanddates_package.html" @@ -488,6 +499,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_delimitedcolumnnamesinfile_package.html" @@ -513,6 +525,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_delimiteddynamiccolumns_package.html" @@ -538,6 +551,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_exporttoexcel_package.html" @@ -563,6 +577,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_largedataset_fixedlengthdynamiccolumns_package.html" @@ -588,6 +603,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_createsamplecsv_package.html" @@ -613,6 +629,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_fixedlengthdynamiccolumns_package.html" @@ -638,6 +655,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_largedataset_delimiteddynamiccolumns_package.html" @@ -663,6 +681,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_csvperformancetest_package.html" @@ -688,6 +707,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_lowlevelparse_package.html" @@ -713,6 +733,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_delimiteddynamiccolumnswitherrors_package.html" @@ -738,6 +759,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_fixedlengthheaderandtrailer_package.html" @@ -763,6 +785,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_csvheaderandtrailer_package.html" @@ -788,6 +811,7 @@ <result date="2007-09-09" statvalue="1" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_Examples.java" module="default" @@ -831,6 +855,8 @@ <result date="2007-09-29" statvalue="1" type="findbugs"/> <result date="2007-09-30" statvalue="14" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="findbugs"/> + <result date="2007-11-06" statvalue="14" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="findbugs"/> </file> <file id="default-default-net_sf_flatpack_examples_createsamplecsv_CSVTestFileCreator.java" @@ -896,6 +922,9 @@ <result date="2007-09-30" statvalue="7" type="checkstyle"/> <result date="2007-09-30" statvalue="1" type="findbugs"/> <result date="2007-09-30" statvalue="1" type="pmd"/> + <result date="2007-11-06" statvalue="7" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="findbugs"/> + <result date="2007-11-06" statvalue="1" type="pmd"/> </file> <file id="default-default-net_sf_flatpack_examples_csvheaderandtrailer_CSVHeaderAndTrailer.java" @@ -921,6 +950,7 @@ <result date="2007-09-09" statvalue="17" type="checkstyle"/> <result date="2007-09-29" statvalue="17" type="checkstyle"/> <result date="2007-09-30" statvalue="17" type="checkstyle"/> + <result date="2007-11-06" statvalue="17" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_csvperformancetest_CSVPerformanceTest.java" @@ -972,7 +1002,9 @@ <result date="2007-09-29" statvalue="16" type="checkstyle"/> <result date="2007-09-29" statvalue="1" type="findbugs"/> <result date="2007-09-30" statvalue="16" type="checkstyle"/> - <result date="2007-09-30" statvalue="2" type="findbugs"/> + <result date="2007-09-30" statvalue="1" type="findbugs"/> + <result date="2007-11-06" statvalue="16" type="checkstyle"/> + <result date="2007-11-06" statvalue="1" type="findbugs"/> </file> <file id="default-default-net_sf_flatpack_examples_delimitedcolumnnamesinfile_DelimitedColumnNamesInFile.java" @@ -1003,7 +1035,7 @@ <result date="2007-09-09" statvalue="5" type="checkstyle"/> <result date="2007-09-29" statvalue="5" type="checkstyle"/> <result date="2007-09-30" statvalue="5" type="checkstyle"/> - <result date="2007-09-30" statvalue="1" type="findbugs"/> + <result date="2007-11-06" statvalue="5" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_delimiteddynamiccolumns_DelimitedWithPZMap.java" @@ -1036,6 +1068,7 @@ <result date="2007-09-09" statvalue="13" type="checkstyle"/> <result date="2007-09-29" statvalue="13" type="checkstyle"/> <result date="2007-09-30" statvalue="13" type="checkstyle"/> + <result date="2007-11-06" statvalue="13" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_delimiteddynamiccolumnswitherrors_DelimitedWithPZMapErrors.java" @@ -1068,6 +1101,7 @@ <result date="2007-09-09" statvalue="13" type="checkstyle"/> <result date="2007-09-29" statvalue="13" type="checkstyle"/> <result date="2007-09-30" statvalue="13" type="checkstyle"/> + <result date="2007-11-06" statvalue="13" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_exporttoexcel_DelimitedFileExportToExcel.java" @@ -1100,6 +1134,7 @@ <result date="2007-09-09" statvalue="3" type="checkstyle"/> <result date="2007-09-29" statvalue="3" type="checkstyle"/> <result date="2007-09-30" statvalue="3" type="checkstyle"/> + <result date="2007-11-06" statvalue="3" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_fixedlengthdynamiccolumns_FixedLengthWithPZMap.java" @@ -1132,6 +1167,7 @@ <result date="2007-09-09" statvalue="3" type="checkstyle"/> <result date="2007-09-29" statvalue="3" type="checkstyle"/> <result date="2007-09-30" statvalue="3" type="checkstyle"/> + <result date="2007-11-06" statvalue="3" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_fixedlengthheaderandtrailer_FixedLengthHeaderAndTrailer.java" @@ -1164,6 +1200,7 @@ <result date="2007-09-09" statvalue="17" type="checkstyle"/> <result date="2007-09-29" statvalue="17" type="checkstyle"/> <result date="2007-09-30" statvalue="17" type="checkstyle"/> + <result date="2007-11-06" statvalue="17" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_largedataset_delimiteddynamiccolumns_LargeDelimitedWithPZMap.java" @@ -1199,7 +1236,7 @@ <result date="2007-09-09" statvalue="4" type="checkstyle"/> <result date="2007-09-29" statvalue="4" type="checkstyle"/> <result date="2007-09-30" statvalue="4" type="checkstyle"/> - <result date="2007-09-30" statvalue="1" type="findbugs"/> + <result date="2007-11-06" statvalue="4" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_largedataset_fixedlengthdynamiccolumns_LargeFixedLengthWithPZMap.java" @@ -1235,7 +1272,7 @@ <result date="2007-09-09" statvalue="3" type="checkstyle"/> <result date="2007-09-29" statvalue="3" type="checkstyle"/> <result date="2007-09-30" statvalue="3" type="checkstyle"/> - <result date="2007-09-30" statvalue="1" type="findbugs"/> + <result date="2007-11-06" statvalue="3" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_largedataset_largecsvperformancetest_CSVLarge.java" @@ -1281,6 +1318,8 @@ <result date="2007-09-29" statvalue="2" type="findbugs"/> <result date="2007-09-30" statvalue="9" type="checkstyle"/> <result date="2007-09-30" statvalue="2" type="findbugs"/> + <result date="2007-11-06" statvalue="9" type="checkstyle"/> + <result date="2007-11-06" statvalue="2" type="findbugs"/> </file> <file id="default-default-net_sf_flatpack_examples_lowlevelparse_LowLevelParse.java" @@ -1346,6 +1385,9 @@ <result date="2007-09-30" statvalue="5" type="checkstyle"/> <result date="2007-09-30" statvalue="2" type="findbugs"/> <result date="2007-09-30" statvalue="1" type="pmd"/> + <result date="2007-11-06" statvalue="5" type="checkstyle"/> + <result date="2007-11-06" statvalue="2" type="findbugs"/> + <result date="2007-11-06" statvalue="1" type="pmd"/> </file> <file id="default-default-net_sf_flatpack_examples_multilinedelimitedrecord_DelimitedMultiLine.java" @@ -1378,6 +1420,7 @@ <result date="2007-09-09" statvalue="4" type="checkstyle"/> <result date="2007-09-29" statvalue="4" type="checkstyle"/> <result date="2007-09-30" statvalue="4" type="checkstyle"/> + <result date="2007-11-06" statvalue="4" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_numericsanddates_NumericsAndDates.java" @@ -1410,6 +1453,7 @@ <result date="2007-09-09" statvalue="6" type="checkstyle"/> <result date="2007-09-29" statvalue="6" type="checkstyle"/> <result date="2007-09-30" statvalue="6" type="checkstyle"/> + <result date="2007-11-06" statvalue="6" type="checkstyle"/> </file> <file id="default-default-net_sf_flatpack_examples_ConsoleMenu.java" module="default" @@ -1434,5 +1478,6 @@ <result date="2007-09-09" statvalue="2" type="findbugs"/> <result date="2007-09-29" statvalue="2" type="findbugs"/> <result date="2007-09-30" statvalue="2" type="findbugs"/> + <result date="2007-11-06" statvalue="2" type="findbugs"/> </file> </qalab> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2007-11-06 00:04:17
|
Revision: 373 http://flatpack.svn.sourceforge.net/flatpack/?rev=373&view=rev Author: benoitx Date: 2007-11-05 16:04:22 -0800 (Mon, 05 Nov 2007) Log Message: ----------- add a couple of releases. Modified Paths: -------------- trunk/statsvn.bat Modified: trunk/statsvn.bat =================================================================== --- trunk/statsvn.bat 2007-11-06 00:03:49 UTC (rev 372) +++ trunk/statsvn.bat 2007-11-06 00:04:22 UTC (rev 373) @@ -1,3 +1,3 @@ svn log -v --xml https://flatpack.svn.sourceforge.net/svnroot/flatpack/ > svn.log mkdir target\docs\statsvn -java -jar c:\java\statsvn\statsvn.jar -xdoc -verbose -config-file ./statsvn.properties -tags "^release_2.2.0|^Root_v2_0_0|^Root_v1_0_5|^Root_V2_1_0|^Root_V2_2_0_0|^3.0.0|^3.1.0" -output-dir src\site\statsvn -title FlatPack -exclude "**/SampleCSV.csv|**/qalab.xml" -viewvc http://flatpack.svn.sourceforge.net/viewvc/flatpack/trunk ./svn.log . +java -jar c:\java\statsvn\statsvn.jar -xdoc -verbose -config-file ./statsvn.properties -tags "^release_2.2.0|^Root_v2_0_0|^Root_v1_0_5|^Root_V2_1_0|^Root_V2_2_0_0|^3.0.0|^3.1.0|^3.1.1|^3.2.0" -output-dir src\site\statsvn -title FlatPack -exclude "**/SampleCSV.csv|**/qalab.xml" -viewvc http://flatpack.svn.sourceforge.net/viewvc/flatpack/trunk ./svn.log . This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <be...@us...> - 2007-11-06 00:03:44
|
Revision: 372 http://flatpack.svn.sourceforge.net/flatpack/?rev=372&view=rev Author: benoitx Date: 2007-11-05 16:03:49 -0800 (Mon, 05 Nov 2007) Log Message: ----------- prepare 3.1.1 Modified Paths: -------------- trunk/src/site/changes.xml Modified: trunk/src/site/changes.xml =================================================================== --- trunk/src/site/changes.xml 2007-11-05 02:16:55 UTC (rev 371) +++ trunk/src/site/changes.xml 2007-11-06 00:03:49 UTC (rev 372) @@ -7,7 +7,7 @@ <title>Changes</title> </properties> <body> - <release version="3.1.1-SNAPSHOT" date="2007-10-01" description="Fix"> + <release version="3.1.1" date="2007-10-01" description="Fix"> <action dev="zepernick" type="fix">[1818818] ClassCastException when accessing header or trailer records</action> <action dev="zepernick" type="fix">Fixed bug in delimited parse when using Reader for data and map. Parameters were being reversed in the code.</action> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-05 02:16:52
|
Revision: 371 http://flatpack.svn.sourceforge.net/flatpack/?rev=371&view=rev Author: zepernick Date: 2007-11-04 18:16:55 -0800 (Sun, 04 Nov 2007) Log Message: ----------- updated version Modified Paths: -------------- trunk/flatpack/src/main/java/net/sf/flatpack/Version.java Modified: trunk/flatpack/src/main/java/net/sf/flatpack/Version.java =================================================================== --- trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2007-11-05 02:16:30 UTC (rev 370) +++ trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2007-11-05 02:16:55 UTC (rev 371) @@ -19,5 +19,5 @@ * Static class which stores the version of this FlatPack */ public class Version { - public static final String VERSION = "3.1.0"; + public static final String VERSION = "3.1.1"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-05 02:16:29
|
Revision: 370 http://flatpack.svn.sourceforge.net/flatpack/?rev=370&view=rev Author: zepernick Date: 2007-11-04 18:16:30 -0800 (Sun, 04 Nov 2007) Log Message: ----------- changed from snapshot to 3.1.1 Modified Paths: -------------- trunk/common-build/project.xml Modified: trunk/common-build/project.xml =================================================================== --- trunk/common-build/project.xml 2007-11-04 00:48:05 UTC (rev 369) +++ trunk/common-build/project.xml 2007-11-05 02:16:30 UTC (rev 370) @@ -27,7 +27,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd"> <pomVersion>3</pomVersion> <groupId>net.sf.flatpack</groupId> - <currentVersion>3.1.1-SNAPSHOT</currentVersion> + <currentVersion>3.1.1</currentVersion> <organization> <name>ObjectLab Financial Ltd</name> <url>http://www.objectlab.co.uk</url> @@ -198,9 +198,9 @@ <versions> <version> - <id>3.1.1-SNAPSHOT</id> - <name>3.1.1-SNAPSHOT</name> - <tag>3.1.1-SNAPSHOT</tag> + <id>3.1.1</id> + <name>3.1.1</name> + <tag>3.1.1</tag> </version> <version> <id>3.1.0</id> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <zep...@us...> - 2007-11-04 00:48:08
|
Revision: 369 http://flatpack.svn.sourceforge.net/flatpack/?rev=369&view=rev Author: zepernick Date: 2007-11-03 17:48:05 -0700 (Sat, 03 Nov 2007) Log Message: ----------- updated version Modified Paths: -------------- trunk/common-build/project.xml Modified: trunk/common-build/project.xml =================================================================== --- trunk/common-build/project.xml 2007-11-04 00:42:54 UTC (rev 368) +++ trunk/common-build/project.xml 2007-11-04 00:48:05 UTC (rev 369) @@ -27,7 +27,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd"> <pomVersion>3</pomVersion> <groupId>net.sf.flatpack</groupId> - <currentVersion>3.1.0</currentVersion> + <currentVersion>3.1.1-SNAPSHOT</currentVersion> <organization> <name>ObjectLab Financial Ltd</name> <url>http://www.objectlab.co.uk</url> @@ -197,6 +197,11 @@ </reports> <versions> + <version> + <id>3.1.1-SNAPSHOT</id> + <name>3.1.1-SNAPSHOT</name> + <tag>3.1.1-SNAPSHOT</tag> + </version> <version> <id>3.1.0</id> <name>3.1.0</name> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |