Author: tchemit Date: 2011-11-22 19:14:23 +0100 (Tue, 22 Nov 2011) New Revision: 2232 Url: http://nuiton.org/repositories/revision/nuiton-utils/2232 Log: fix methods Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java Modified: trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java =================================================================== --- trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java 2011-11-22 17:51:31 UTC (rev 2231) +++ trunk/nuiton-csv/src/main/java/org/nuiton/util/csv/ModelBuilder.java 2011-11-22 18:14:23 UTC (rev 2232) @@ -36,9 +36,11 @@ */ public class ModelBuilder<E> { - protected Collection<ImportableColumn<E, ?>> columnsForImport = new LinkedList<ImportableColumn<E, ?>>(); + protected Collection<ImportableColumn<E, ?>> columnsForImport = + new LinkedList<ImportableColumn<E, ?>>(); - protected Collection<ExportableColumn<E, ?>> columnsForExport = new LinkedList<ExportableColumn<E, ?>>(); + protected Collection<ExportableColumn<E, ?>> columnsForExport = + new LinkedList<ExportableColumn<E, ?>>(); public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { Column<E, T> newColumn = Column.newImportableColumn(headerName, null, null, true); @@ -47,13 +49,13 @@ } public ImportableColumn<E, String> newMandatoryColumn(String headerName, String propertyName) { - return newMandatoryColumn(headerName, Common.STRING, propertyName); + return newMandatoryColumn(headerName, propertyName, Common.STRING); } - public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, ValueParser<T> valueParser, String propertyName) { + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, String propertyName, ValueParser<T> valueParser) { return newMandatoryColumn(headerName, valueParser, new Common.BeanProperty<E, T>(propertyName)); } - + public ImportableColumn<E, String> newMandatoryColumn(String headerName, ValueSetter<E, String> valueSetter) { return newMandatoryColumn(headerName, Common.STRING, valueSetter); }