Author: chatellier Date: 2011-01-06 12:59:40 +0000 (Thu, 06 Jan 2011) New Revision: 476 Log: Ajout d'une nouvelle methode iterator() qui skip le header csv Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-06 12:42:35 UTC (rev 475) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/storage/MemoryDataStorage.java 2011-01-06 12:59:40 UTC (rev 476) @@ -25,16 +25,10 @@ package fr.ifremer.coser.storage; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import au.com.bytecode.opencsv.CSVReader; -import au.com.bytecode.opencsv.CSVWriter; - /** * Stockage mémoire des String[] sous forme de String simple. * @@ -117,9 +111,24 @@ */ @Override public Iterator<String[]> iterator() { - return new StringListIterator(listStorage.iterator(), lineIndexStorage.iterator()); + return iterator(false); } + /** + * Return a new iterator, but skip first iterator element (csv header) + * by calling {@code next()} once. + * + * @param skipFirstLine if {@code true}, skip first line + * @return an Iterator. + */ + public Iterator<String[]> iterator(boolean skipFirstLine) { + Iterator<String[]> iterator = new StringListIterator(listStorage.iterator(), lineIndexStorage.iterator()); + if (skipFirstLine) { + iterator.next(); // skip header + } + return iterator; + } + /* * @see fr.ifremer.coser.storage.DataStorage#addData(java.lang.String[]) */