Menu
▾
▴
flatpack-svn
|
From: <be...@us...> - 2009-03-10 17:41:14
|
Revision: 408
http://flatpack.svn.sourceforge.net/flatpack/?rev=408&view=rev
Author: benoitx
Date: 2009-03-10 17:41:10 +0000 (Tue, 10 Mar 2009)
Log Message:
-----------
Updating the SF logo as per the SF email sent March 10.
Modified Paths:
--------------
trunk/flatpack/.classpath
trunk/flatpack/src/site/navigation.xml
trunk/flatpack-samples/.classpath
trunk/flatpack-samples/src/site/navigation.xml
trunk/src/site/navigation.xml
Modified: trunk/flatpack/.classpath
===================================================================
--- trunk/flatpack/.classpath 2008-09-04 11:17:35 UTC (rev 407)
+++ trunk/flatpack/.classpath 2009-03-10 17:41:10 UTC (rev 408)
@@ -2,11 +2,11 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry output="target/test-classes" kind="src" path="src/test/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.2.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jexcelapi/jars/jxl-2.4.2.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/org.slf4j/jars/slf4j-api-1.1.0-RC1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/org.slf4j/jars/slf4j-simple-1.1.0-RC1.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/jexcelapi/jars/jxl-2.4.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/flatpack/src/site/navigation.xml
===================================================================
--- trunk/flatpack/src/site/navigation.xml 2008-09-04 11:17:35 UTC (rev 407)
+++ trunk/flatpack/src/site/navigation.xml 2009-03-10 17:41:10 UTC (rev 408)
@@ -27,9 +27,7 @@
</menu>
<footer>
<div style="vertical-align:middle">
- <a href="http://sourceforge.net">
- <img src="http://sourceforge.net/sflogo.php?group_id=97367&type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" />
- </a>
+ <a href="http://sourceforge.net/projects/flatpack"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=127761&type=13" width="120" height="30" border="0" alt="Get FlatPack Java API For Flat Files at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
<a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=Paul%20Zepernick%20and%20ObjectLab%20have%20released%20version%202%2E3%2E0%20of%20FlatPack%2E&bodytext=FlatPack%20on%20SourceForge%3A%20a%20Java%20(1%2E4%2B)%20flat%20file%20parser%20that%20handles%20CSV,%20fixed%20length%20and%20custom%20delimiters%2E%20The%20formats%20are%20configured%20in%20XML%20or%20in%20DB%2E%20Once%20parsed%20the%20data%20is%20easily%20accessible%20record%20by%20record%20and%20via%20a%20column%20name,%20regardless%20of%20order%2E%20%20It%20is%20fast%20and%20released%20under%20Apache%20license%202%2E0%2E&topic=programming">
<img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a>
</div>
Modified: trunk/flatpack-samples/.classpath
===================================================================
--- trunk/flatpack-samples/.classpath 2008-09-04 11:17:35 UTC (rev 407)
+++ trunk/flatpack-samples/.classpath 2009-03-10 17:41:10 UTC (rev 408)
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="var" path="MAVEN_REPO/net.sf.flatpack/jars/flatpack-3.1.0.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/net.sf.flatpack/jars/flatpack-3.2.0-SNAPSHOT.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jexcelapi/jars/jxl-2.4.2.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/org.slf4j/jars/slf4j-api-1.1.0-RC1.jar"/>
Modified: trunk/flatpack-samples/src/site/navigation.xml
===================================================================
--- trunk/flatpack-samples/src/site/navigation.xml 2008-09-04 11:17:35 UTC (rev 407)
+++ trunk/flatpack-samples/src/site/navigation.xml 2009-03-10 17:41:10 UTC (rev 408)
@@ -27,9 +27,7 @@
</menu>
<footer>
<div style="vertical-align:middle">
- <a href="http://sourceforge.net">
- <img src="http://sourceforge.net/sflogo.php?group_id=97367&type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" />
- </a>
+ <a href="http://sourceforge.net/projects/flatpack"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=127761&type=13" width="120" height="30" border="0" alt="Get FlatPack Java API For Flat Files at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
<a href="http://digg.com/submit?phase=2&url=objectlabkit.sourceforge.net&title=Paul%20Zepernick%20and%20ObjectLab%20have%20released%20version%202%2E3%2E0%20of%20FlatPack%2E&bodytext=FlatPack%20on%20SourceForge%3A%20a%20Java%20(1%2E4%2B)%20flat%20file%20parser%20that%20handles%20CSV,%20fixed%20length%20and%20custom%20delimiters%2E%20The%20formats%20are%20configured%20in%20XML%20or%20in%20DB%2E%20Once%20parsed%20the%20data%20is%20easily%20accessible%20record%20by%20record%20and%20via%20a%20column%20name,%20regardless%20of%20order%2E%20%20It%20is%20fast%20and%20released%20under%20Apache%20license%202%2E0%2E&topic=programming">
<img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a>
</div>
Modified: trunk/src/site/navigation.xml
===================================================================
--- trunk/src/site/navigation.xml 2008-09-04 11:17:35 UTC (rev 407)
+++ trunk/src/site/navigation.xml 2009-03-10 17:41:10 UTC (rev 408)
@@ -31,9 +31,7 @@
</menu>
<footer>
<div style="vertical-align:middle">
- <p style="margin-top:10px; margin-bottom:0; padding-bottom:0; text-align:center; line-height:0"><a href="http://sourceforge.net">
- <img src="http://sourceforge.net/sflogo.php?group_id=97367&type=2" width="125" height="37" border="0" alt="SourceForge.net Logo" />
- </a>
+ <p style="margin-top:10px; margin-bottom:0; padding-bottom:0; text-align:center; line-height:0"><a href="http://sourceforge.net/projects/flatpack"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=127761&type=13" width="120" height="30" border="0" alt="Get FlatPack Java API For Flat Files at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
<a href="http://digg.com/submit?phase=2&url=flatpack.sourceforge.net&title=Paul%20Zepernick%20and%20ObjectLab%20have%20released%20version%202%2E3%2E0%20of%20FlatPack%2E&bodytext=FlatPack%20on%20SourceForge%3A%20a%20Java%20(1%2E4%2B)%20flat%20file%20parser%20that%20handles%20CSV,%20fixed%20length%20and%20custom%20delimiters%2E%20The%20formats%20are%20configured%20in%20XML%20or%20in%20DB%2E%20Once%20parsed%20the%20data%20is%20easily%20accessible%20record%20by%20record%20and%20via%20a%20column%20name,%20regardless%20of%20order%2E%20%20It%20is%20fast%20and%20released%20under%20Apache%20license%202%2E0%2E&topic=programming">
<img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a>
<a href="http://feeds.feedburner.com/~r/ObjectlabOpenSourceNews/~6/1"><img src="http://feeds.feedburner.com/ObjectlabOpenSourceNews.1.gif" alt="ObjectLab Open Source News" style="border:0"/></a></p><p style="margin-top:5px; padding-top:0; font-size:x-small; text-align:center"></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-01 21:02:58
|
Revision: 413
http://flatpack.svn.sourceforge.net/flatpack/?rev=413&view=rev
Author: benoitx
Date: 2010-03-01 21:02:52 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
Prepare for 3.2 release.
Added getBigDecimal on DataSet.
Modified Paths:
--------------
trunk/common-build/project.xml
trunk/flatpack/.classpath
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.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/Version.java
trunk/src/site/changes.xml
trunk/src/site/navigation.xml
Modified: trunk/common-build/project.xml
===================================================================
--- trunk/common-build/project.xml 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/common-build/project.xml 2010-03-01 21:02:52 UTC (rev 413)
@@ -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.2.0-SNAPSHOT</currentVersion>
+ <currentVersion>3.2.0</currentVersion>
<organization>
<name>ObjectLab Financial Ltd</name>
<url>http://www.objectlab.co.uk</url>
@@ -198,9 +198,9 @@
<versions>
<version>
- <id>3.2.0-SNAPSHOT</id>
- <name>3.2.0-SNAPSHOT</name>
- <tag>3.2.0-SNAPSHOT</tag>
+ <id>3.2.0</id>
+ <name>3.2.0</name>
+ <tag>3.2.0</tag>
</version>
<version>
<id>3.1.1</id>
Modified: trunk/flatpack/.classpath
===================================================================
--- trunk/flatpack/.classpath 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/flatpack/.classpath 2010-03-01 21:02:52 UTC (rev 413)
@@ -8,5 +8,6 @@
<classpathentry kind="var" path="MAVEN_REPO/org.slf4j/jars/slf4j-api-1.1.0-RC1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/org.slf4j/jars/slf4j-simple-1.1.0-RC1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jexcelapi/jars/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2010-03-01 21:02:52 UTC (rev 413)
@@ -35,7 +35,6 @@
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;
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DataSet.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/DataSet.java 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/DataSet.java 2010-03-01 21:02:52 UTC (rev 413)
@@ -32,10 +32,12 @@
*/
package net.sf.flatpack;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
+import java.util.NoSuchElementException;
import java.util.Properties;
import net.sf.flatpack.ordering.OrderBy;
@@ -92,6 +94,17 @@
double getDouble(final String column);
/**
+ * Returns the BigDecimal value of a specified column
+ *
+ * @param column -
+ * Name of the column
+ * @exception NoSuchElementException
+ * @exception NumberFormatException
+ * @return BigDecimal
+ */
+ BigDecimal getBigDecimal(final String column);
+
+ /**
* Returns the interger value of a specified column
*
* @param column -
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2010-03-01 21:02:52 UTC (rev 413)
@@ -32,6 +32,7 @@
*/
package net.sf.flatpack;
+import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -99,7 +100,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getColumns()
+ * @see net.sf.flatpack.DataSet#getColumns()
*/
public String[] getColumns() {
ColumnMetaData column = null;
@@ -121,7 +122,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getColumns(java.lang.String)
+ * @see net.sf.flatpack.DataSet#getColumns(java.lang.String)
*/
public String[] getColumns(final String recordID) {
String[] array = null;
@@ -141,7 +142,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getDate(java.lang.String)
+ * @see net.sf.flatpack.DataSet#getDate(java.lang.String)
*/
public Date getDate(final String column) throws ParseException {
return getDate(column, new SimpleDateFormat("yyyyMMdd"));
@@ -150,7 +151,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getDate(java.lang.String,
+ * @see net.sf.flatpack.DataSet#getDate(java.lang.String,
* java.text.SimpleDateFormat)
*/
public Date getDate(final String column, final SimpleDateFormat sdf) throws ParseException {
@@ -165,12 +166,11 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getDouble(java.lang.String)
+ * @see net.sf.flatpack.DataSet#getDouble(java.lang.String)
*/
public double getDouble(final String column) {
final StringBuffer newString = new StringBuffer();
final String s = getStringValue(column);
- // final String s = row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), columnMD, column, pzparser));
if (!strictNumericParse) {
newString.append(ParserUtils.stripNonDoubleChars(s));
@@ -181,6 +181,17 @@
return Double.parseDouble(newString.toString());
}
+ /*
+ * (non-Javadoc)
+ *
+ * @see net.sf.flatpack.DataSet#getBigDecimal(java.lang.String)
+ */
+ public BigDecimal getBigDecimal(final String column) {
+ final String s = getStringValue(column);
+
+ return new BigDecimal(s);
+ }
+
private String getStringValue(final String column) {
final Row row = (Row) rows.get(pointer);
return row.getValue(ParserUtils.getColumnIndex(row.getMdkey(), metaData, column, parser));
@@ -194,7 +205,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getErrorCount()
+ * @see net.sf.flatpack.DataSet#getErrorCount()
*/
public int getErrorCount() {
if (getErrors() != null) {
@@ -207,7 +218,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getErrors()
+ * @see net.sf.flatpack.DataSet#getErrors()
*/
public List getErrors() {
return errors;
@@ -216,7 +227,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getIndex()
+ * @see net.sf.flatpack.DataSet#getIndex()
*/
public int getIndex() {
return pointer;
@@ -225,7 +236,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getInt(java.lang.String)
+ * @see net.sf.flatpack.DataSet#getInt(java.lang.String)
*/
public int getInt(final String column) {
final String s = getStringValue(column);
@@ -250,7 +261,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getRowCount()
+ * @see net.sf.flatpack.DataSet#getRowCount()
*/
public int getRowCount() {
return rows.size();
@@ -259,7 +270,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getRowNo()
+ * @see net.sf.flatpack.DataSet#getRowNo()
*/
public int getRowNo() {
return ((Row) rows.get(pointer)).getRowNumber();
@@ -268,7 +279,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#getString(java.lang.String)
+ * @see net.sf.flatpack.DataSet#getString(java.lang.String)
*/
public String getString(final String column) {
String s = getStringValue(column);
@@ -301,7 +312,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#goBottom()
+ * @see net.sf.flatpack.DataSet#goBottom()
*/
public void goBottom() {
pointer = rows.size() - 1;
@@ -310,7 +321,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#goTop()
+ * @see net.sf.flatpack.DataSet#goTop()
*/
public void goTop() {
pointer = -1;
@@ -319,7 +330,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#isAnError(int)
+ * @see net.sf.flatpack.DataSet#isAnError(int)
*/
public boolean isAnError(final int lineNo) {
for (int i = 0; i < errors.size(); i++) {
@@ -333,7 +344,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#next()
+ * @see net.sf.flatpack.DataSet#next()
*/
public boolean next() {
if (pointer < rows.size() && pointer + 1 != rows.size()) {
@@ -346,7 +357,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#orderRows(net.sf.flatpack.ordering.OrderBy)
+ * @see net.sf.flatpack.DataSet#orderRows(net.sf.flatpack.ordering.OrderBy)
*/
public void orderRows(final OrderBy ob) {
// PZ try to handle other <records> by sending them to
@@ -369,7 +380,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#previous()
+ * @see net.sf.flatpack.DataSet#previous()
*/
public boolean previous() {
if (pointer <= 0) {
@@ -442,7 +453,7 @@
/*
* (non-Javadoc)
*
- * @see net.sf.flatpack.IDataSet#remove()
+ * @see net.sf.flatpack.DataSet#remove()
*/
public void remove() {
rows.remove(pointer);
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/Version.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2010-03-01 21:02:52 UTC (rev 413)
@@ -19,5 +19,5 @@
* Static class which stores the version of this FlatPack
*/
public class Version {
- public static final String VERSION = "3.2.0-SNAPSHOT";
+ public static final String VERSION = "3.2.0";
}
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/src/site/changes.xml 2010-03-01 21:02:52 UTC (rev 413)
@@ -7,7 +7,8 @@
<title>Changes</title>
</properties>
<body>
- <release version="3.2.0-SNAPSHOT" date="2007-11-17" description="New parse options">
+ <release version="3.2.0" date="2010-03-03" description="New parse options">
+ <action dev="benoitx" type="add">Added a getBigDecimal method on DataSet.</action>
<action dev="zepernick" type="fix">Fixed SF Bug 1869636. The parameters for the XML Map and
data file were reversed in the BuffReaderDelimParser.</action>
<action dev="zepernick" type="change">Added optional 3rd parameter to the OrderColumn constructor which
Modified: trunk/src/site/navigation.xml
===================================================================
--- trunk/src/site/navigation.xml 2010-03-01 20:17:58 UTC (rev 412)
+++ trunk/src/site/navigation.xml 2010-03-01 21:02:52 UTC (rev 413)
@@ -31,7 +31,7 @@
</menu>
<footer>
<div style="vertical-align:middle">
- <p style="margin-top:10px; margin-bottom:0; padding-bottom:0; text-align:center; line-height:0"><a href="http://sourceforge.net/projects/flatpack"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=127761&type=13" width="120" height="30" border="0" alt="Get FlatPack Java API For Flat Files at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
+ <p style="margin-top:10px; margin-bottom:0; padding-bottom:0; text-align:center; line-height:0"><a href="http://sourceforge.net/projects/flatpack"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=127761&type=13" width="120" height="30" border="0" alt="Get FlatPack Java API For Flat Files at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>
<a href="http://digg.com/submit?phase=2&url=flatpack.sourceforge.net&title=Paul%20Zepernick%20and%20ObjectLab%20have%20released%20version%202%2E3%2E0%20of%20FlatPack%2E&bodytext=FlatPack%20on%20SourceForge%3A%20a%20Java%20(1%2E4%2B)%20flat%20file%20parser%20that%20handles%20CSV,%20fixed%20length%20and%20custom%20delimiters%2E%20The%20formats%20are%20configured%20in%20XML%20or%20in%20DB%2E%20Once%20parsed%20the%20data%20is%20easily%20accessible%20record%20by%20record%20and%20via%20a%20column%20name,%20regardless%20of%20order%2E%20%20It%20is%20fast%20and%20released%20under%20Apache%20license%202%2E0%2E&topic=programming">
<img src="http://digg.com/img/badges/91x17-digg-button.png" width="91" height="17" alt="Digg!" style="vertical-align:middle" /></a>
<a href="http://feeds.feedburner.com/~r/ObjectlabOpenSourceNews/~6/1"><img src="http://feeds.feedburner.com/ObjectlabOpenSourceNews.1.gif" alt="ObjectLab Open Source News" style="border:0"/></a></p><p style="margin-top:5px; padding-top:0; font-size:x-small; text-align:center"></p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-09 20:17:33
|
Revision: 414
http://flatpack.svn.sourceforge.net/flatpack/?rev=414&view=rev
Author: benoitx
Date: 2010-03-09 20:17:26 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
last few items for release.
Modified Paths:
--------------
trunk/flatpack/qalab.xml
trunk/flatpack/src/site/navigation.xml
trunk/flatpack-samples/qalab.xml
trunk/flatpack-samples/src/site/navigation.xml
trunk/project.properties
trunk/src/site/index.xml
Modified: trunk/flatpack/qalab.xml
===================================================================
--- trunk/flatpack/qalab.xml 2010-03-01 21:02:52 UTC (rev 413)
+++ trunk/flatpack/qalab.xml 2010-03-09 20:17:26 UTC (rev 414)
@@ -325,6 +325,34 @@
project="default" statvalue="31" type="cobertura-line"/>
<summaryresult date="2007-11-06" filecount="45" module="default"
project="default" statvalue="23" type="cobertura-branch"/>
+ <summaryresult date="2010-03-01" filecount="55" module="default"
+ project="default" statvalue="23" type="checkstyle"/>
+ <summaryresult date="2010-03-01" filecount="3" module="default"
+ project="default" statvalue="5" type="findbugs"/>
+ <summaryresult date="2010-03-01" filecount="6" module="default"
+ project="default" statvalue="130" type="simian"/>
+ <summaryresult date="2010-03-01" filecount="47" module="default"
+ project="default" statvalue="48" type="cobertura-line"/>
+ <summaryresult date="2010-03-01" filecount="47" module="default"
+ project="default" statvalue="44" type="cobertura-branch"/>
+ <summaryresult date="2010-03-01" filecount="2" module="default"
+ project="default" statvalue="2" type="pmd"/>
+ <summaryresult date="2010-03-02" filecount="55" module="default"
+ project="default" statvalue="23" type="checkstyle"/>
+ <summaryresult date="2010-03-02" filecount="2" module="default"
+ project="default" statvalue="4" type="findbugs"/>
+ <summaryresult date="2010-03-02" filecount="6" module="default"
+ project="default" statvalue="130" type="simian"/>
+ <summaryresult date="2010-03-02" filecount="2" module="default"
+ project="default" statvalue="2" type="pmd"/>
+ <summaryresult date="2010-03-03" filecount="55" module="default"
+ project="default" statvalue="23" type="checkstyle"/>
+ <summaryresult date="2010-03-03" filecount="2" module="default"
+ project="default" statvalue="4" type="findbugs"/>
+ <summaryresult date="2010-03-03" filecount="6" module="default"
+ project="default" statvalue="130" type="simian"/>
+ <summaryresult date="2010-03-03" filecount="2" module="default"
+ project="default" statvalue="2" type="pmd"/>
</summary>
<file id="default-default-com_pz_reader_ordering_package.html"
module="default" path="com/pz/reader/ordering/package.html" project="default">
@@ -665,6 +693,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="43" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" 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">
@@ -740,6 +772,18 @@
<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"/>
+ <result date="2010-03-01" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-01" statvalue="1" type="pmd"/>
+ <result date="2010-03-02" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="1" type="pmd"/>
+ <result date="2010-03-03" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="1" type="pmd"/>
</file>
<file id="default-default-net_sf_flatpack_LargeDataSet.java"
module="default" path="net/sf/flatpack/LargeDataSet.java" project="default">
@@ -766,6 +810,14 @@
<result date="2006-11-22" statvalue="2" type="findbugs"/>
<result date="2006-12-15" statvalue="1" type="checkstyle"/>
<result date="2006-12-15" statvalue="2" type="findbugs"/>
+ <result date="2010-03-01" statvalue="4" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="3" type="findbugs"/>
+ <result date="2010-03-01" statvalue="91" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="50" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="4" type="checkstyle"/>
+ <result date="2010-03-02" statvalue="3" type="findbugs"/>
+ <result date="2010-03-03" statvalue="4" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="3" type="findbugs"/>
</file>
<file id="default-default-net_sf_flatpack_util_ParserUtils.java"
module="default" path="net/sf/flatpack/util/ParserUtils.java" project="default">
@@ -852,6 +904,12 @@
<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"/>
+ <result date="2010-03-01" statvalue="7" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="1" type="findbugs"/>
+ <result date="2010-03-01" statvalue="47" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="52" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="7" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="7" type="checkstyle"/>
</file>
<file id="default-default-net_sf_flatpack_xml_PZMapParser.java"
module="default" path="net/sf/flatpack/xml/PZMapParser.java" project="default">
@@ -898,6 +956,8 @@
<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"/>
+ <result date="2010-03-01" statvalue="71" type="cobertura-line"/>
+ <result date="2010-03-01" 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">
@@ -932,6 +992,7 @@
<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"/>
+ <result date="2010-03-01" statvalue="62" type="cobertura-line"/>
</file>
<file
id="default-default-net_sf_flatpack_structure_ColumnMetaData.java"
@@ -983,6 +1044,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="54" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" 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">
@@ -1009,6 +1074,9 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file id="default-default-net_sf_flatpack_xml_XMLRecordElement.java"
module="default"
@@ -1025,6 +1093,7 @@
<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"/>
+ <result date="2010-03-01" 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">
@@ -1149,6 +1218,9 @@
<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"/>
+ <result date="2010-03-01" statvalue="2" type="checkstyle"/>
+ <result date="2010-03-02" statvalue="2" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="2" type="checkstyle"/>
</file>
<file
id="default-default-net_sf_flatpack_util_FixedWidthParserUtils.java"
@@ -1185,6 +1257,8 @@
<result date="2007-08-21" statvalue="9" type="cobertura-branch"/>
<result date="2007-08-30" statvalue="20" type="cobertura-line"/>
<result date="2007-08-30" statvalue="9" type="cobertura-branch"/>
+ <result date="2010-03-01" statvalue="21" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="9" type="cobertura-branch"/>
</file>
<file id="default-default-net_sf_flatpack_util_RegExParser.java"
module="default" path="net/sf/flatpack/util/RegExParser.java" project="default">
@@ -1278,6 +1352,14 @@
<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"/>
+ <result date="2010-03-01" statvalue="1" type="findbugs"/>
+ <result date="2010-03-01" statvalue="40" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="29" type="cobertura-branch"/>
+ <result date="2010-03-01" statvalue="1" type="pmd"/>
+ <result date="2010-03-02" statvalue="1" type="findbugs"/>
+ <result date="2010-03-02" statvalue="1" type="pmd"/>
+ <result date="2010-03-03" statvalue="1" type="findbugs"/>
+ <result date="2010-03-03" statvalue="1" type="pmd"/>
</file>
<file
id="default-default-net_sf_flatpack_DefaultPZParserFactory.java"
@@ -1367,6 +1449,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="25" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" 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">
@@ -1424,6 +1510,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_converter_PZConvertException.java"
@@ -1497,6 +1587,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_converter_ConvertInteger.java"
@@ -1530,6 +1624,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_brparse_BuffReaderPZParseFactory.java"
@@ -1609,6 +1707,11 @@
<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"/>
+ <result date="2010-03-01" statvalue="3" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="66" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="52" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="3" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="3" type="checkstyle"/>
</file>
<file id="default-default-net_sf_flatpack_util_FPStringUtils.java"
module="default" path="net/sf/flatpack/util/FPStringUtils.java" project="default">
@@ -1630,6 +1733,8 @@
<result date="2007-09-04" statvalue="2" type="checkstyle"/>
<result date="2007-09-05" statvalue="1" type="checkstyle"/>
<result date="2007-09-09" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="30" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="20" type="cobertura-branch"/>
</file>
<file id="default-default-net_sf_flatpack_xml_MetaData.java"
module="default" path="net/sf/flatpack/xml/MetaData.java" project="default">
@@ -1659,6 +1764,8 @@
<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"/>
+ <result date="2010-03-01" statvalue="51" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="37" type="cobertura-branch"/>
</file>
<file id="default-default-net_sf_flatpack_AbstractParser.java"
module="default" path="net/sf/flatpack/AbstractParser.java" project="default">
@@ -1684,6 +1791,8 @@
<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"/>
+ <result date="2010-03-01" statvalue="81" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="71" type="cobertura-branch"/>
</file>
<file id="default-default-net_sf_flatpack_DefaultParserFactory.java"
module="default"
@@ -1710,6 +1819,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="29" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" 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">
@@ -1735,6 +1848,8 @@
<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"/>
+ <result date="2010-03-01" statvalue="50" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="71" type="cobertura-branch"/>
</file>
<file id="default-default-net_sf_flatpack_Parser.java"
module="default" path="net/sf/flatpack/Parser.java" project="default">
@@ -1760,6 +1875,12 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-03" 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">
@@ -1787,6 +1908,12 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-03" 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">
@@ -1812,6 +1939,12 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_brparse_BuffReaderParseFactory.java"
@@ -1828,6 +1961,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="29" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_converter_FPConvertException.java"
@@ -1844,6 +1981,9 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" 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">
@@ -1858,6 +1998,9 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-C:_project_flatpack_flatpack_src_test_java_net_sf_flatpack_columninfile_DelimitedColumnNamesInFileTest.java"
@@ -1892,6 +2035,8 @@
<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"/>
+ <result date="2010-03-01" statvalue="84" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="83" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_writer_AbstractWriterFactory.java"
@@ -1910,6 +2055,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_writer_DelimiterWriter.java"
@@ -1928,6 +2077,8 @@
<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"/>
+ <result date="2010-03-01" statvalue="88" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="90" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_writer_DelimiterWriterFactory.java"
@@ -1946,6 +2097,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="75" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_writer_FixedLengthWriter.java"
@@ -1964,6 +2119,8 @@
<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"/>
+ <result date="2010-03-01" statvalue="93" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="94" type="cobertura-branch"/>
</file>
<file
id="default-default-net_sf_flatpack_writer_FixedWriterFactory.java"
@@ -1982,6 +2139,10 @@
<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"/>
+ <result date="2010-03-01" statvalue="66" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" 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">
@@ -2003,6 +2164,15 @@
<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"/>
+ <result date="2010-03-01" statvalue="2" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="2" type="checkstyle"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="2" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
</file>
<file id="default-default-net_sf_flatpack_writer_WriterFactory.java"
module="default"
@@ -2020,6 +2190,12 @@
<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"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-line"/>
+ <result date="2010-03-03" 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">
@@ -2035,5 +2211,64 @@
<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"/>
+ <result date="2010-03-01" statvalue="56" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="39" type="cobertura-branch"/>
</file>
+ <file
+ id="default-default-net_sf_flatpack_AbstractFixedLengthParser.java"
+ module="default"
+ path="net/sf/flatpack/AbstractFixedLengthParser.java" project="default">
+ <result date="2010-03-01" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-02" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="1" type="checkstyle"/>
+ </file>
+ <file
+ id="default-default-net_sf_flatpack_brparse_BuffReaderDataSet.java"
+ module="default"
+ path="net/sf/flatpack/brparse/BuffReaderDataSet.java" project="default">
+ <result date="2010-03-01" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="43" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="50" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="1" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="1" type="checkstyle"/>
+ </file>
+ <file
+ id="default-default-net_sf_flatpack_brparse_BuffReaderDelimParser.java"
+ module="default"
+ path="net/sf/flatpack/brparse/BuffReaderDelimParser.java" project="default">
+ <result date="2010-03-01" statvalue="2" type="checkstyle"/>
+ <result date="2010-03-01" statvalue="62" type="cobertura-line"/>
+ <result date="2010-03-01" statvalue="64" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="2" type="checkstyle"/>
+ <result date="2010-03-03" statvalue="2" type="checkstyle"/>
+ </file>
+ <file id="default-default-net_sf_flatpack_util_FPException.java"
+ module="default" path="net/sf/flatpack/util/FPException.java" project="default">
+ <result date="2010-03-01" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-02" statvalue="100" type="cobertura-branch"/>
+ <result date="2010-03-03" statvalue="100" type="cobertura-branch"/>
+ </file>
+ <file
+ id="default-default-net_sf_flatpack_util_F...
[truncated message content] |
|
From: <be...@us...> - 2010-03-15 20:30:23
|
Revision: 417
http://flatpack.svn.sourceforge.net/flatpack/?rev=417&view=rev
Author: benoitx
Date: 2010-03-15 20:30:16 +0000 (Mon, 15 Mar 2010)
Log Message:
-----------
maven 2 build.
Added Paths:
-----------
trunk/flatpack/pom.xml
trunk/flatpack-samples/pom.xml
trunk/pom.xml
Added: trunk/flatpack/pom.xml
===================================================================
--- trunk/flatpack/pom.xml (rev 0)
+++ trunk/flatpack/pom.xml 2010-03-15 20:30:16 UTC (rev 417)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.flatpack</groupId>
+ <artifactId>flatpack-parent</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>flatpack</artifactId>
+ <name>FlatPack</name>
+ <packaging>bundle</packaging> <!-- (1) OSGi -->
+
+ <description>Simple Java delimited and fixed width file parser. Handles CSV, Excel CSV, Tab, Pipe delimiters, just to name a few.
+ Maps column positions in the file to user friendly names via XML. See FlatPack Feature List under News for complete feature list.</description>
+ <!--
+ <scm> <connection>scm:svn:https://flatpack.svn.sourceforge.net/svnroot/flatpack/trunk/flatpack</connection>
+ <developerConnection>scm:svn:https://flatpack.svn.sourceforge.net/svnroot/flatpack/trunk/flatpack</developerConnection> </scm>
+ -->
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.dtd</include>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*.xml</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.sf.flatpack.*;version="${pom.version}"</Export-Package>
+ <Private-Package/>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>"-breakiterator"</additionalparam>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-ea</argLine>
+ <printSummary>false</printSummary>
+ <reportFormat>plain</reportFormat>
+ <testFailureIgnore>true</testFailureIgnore>
+ <useFile>false</useFile>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test?.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.1.0-RC1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.1.0-RC1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplate>http://sourceforge.net/support/tracker.php?aid=%ISSUE%</issueLinkTemplate>
+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+ </configuration>
+ </plugin>
+ <!--
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>${basedir}/../common-build/objectlab_checks.xml</configLocation>
+ <headerLocation>${basedir}/../checkstyle-license.txt</headerLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.4</targetJdk>
+ </configuration>
+ </plugin>
+ -->
+ </plugins>
+ </reporting>
+</project>
Added: trunk/flatpack-samples/pom.xml
===================================================================
--- trunk/flatpack-samples/pom.xml (rev 0)
+++ trunk/flatpack-samples/pom.xml 2010-03-15 20:30:16 UTC (rev 417)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>net.sf.flatpack</groupId>
+ <artifactId>flatpack-parent</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+
+
+ <artifactId>flatpack-examples</artifactId>
+ <name>FlatPack Examples</name>
+ <packaging>bundle</packaging> <!-- (1) OSGi -->
+
+ <description>Simple Java delimited and fixed width file parser. Handles CSV, Excel CSV, Tab, Pipe delimiters, just to name a few.
+ Maps column positions in the file to user friendly names via XML. See FlatPack Feature List under News for complete feature list.</description>
+ <scm>
+ <connection>scm:svn:https://flatpack.svn.sourceforge.net/svnroot/flatpack/trunk/flatpack-samples</connection>
+ <developerConnection>scm:svn:https://flatpack.svn.sourceforge.net/svnroot/flatpack/trunk/flatpack-samples</developerConnection>
+ </scm>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.txt</include>
+ <include>**/*.xml</include>
+ <include>**/*.csv</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/../common-build/lib</directory>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${basedir}/common-build/lib</directory>
+ <includes>
+ <include>**/*.jar</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>net.sf.flatpack.*;version="${pom.version}"</Export-Package>
+ <Private-Package/>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${pom.version}</Bundle-Version>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.4</Bundle-RequiredExecutionEnvironment>
+ </instructions>
+ </configuration>
+ </plugin><!--
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <showDeprecation>true</showDeprecation>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ --><plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>"-breakiterator"</additionalparam>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-ea</argLine>
+ <printSummary>false</printSummary>
+ <reportFormat>plain</reportFormat>
+ <testFailureIgnore>true</testFailureIgnore>
+ <useFile>false</useFile>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*NOTest.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>net.sf.flatpack</groupId>
+ <artifactId>flatpack</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>jdom</groupId>
+ <artifactId>jdom</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jexcelapi</groupId>
+ <artifactId>jxl</artifactId>
+ <version>2.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.1.0-RC1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.1.0-RC1</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplate>http://sourceforge.net/support/tracker.php?aid=%ISSUE%</issueLinkTemplate>
+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>${basedir}/../common-build/objectlab_checks.xml</configLocation>
+ <headerLocation>${basedir}/../checkstyle-license.txt</headerLocation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <configuration>
+ <targetJdk>1.4</targetJdk>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
Added: trunk/pom.xml
===================================================================
--- trunk/pom.xml (rev 0)
+++ trunk/pom.xml 2010-03-15 20:30:16 UTC (rev 417)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>net.sf.flatpack</groupId>
+ <artifactId>flatpack-parent</artifactId>
+ <name>FlatPack</name>
+ <version>3.3.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <description>Simple Java delimited and fixed width file parser. Handles CSV, Excel CSV, Tab, Pipe delimiters.
+ Bind delimited or fixed width text to column names via XML mappings. Support for header and trailer records. Optionally, column names can be retrieved from the first record of a delimited file.</description>
+
+
+ <modules>
+ <module>flatpack</module>
+ <module>flatpack-samples</module>
+ </modules>
+
+ <inceptionYear>2006</inceptionYear>
+ <url>http://flatpack.sourceforge.net/</url>
+
+ <organization>
+ <name>Appendium - Portfolio Financing Platform</name>
+ <url>http://www.appendium.com/</url>
+ </organization>
+
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <developers>
+ <developer>
+ <name>Paul Zepernick</name>
+ <id>zepernick</id>
+ <email>zepernick at users.sourceforge.net</email>
+ <organization>Paul Zepernick</organization>
+ <url>http://www.mysite.com</url>
+ <timezone>0</timezone>
+ <roles>
+ <role>Founder</role>
+ <role>Java Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Benoit Xhenseval</name>
+ <id>benoitx</id>
+ <email>kit AT objectlab DOT co dOt uk</email>
+ <organization>ObjectLab Financial Ltd</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ <url>http://www.xhenseval.com</url>
+ <timezone>+0</timezone>
+ </developer>
+ <developer>
+ <name>Marcin Jekot</name>
+ <id>marchy</id>
+ <email>marcin at jekot DOt net</email>
+ <organization>ObjectLab Financial Ltd</organization>
+ <roles>
+ <role>Subversion mig</role>
+ </roles>
+ <timezone>+0</timezone>
+ </developer>
+ </developers>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>code-sign</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>sign-artifacts</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <!--
+
+
+ <build> <plugins> <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> <manifest> <addClasspath>true</addClasspath> </manifest> </archive>
+ </configuration> </plugin> </plugins> </build>
+ -->
+
+ <scm>
+ <connection>scm:svn:https://flatpack.svn.sourceforge.net/svnroot/flatpack/trunk/</connection>
+ <developerConnection>scm:svn:https://flatpack.svn.sourceforge.net/svnroot/flatpack/trunk/</developerConnection>
+ <url>http://flatpack.svn.sourceforge.net/viewvc/flatpack/</url>
+ </scm>
+ <!--
+
+ <reporting> <plugins> <plugin> <artifactId>maven-changelog-plugin</artifactId> </plugin> <plugin> <artifactId>maven-changes-plugin</artifactId> <configuration>
+ <xmlPath>${basedir}/xdocs/changes.xml</xmlPath> </configuration> </plugin> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> <configuration>
+ <configLocation>${basedir}/../checkstyle_checks.xml</configLocation> <headerLocation>${basedir}/../checkstyle-license.txt</headerLocation> </configuration>
+ </plugin> <plugin> <artifactId>maven-dashboard-plugin</artifactId> </plugin> </plugins> </reporting>
+ -->
+
+ <reporting>
+ <plugins>
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration>
+ <configLocation>/common_build/checkstyle_checks.xml</configLocation> </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jxr-maven-plugin</artifactId> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId>
+ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> </plugin> <plugin> <artifactId>maven-clover-plugin</artifactId> </plugin> <plugin>
+ <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> </plugin> <plugin> <artifactId>maven-pmd-plugin</artifactId>
+ <configuration> <targetJdk>1.5</targetJdk> <rulesets> <ruleset>/rulesets/basic.xml</ruleset> <ruleset>/rulesets/controversial.xml</ruleset> </rulesets>
+ <linkXref>true</linkXref> <minimumTokens>100</minimumTokens> </configuration> </plugin>
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <code>javadoc:aggregate</code>
+ <source>1.5</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changes-plugin</artifactId>
+ <configuration>
+ <issueLinkTemplatePerSystem>
+ <default>%URL%/?func=detail&group_id=175139&%ISSUE%</default>
+ </issueLinkTemplatePerSystem>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>net.sf</groupId>
+ <artifactId>stat-scm</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2010-03-23 21:33:54
|
Revision: 418
http://flatpack.svn.sourceforge.net/flatpack/?rev=418&view=rev
Author: benoitx
Date: 2010-03-23 21:33:47 +0000 (Tue, 23 Mar 2010)
Log Message:
-----------
Fixing a lot of Sonar issues. (the easy ones!)
Modified Paths:
--------------
trunk/flatpack/pom.xml
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java
trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java
trunk/flatpack/src/main/java/net/sf/flatpack/Version.java
trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java
trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java
trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java
trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/AbstractWriter.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriter.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/DelimiterWriterFactory.java
trunk/flatpack/src/main/java/net/sf/flatpack/writer/FixedLengthWriter.java
trunk/flatpack/src/main/java/net/sf/flatpack/xml/MapParser.java
trunk/flatpack/src/main/java/net/sf/flatpack/xml/XMLRecordElement.java
trunk/src/site/changes.xml
Modified: trunk/flatpack/pom.xml
===================================================================
--- trunk/flatpack/pom.xml 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/pom.xml 2010-03-23 21:33:47 UTC (rev 418)
@@ -93,7 +93,7 @@
<exclude>**/Abstract*.java</exclude>
</excludes>
<includes>
- <include>**/*Test?.java</include>
+ <include>**/*Test.java</include>
</includes>
</configuration>
</plugin>
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractDelimiterParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -51,14 +51,11 @@
*/
public abstract class AbstractDelimiterParser extends AbstractParser {
private char delimiter = 0;
-
private char qualifier = 0;
-
private boolean ignoreFirstRecord = false;
-
private int lineCount = 0;
- private final Logger logger = LoggerFactory.getLogger(AbstractDelimiterParser.class);
+ private final static Logger LOGGER = LoggerFactory.getLogger(AbstractDelimiterParser.class);
public AbstractDelimiterParser(final Reader dataSourceReader, final String dataDefinition, final char delimiter, final char qualifier,
final boolean ignoreFirstRecord) {
@@ -80,7 +77,7 @@
lineCount = 0;
return doDelimitedFile(getDataSourceReader(), shouldCreateMDFromFile());
} catch (final IOException e) {
- logger.error("error accessing/creating inputstream", e);
+ LOGGER.error("error accessing/creating inputstream", e);
}
return null;
}
@@ -124,7 +121,7 @@
*/
private DataSet doDelimitedFile(final Reader dataSource, final boolean createMDFromFile) throws IOException {
if (dataSource == null) {
- throw new NullPointerException("dataSource is null");
+ throw new IllegalArgumentException("dataSource is null");
}
BufferedReader br = null;
final DefaultDataSet ds = new DefaultDataSet(getPzMetaData(), this);
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractFixedLengthParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -51,7 +51,7 @@
*
*/
public abstract class AbstractFixedLengthParser extends AbstractParser {
- private final Logger logger = LoggerFactory.getLogger(AbstractFixedLengthParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(AbstractFixedLengthParser.class);
protected AbstractFixedLengthParser(final Reader dataSourceReader, final String dataDefinition) {
super(dataSourceReader, dataDefinition);
@@ -65,7 +65,7 @@
try {
return doFixedLengthFile(getDataSourceReader());
} catch (final IOException e) {
- logger.error("error accessing/reading data", e);
+ LOGGER.error("error accessing/reading data", e);
}
return null;
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/AbstractParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -71,17 +71,16 @@
private List readersToClose = null;
private boolean flagEmptyRows;
-
+
private boolean storeRawDataToDataError;
-
+
private boolean storeRawDataToDataSet;
protected AbstractParser(final Reader dataSourceReader) {
this.dataSourceReader = dataSourceReader;
}
- protected AbstractParser(final Reader dataSourceReader,
- final String dataDefinition) {
+ protected AbstractParser(final Reader dataSourceReader, final String dataDefinition) {
this.dataSourceReader = dataSourceReader;
this.dataDefinition = dataDefinition;
}
@@ -123,9 +122,9 @@
protected abstract void init();
- /**
- * @deprecated
- */
+ // /**
+ // * @deprecated
+ // */
// protected void setColumnMD(final Map map) {
// columnMD = map;
// }
@@ -156,12 +155,10 @@
protected void addToMetaData(final List columns) {
if (pzMetaData == null) {
- pzMetaData = new MetaData(columns, ParserUtils.buidColumnIndexMap(
- columns, this));
+ pzMetaData = new MetaData(columns, ParserUtils.buidColumnIndexMap(columns, this));
} else {
pzMetaData.setColumnsNames(columns);
- pzMetaData.setColumnIndexMap(ParserUtils.buidColumnIndexMap(
- columns, this));
+ pzMetaData.setColumnIndexMap(ParserUtils.buidColumnIndexMap(columns, this));
}
}
@@ -192,11 +189,10 @@
* @param errorLevel
* errorLevel 1,2,3 1=warning 2=error 3= severe error
*/
- protected void addError(final DefaultDataSet ds, final String errorDesc,
- final int lineNo, final int errorLevel) {
+ protected void addError(final DefaultDataSet ds, final String errorDesc, final int lineNo, final int errorLevel) {
addError(ds, errorDesc, lineNo, errorLevel, null);
}
-
+
/**
* Adds a new error to this DataSet. These can be collected, and retrieved
* after processing
@@ -210,8 +206,7 @@
* @param lineData
* Data of the line which failed the parse
*/
- protected void addError(final DefaultDataSet ds, final String errorDesc,
- final int lineNo, final int errorLevel, final String lineData) {
+ protected void addError(final DefaultDataSet ds, final String errorDesc, final int lineNo, final int errorLevel, final String lineData) {
if (errorLevel == 1 && isIgnoreParseWarnings()) {
// user has selected to not log warnings in the parser
return;
@@ -239,8 +234,7 @@
return columnNamesCaseSensitive;
}
- public void setColumnNamesCaseSensitive(
- final boolean columnNamesCaseSensitive) {
+ public void setColumnNamesCaseSensitive(final boolean columnNamesCaseSensitive) {
this.columnNamesCaseSensitive = columnNamesCaseSensitive;
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/DefaultDataSet.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -59,6 +59,8 @@
*
*/
public class DefaultDataSet implements DataSet {
+ private static final String NEW_LINE = System.getProperty("line.separator");
+
private final List rows = new ArrayList();
private final List errors = new ArrayList();
@@ -247,7 +249,7 @@
return Integer.parseInt(s);
}
-
+
public long getLong(final String column) {
final String s = getStringValue(column);
@@ -291,7 +293,7 @@
// return row.getValue(ParserUtils.findColumn(column,
// cmds)).toUpperCase(Locale.getDefault());
s = s.toUpperCase(Locale.getDefault());
- }else if (lowerCase) {
+ } else if (lowerCase) {
// convert data to lowercase before returning
// return row.getValue(ParserUtils.findColumn(column,
// cmds)).toLowerCase(Locale.getDefault());
@@ -367,7 +369,7 @@
// with <RECORD> mappings");
// }
if (ob != null && rows != null) {
- final List cmds = metaData.getColumnsNames();
+ // final List cmds = metaData.getColumnsNames();
// final List cmds = ParserUtils.getColumnMetaData(PZConstants.DETAIL_ID, columnMD);
//ob.setColumnMD(cmds);
ob.setMetaData(getMetaData());
@@ -495,11 +497,11 @@
public String toString() {
final StringBuffer buf = new StringBuffer();
- buf.append("Errors:").append(errors.size()).append(System.getProperty("line.separator"));
- buf.append("Rows:").append(rows.size()).append(System.getProperty("line.separator"));
- buf.append("Position:").append(pointer).append(System.getProperty("line.separator"));
- buf.append("Conversion Props:").append(pzConvertProps).append(System.getProperty("line.separator"));
- buf.append("MetaData:").append(metaData).append(System.getProperty("line.separator"));
+ buf.append("Errors:").append(errors.size()).append(NEW_LINE);
+ buf.append("Rows:").append(rows.size()).append(NEW_LINE);
+ buf.append("Position:").append(pointer).append(NEW_LINE);
+ buf.append("Conversion Props:").append(pzConvertProps).append(NEW_LINE);
+ buf.append("MetaData:").append(metaData).append(NEW_LINE);
return buf.toString();
}
@@ -519,7 +521,7 @@
return false;
}
-
+
/**
* @throws FPInvalidUsageException Parser.isFlagEmptyRows() must be set to true before using this
* @throws FPException if cursor is on an invalid row
@@ -530,12 +532,12 @@
//throw an exception
throw new FPInvalidUsageException("Parser.isFlagEmptyRows(true) must be set before using isRowEmpty()");
}
-
+
if (pointer < 0) {
throw new FPException("Cursor on invalid row.. Make sure next() is called and returns true");
}
-
- return ((Row)rows.get(pointer)).isEmpty();
+
+ return ((Row) rows.get(pointer)).isEmpty();
}
/**
@@ -548,11 +550,11 @@
//throw an exception
throw new FPInvalidUsageException("Parser.isStoreRawDataToDataSet(true) must be set before using getRawData()");
}
-
+
if (pointer < 0) {
throw new FPException("Cursor on invalid row.. Make sure next() is called and returns true");
}
-
- return ((Row)rows.get(pointer)).getRawData();
+
+ return ((Row) rows.get(pointer)).getRawData();
}
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/InitialisationException.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -43,6 +43,7 @@
*
*/
public InitialisationException() {
+ super();
}
/**
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/Version.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/Version.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -18,6 +18,7 @@
*
* Static class which stores the version of this FlatPack
*/
-public class Version {
- public static final String VERSION = "3.2.0";
+public final class Version {
+ public static final String VERSION = "3.3.0";
+ private Version() {}
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderDelimParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -54,7 +54,7 @@
private boolean processedFirst = false;
- private final Logger logger = LoggerFactory.getLogger(BuffReaderDelimParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BuffReaderDelimParser.class);
public BuffReaderDelimParser(final File pzmapXML, final File dataSource, final char delimiter, final char qualifier,
final boolean ignoreFirstRecord) {
@@ -95,7 +95,7 @@
return ds;
} catch (final IOException ex) {
- logger.error("error accessing/creating inputstream", ex);
+ LOGGER.error("error accessing/creating inputstream", ex);
}
return null;
@@ -211,7 +211,7 @@
try {
close();
} catch (final IOException ex) {
- logger.warn("Problem trying to auto close file handles...", ex);
+ LOGGER.warn("Problem trying to auto close file handles...", ex);
} finally {
super.finalize();
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/brparse/BuffReaderFixedParser.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -58,7 +58,7 @@
private Map recordLengths = null;
- private final Logger logger = LoggerFactory.getLogger(BuffReaderFixedParser.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(BuffReaderFixedParser.class);
public BuffReaderFixedParser(final InputStream pzmapXMLStream, final InputStream dataSourceStream) {
super(pzmapXMLStream, dataSourceStream);
@@ -85,7 +85,7 @@
return ds;
} catch (final IOException ex) {
- logger.error("error accessing/creating inputstream", ex);
+ LOGGER.error("error accessing/creating inputstream", ex);
}
return null;
@@ -181,7 +181,7 @@
try {
close();
} catch (final IOException ex) {
- logger.warn("Problem trying to auto close file handles...", ex);
+ LOGGER.warn("Problem trying to auto close file handles...", ex);
} finally {
super.finalize();
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/converter/ConvertInteger.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -50,7 +50,7 @@
* @see net.sf.flatpack.converter#convertValue(java.lang.String)
*/
public Object convertValue(final String valueToConvert) {
- return new Integer(ParserUtils.stripNonLongChars(valueToConvert));
+ return Integer.valueOf(ParserUtils.stripNonLongChars(valueToConvert));
}
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/converter/FPConvertException.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -41,10 +41,8 @@
public class FPConvertException extends RuntimeException {
private static final long serialVersionUID = 1L;
- /**
- *
- */
public FPConvertException() {
+ super();
}
/**
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/ordering/OrderBy.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -62,9 +62,9 @@
/** collection of order elements to sort by */
private final List orderbys = new ArrayList();
-
+
private MetaData metaData;
-
+
private Parser parser;
/**
@@ -88,7 +88,6 @@
final Row row0 = (Row) arg0;
final Row row1 = (Row) arg1;
int result = 0;
-
for (int i = 0; i < orderbys.size(); i++) {
final OrderColumn oc = (OrderColumn) orderbys.get(i);
@@ -113,29 +112,30 @@
String str0 = row0.getValue(ParserUtils.getColumnIndex(row0.getMdkey(), metaData, oc.getColumnName(), parser)).toLowerCase(Locale.getDefault());
String str1 = row1.getValue(ParserUtils.getColumnIndex(row1.getMdkey(), metaData, oc.getColumnName(), parser)).toLowerCase(Locale.getDefault());
switch (oc.getSelectedColType()) {
- case OrderColumn.COLTYPE_STRING:
- comp0 = str0;
- comp1 = str1;
- break;
- case OrderColumn.COLTYPE_NUMERIC:
- comp0 = Double.valueOf(ParserUtils.stripNonDoubleChars(str0));
- comp1 = Double.valueOf(ParserUtils.stripNonDoubleChars(str1));
- break;
- case OrderColumn.COLTYPE_DATE:
- final SimpleDateFormat sdf = new SimpleDateFormat(oc.getDateFormatPattern());
- try {
- comp0 = sdf.parse(str0);
- } catch(ParseException e) {
- comp0 = getBadDateDefault();
-
- }
-
- try {
- comp1 = sdf.parse(str1);
- } catch(ParseException e) {
- comp1 = getBadDateDefault();
- }
- break;
+ case OrderColumn.COLTYPE_STRING:
+ default:
+ comp0 = str0;
+ comp1 = str1;
+ break;
+ case OrderColumn.COLTYPE_NUMERIC:
+ comp0 = Double.valueOf(ParserUtils.stripNonDoubleChars(str0));
+ comp1 = Double.valueOf(ParserUtils.stripNonDoubleChars(str1));
+ break;
+ case OrderColumn.COLTYPE_DATE:
+ final SimpleDateFormat sdf = new SimpleDateFormat(oc.getDateFormatPattern());
+ try {
+ comp0 = sdf.parse(str0);
+ } catch (ParseException e) {
+ comp0 = getBadDateDefault();
+
+ }
+
+ try {
+ comp1 = sdf.parse(str1);
+ } catch (ParseException e) {
+ comp1 = getBadDateDefault();
+ }
+ break;
}
// multiply by the sort indicator to get a ASC or DESC result
@@ -158,8 +158,6 @@
defaultBadDt.set(Calendar.DAY_OF_MONTH, 1);
return defaultBadDt.getTime();
}
-
-
/**
* @param metaData the metaData to set
@@ -168,7 +166,6 @@
this.metaData = metaData;
}
-
/**
* @param parser the parser to set
*/
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ExcelTransformer.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -38,13 +38,9 @@
* @author Paul Zepernick
*/
public class ExcelTransformer {
-
- private DataSet ds;
-
- private File xlsFile;
-
+ private final DataSet ds;
+ private final File xlsFile;
private String[] exportOnlyColumns;
-
private String[] excludeFromExportColumns;
/**
@@ -148,7 +144,11 @@
* @param excludeFromExportColumns the excludeFromExportColumns to set
*/
public void setExcludeFromExportColumns(final String[] excludeFromExportColumns) {
- this.excludeFromExportColumns = excludeFromExportColumns;
+ if (excludeFromExportColumns != null) {
+ this.excludeFromExportColumns = (String[]) excludeFromExportColumns.clone();
+ } else {
+ this.excludeFromExportColumns = null;
+ }
}
/**
@@ -158,7 +158,10 @@
* @param exportOnlyColumns the exportOnlyColumns to set
*/
public void setExportOnlyColumns(final String[] exportOnlyColumns) {
- this.exportOnlyColumns = exportOnlyColumns;
+ if (exportOnlyColumns != null) {
+ this.exportOnlyColumns = (String[]) exportOnlyColumns.clone();
+ } else {
+ this.exportOnlyColumns = null;
+ }
}
-
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/FPException.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -6,8 +6,30 @@
* @author Paul Zepernick
*/
public class FPException extends RuntimeException{
-
- public FPException(final String msg) {
- super(msg);
+ private static final long serialVersionUID = -4269317129024968528L;
+
+ public FPException() {
}
+
+ /**
+ * @param message
+ */
+ public FPException(String message) {
+ super(message);
+ }
+
+ /**
+ * @param cause
+ */
+ public FPException(Throwable cause) {
+ super(cause);
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public FPException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/FixedWidthParserUtils.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -35,7 +35,6 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
import net.sf.flatpack.structure.ColumnMetaData;
@@ -75,53 +74,53 @@
return splitResult;
}
- /**
- * Returns the key to the list of ColumnMetaData objects. Returns the
- * correct MetaData per the mapping file and the data contained on the line
- *
- *
- * @param columnMD
- * @param line
- * @return List - ColumMetaData
- * @deprecated use the PZMetaData
- */
- public static String getCMDKey(final Map columnMD, final String line) {
- if (columnMD.size() == 1) {
- // no <RECORD> elements were specified for this parse, just return the
- // detail id
- return FPConstants.DETAIL_ID;
- }
- final Iterator mapEntries = columnMD.entrySet().iterator();
- // loop through the XMLRecordElement objects and see if we need a
- // different MD object
- while (mapEntries.hasNext()) {
- final Entry entry = (Entry) mapEntries.next();
- if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
- continue; // skip this key will be assumed if none of the
- // others match
- }
- final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue();
+// /**
+// * Returns the key to the list of ColumnMetaData objects. Returns the
+// * correct MetaData per the mapping file and the data contained on the line
+// *
+// *
+// * @param columnMD
+// * @param line
+// * @return List - ColumMetaData
+// * @deprecated use the PZMetaData
+// */
+// public static String getCMDKey(final Map columnMD, final String line) {
+// if (columnMD.size() == 1) {
+// // no <RECORD> elements were specified for this parse, just return the
+// // detail id
+// return FPConstants.DETAIL_ID;
+// }
+// final Iterator mapEntries = columnMD.entrySet().iterator();
+// // loop through the XMLRecordElement objects and see if we need a
+// // different MD object
+// while (mapEntries.hasNext()) {
+// final Entry entry = (Entry) mapEntries.next();
+// if (entry.getKey().equals(FPConstants.DETAIL_ID) || entry.getKey().equals(FPConstants.COL_IDX)) {
+// continue; // skip this key will be assumed if none of the
+// // others match
+// }
+// final XMLRecordElement recordXMLElement = (XMLRecordElement) entry.getValue();
+//
+// if (recordXMLElement.getEndPositition() > line.length()) {
+// // make sure our substring is not going to fail
+// continue;
+// }
+// final int subfrm = recordXMLElement.getStartPosition() - 1; // convert
+// // to 0
+// // based
+// final int subto = recordXMLElement.getEndPositition();
+// if (line.substring(subfrm, subto).equals(recordXMLElement.getIndicator())) {
+// // we found the MD object we want to return
+// return (String) entry.getKey();
+// }
+//
+// }
+//
+// // must be a detail line
+// return FPConstants.DETAIL_ID;
+//
+// }
- if (recordXMLElement.getEndPositition() > line.length()) {
- // make sure our substring is not going to fail
- continue;
- }
- final int subfrm = recordXMLElement.getStartPosition() - 1; // convert
- // to 0
- // based
- final int subto = recordXMLElement.getEndPositition();
- if (line.substring(subfrm, subto).equals(recordXMLElement.getIndicator())) {
- // we found the MD object we want to return
- return (String) entry.getKey();
- }
-
- }
-
- // must be a detail line
- return FPConstants.DETAIL_ID;
-
- }
-
/**
* Returns the key to the list of ColumnMetaData objects. Returns the
* correct MetaData per the mapping file and the data contained on the line
Modified: trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java
===================================================================
--- trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2010-03-15 20:30:16 UTC (rev 417)
+++ trunk/flatpack/src/main/java/net/sf/flatpack/util/ParserUtils.java 2010-03-23 21:33:47 UTC (rev 418)
@@ -49,7 +49,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -59,8 +58,8 @@
import java.util.Map.Entry;
import net.sf.flatpack.Parser;
-import net.sf.flatpack.converter.FPConvertException;
import net.sf.flatpack.converter.Converter;
+import net.sf.flatpack.converter.FPConvertException;
import net.sf.flatpack.structure.ColumnMetaData;
import net.sf.flatpack.xml.MetaData;
import net.sf.flatpack.xml.XMLRecordElement;
@@ -131,7 +130,7 @@
int endBlock = 0;
boolean blockWasInQualifier = false;
- final String doubleQualifier = String.valueOf(qualifier) + String.valueOf(qualifier);
+ final String doubleQualifier = "" + qualifier + qualifier;
for (int i = 0; i < size; i++) {
final char currentChar = trimmedLine.charAt(i);
@@ -267,7 +266,6 @@
return trimmed;
}
-
/**
* Removes empty space from the beginning of a string, except for tabs
@@ -294,7 +292,7 @@
return trimmed;
}
-
+
/**
* Removes empty space from the end of a string
*
@@ -314,7 +312,7 @@
}
if (offset < value.length() - 1) {
- trimmed = value.substrin...
[truncated message content] |
|
From: <be...@us...> - 2012-04-13 13:48:44
|
Revision: 437
http://flatpack.svn.sourceforge.net/flatpack/?rev=437&view=rev
Author: benoitx
Date: 2012-04-13 13:48:38 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
BAD PRACTICE.. the dependencies to slf4j should not be compile but provided.
Modified Paths:
--------------
trunk/flatpack/pom.xml
trunk/flatpack-samples/pom.xml
trunk/pom.xml
Modified: trunk/flatpack/pom.xml
===================================================================
--- trunk/flatpack/pom.xml 2012-04-04 14:53:43 UTC (rev 436)
+++ trunk/flatpack/pom.xml 2012-04-13 13:48:38 UTC (rev 437)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sf.flatpack</groupId>
<artifactId>flatpack-parent</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.3-SNAPSHOT</version>
</parent>
@@ -104,21 +104,25 @@
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.4.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.1.0-RC1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.1.0-RC1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: trunk/flatpack-samples/pom.xml
===================================================================
--- trunk/flatpack-samples/pom.xml 2012-04-04 14:53:43 UTC (rev 436)
+++ trunk/flatpack-samples/pom.xml 2012-04-13 13:48:38 UTC (rev 437)
@@ -5,7 +5,7 @@
<parent>
<groupId>net.sf.flatpack</groupId>
<artifactId>flatpack-parent</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.3-SNAPSHOT</version>
</parent>
@@ -102,21 +102,25 @@
<groupId>jdom</groupId>
<artifactId>jdom</artifactId>
<version>1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>jexcelapi</groupId>
<artifactId>jxl</artifactId>
<version>2.4.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.1.0-RC1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.1.0-RC1</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2012-04-04 14:53:43 UTC (rev 436)
+++ trunk/pom.xml 2012-04-13 13:48:38 UTC (rev 437)
@@ -5,7 +5,7 @@
<groupId>net.sf.flatpack</groupId>
<artifactId>flatpack-parent</artifactId>
<name>FlatPack</name>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.3-SNAPSHOT</version>
<packaging>pom</packaging>
<description>Simple Java delimited and fixed width file parser. Handles CSV, Excel CSV, Tab, Pipe delimiters.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X