Author: bpoussin Date: 2012-04-24 16:56:48 +0200 (Tue, 24 Apr 2012) New Revision: 139 Url: http://chorem.org/repositories/revision/chorem/139 Log: utilisation de opencsv 2.3 au lieu de 2.4-SNAPSHOT Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java trunk/pom.xml Modified: trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java =================================================================== --- trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-04-24 14:56:16 UTC (rev 138) +++ trunk/chorem-entities/src/main/java/org/chorem/ImportChoremTopia.java 2012-04-24 14:56:48 UTC (rev 139) @@ -129,7 +129,7 @@ FileReader in = new FileReader(filename); // separateur ';' String delimiter '"', skip first line (header) CSVReader reader = new CSVReader(in, ';', '"', 1); - for(String[] line : reader) { + for(String[] line : reader.readAll()) { String topiaId = line[COMPANY_HEADER.topiaid.ordinal()]; // Read company info @@ -204,7 +204,7 @@ FileReader in = new FileReader(filename); // separateur ';' String delimiter '"', skip first line (header) CSVReader reader = new CSVReader(in, ';', '"', 1); - for(String[] line : reader) { + for(String[] line : reader.readAll()) { String topiaId = line[COMPANY_HEADER.topiaid.ordinal()]; // Read company info @@ -273,7 +273,7 @@ FileReader in = new FileReader(filename); // separateur ';' String delimiter '"', skip first line (header) CSVReader reader = new CSVReader(in, ';', '"', 1); - for(String[] line : reader) { + for(String[] line : reader.readAll()) { String topiaId = line[CONTRACT_TYPE_HEADER.topiaid.ordinal()]; // Read company info @@ -299,7 +299,7 @@ FileReader in = new FileReader(filename); // separateur ';' String delimiter '"', skip first line (header) CSVReader reader = new CSVReader(in, ';', '"', 1); - for(String[] line : reader) { + for(String[] line : reader.readAll()) { String topiaId = line[EMPLOYEE_HEADER.topiaid.ordinal()]; // Read company info @@ -361,7 +361,7 @@ FileReader in = new FileReader(filename); // separateur ';' String delimiter '"', skip first line (header) CSVReader reader = new CSVReader(in, ';', '"', 1); - for(String[] line : reader) { + for(String[] line : reader.readAll()) { count++; String employeeId = line[CONTRACT_HEADER.employee.ordinal()]; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-24 14:56:16 UTC (rev 138) +++ trunk/pom.xml 2012-04-24 14:56:48 UTC (rev 139) @@ -56,7 +56,7 @@ <platform>chorem.org</platform> <projectId>chorem</projectId> - <opencsvVersion>2.4-SNAPSHOT</opencsvVersion> + <opencsvVersion>2.3</opencsvVersion> <processPluginVersion>1.1</processPluginVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion>