You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2014/08/16 13:22:37 UTC
svn commit: r1618332 - in /ofbiz/trunk:
applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
applications/party/src/org/ofbiz/party/party/PartyServices.java
framework/base/lib/commons/commons-csv-1.0.jar
Author: adrianc
Date: Sat Aug 16 11:22:36 2014
New Revision: 1618332
URL: http://svn.apache.org/r1618332
Log:
Updated Commons CSV library to the official release version (the previous version was a release candidate).
Modified:
ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
ofbiz/trunk/framework/base/lib/commons/commons-csv-1.0.jar
Modified: ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1618332&r1=1618331&r2=1618332&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original)
+++ ofbiz/trunk/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Sat Aug 16 11:22:36 2014
@@ -37,7 +37,6 @@ import javolution.util.FastMap;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVFormat.CSVFormatBuilder;
import org.apache.commons.csv.CSVRecord;
import org.ofbiz.accounting.payment.PaymentGatewayServices;
import org.ofbiz.accounting.payment.PaymentWorker;
@@ -3356,8 +3355,7 @@ public class InvoiceServices {
String encoding = System.getProperty("file.encoding");
String csvString = Charset.forName(encoding).decode(fileBytes).toString();
final BufferedReader csvReader = new BufferedReader(new StringReader(csvString));
- final CSVFormatBuilder builder = CSVFormat.newBuilder(',').withQuoteChar('"').withHeader();
- CSVFormat fmt = builder.build();
+ CSVFormat fmt = CSVFormat.DEFAULT.withHeader();
List<String> errMsgs = FastList.newInstance();
List<String> newErrMsgs = FastList.newInstance();
String lastInvoiceId = null;
Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=1618332&r1=1618331&r2=1618332&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/party/PartyServices.java Sat Aug 16 11:22:36 2014
@@ -34,7 +34,6 @@ import javolution.util.FastList;
import javolution.util.FastMap;
import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVFormat.CSVFormatBuilder;
import org.apache.commons.csv.CSVRecord;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.UtilDateTime;
@@ -1864,8 +1863,7 @@ public class PartyServices {
String encoding = System.getProperty("file.encoding");
String csvString = Charset.forName(encoding).decode(fileBytes).toString();
final BufferedReader csvReader = new BufferedReader(new StringReader(csvString));
- final CSVFormatBuilder builder = CSVFormat.newBuilder(',').withQuoteChar('"').withHeader();
- CSVFormat fmt = builder.build();
+ CSVFormat fmt = CSVFormat.DEFAULT.withHeader();
List<String> errMsgs = FastList.newInstance();
List<String> newErrMsgs = FastList.newInstance();
String lastPartyId = null; // last partyId read from the csv file
Modified: ofbiz/trunk/framework/base/lib/commons/commons-csv-1.0.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/commons/commons-csv-1.0.jar?rev=1618332&r1=1618331&r2=1618332&view=diff
==============================================================================
Binary files - no diff available.