Author: tchemit Date: 2013-02-01 12:03:51 +0100 (Fri, 01 Feb 2013) New Revision: 286 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/286 Log: improve import / export models Added: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java Removed: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicImportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesExportModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesImportModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-01 10:54:50 UTC (rev 285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-01 11:03:51 UTC (rev 286) @@ -27,6 +27,7 @@ import fr.ifremer.tutti.persistence.entities.IdAware; import org.apache.commons.lang3.StringUtils; import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.util.csv.ext.AbstractImportExportModel; import org.nuiton.util.csv.ext.AbstractImportModel; import java.text.ParseException; @@ -40,9 +41,9 @@ */ public class TuttiCsvUtil { - public static abstract class AbstractTuttiImportModel<M> extends AbstractImportModel<M> { + public static abstract class AbstractTuttiImportExportModel<M> extends AbstractImportExportModel<M> { - public AbstractTuttiImportModel(char separator) { + public AbstractTuttiImportExportModel(char separator) { super(separator); } Copied: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java (from rev 285, trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicImportModel.java) =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2013-02-01 11:03:51 UTC (rev 286) @@ -0,0 +1,77 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ifremer.tutti.service.protocol; + + +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.service.TuttiCsvUtil; +import org.nuiton.util.csv.Common; + +import java.util.Map; + +/** + * Model to import / export {@link CaracteristicRow}. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.0 + */ +public class CaracteristicRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<CaracteristicRow> { + + public CaracteristicRowModel(char separator, Map<String, Caracteristic> caracteristicMap) { + super(separator); + + // import definition + + newForeignKeyColumn(CaracteristicRow.PROPERTY_ID, + CaracteristicRow.PROPERTY_CARACTERISTIC, + Caracteristic.class, + Caracteristic.PROPERTY_ID, + caracteristicMap); + + newMandatoryColumn(CaracteristicRow.PROPERTY_TYPE, + CaracteristicRow.PROPERTY_TYPE, + Common.newEnumByNameParserFormatter(CaracteristicType.class)); + + newIgnoredColumn(CaracteristicRow.PROPERTY_PARAMETER); + newIgnoredColumn(CaracteristicRow.PROPERTY_MATRIX); + newIgnoredColumn(CaracteristicRow.PROPERTY_FRACTION); + newIgnoredColumn(CaracteristicRow.PROPERTY_METHOD); + + // export definition + + newColumnForExport(CaracteristicRow.PROPERTY_ID); + newColumnForExport(CaracteristicRow.PROPERTY_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class)); + newColumnForExport(CaracteristicRow.PROPERTY_PARAMETER); + newColumnForExport(CaracteristicRow.PROPERTY_MATRIX); + newColumnForExport(CaracteristicRow.PROPERTY_FRACTION); + newColumnForExport(CaracteristicRow.PROPERTY_METHOD); + } + + @Override + public CaracteristicRow newEmptyInstance() { + return new CaracteristicRow(); + } + +} Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicExportModel.java 2013-02-01 10:54:50 UTC (rev 285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicExportModel.java 2013-02-01 11:03:51 UTC (rev 286) @@ -1,52 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.tutti.service.protocol; - - -import fr.ifremer.tutti.persistence.entities.referential.CaracteristicType; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ext.AbstractExportModel; - -/** - * Model to export caracteristics (from a protocol or not). - * - * @author tchemit <chemit@codelutin.com> - * @since 1.0 - */ -public class ProtocolCaracteristicExportModel extends AbstractExportModel<CaracteristicRow> { - - public ProtocolCaracteristicExportModel(char separator) { - super(separator); - - newColumnForExport(CaracteristicRow.PROPERTY_ID); - newColumnForExport(CaracteristicRow.PROPERTY_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class)); - newColumnForExport(CaracteristicRow.PROPERTY_PARAMETER); - newColumnForExport(CaracteristicRow.PROPERTY_MATRIX); - newColumnForExport(CaracteristicRow.PROPERTY_FRACTION); - newColumnForExport(CaracteristicRow.PROPERTY_METHOD); - } - - -} Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicImportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicImportModel.java 2013-02-01 10:54:50 UTC (rev 285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolCaracteristicImportModel.java 2013-02-01 11:03:51 UTC (rev 286) @@ -1,66 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ifremer.tutti.service.protocol; - - -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.util.csv.Common; - -import java.util.Map; - -/** - * Model to import protocol caracteristics. - * - * @author tchemit <chemit@codelutin.com> - * @since 1.0 - */ -public class ProtocolCaracteristicImportModel extends TuttiCsvUtil.AbstractTuttiImportModel<CaracteristicRow> { - - public ProtocolCaracteristicImportModel(char separator, Map<String, Caracteristic> caracteristicMap) { - super(separator); - - newForeignKeyColumn(CaracteristicRow.PROPERTY_ID, - CaracteristicRow.PROPERTY_CARACTERISTIC, - Caracteristic.class, - Caracteristic.PROPERTY_ID, - caracteristicMap); - - newMandatoryColumn(CaracteristicRow.PROPERTY_TYPE, - CaracteristicRow.PROPERTY_TYPE, - Common.newEnumByNameParserFormatter(CaracteristicType.class)); - - newIgnoredColumn(CaracteristicRow.PROPERTY_PARAMETER); - newIgnoredColumn(CaracteristicRow.PROPERTY_MATRIX); - newIgnoredColumn(CaracteristicRow.PROPERTY_FRACTION); - newIgnoredColumn(CaracteristicRow.PROPERTY_METHOD); - } - - @Override - public CaracteristicRow newEmptyInstance() { - return new CaracteristicRow(); - } - -} Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesExportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesExportModel.java 2013-02-01 10:54:50 UTC (rev 285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesExportModel.java 2013-02-01 11:03:51 UTC (rev 286) @@ -1,53 +0,0 @@ -package fr.ifremer.tutti.service.protocol; - -/* - * #%L - * Tutti :: Service - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2013 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ext.AbstractExportModel; - -/** - * Model to export {@link SpeciesProtocol}. - * - * @author tchemit <chemit@codelutin.com> - * @since 1.0 - */ -public class ProtocolSpeciesExportModel extends AbstractExportModel<SpeciesRow> { - - public ProtocolSpeciesExportModel(char separator) { - super(separator); - - newColumnForExport(SpeciesRow.PROPERTY_ID); - newColumnForExport(SpeciesRow.PROPERTY_LENGTH_CLASS, SpeciesRow.PROPERTY_LENGTH_CLASS_ID); - newColumnForExport(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); - newColumnForExport(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN); - newColumnForExport(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN); - newColumnForExport(SpeciesRow.PROPERTY_AGE_ENABLED, Common.PRIMITIVE_BOOLEAN); - newColumnForExport(SpeciesRow.PROPERTY_WEIGHT_ENABLED, Common.PRIMITIVE_BOOLEAN); - newColumnForExport(SpeciesRow.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, Common.PRIMITIVE_BOOLEAN); - newColumnForExport(SpeciesRow.PROPERTY_CALCIFY_SAMPLE_ENABLED, Common.PRIMITIVE_BOOLEAN); - } - -} \ No newline at end of file Deleted: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesImportModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesImportModel.java 2013-02-01 10:54:50 UTC (rev 285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesImportModel.java 2013-02-01 11:03:51 UTC (rev 286) @@ -1,77 +0,0 @@ -package fr.ifremer.tutti.service.protocol; - -/* - * #%L - * Tutti :: Service - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2012 - 2013 Ifremer - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; -import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import fr.ifremer.tutti.persistence.entities.referential.Species; -import fr.ifremer.tutti.service.TuttiCsvUtil; -import org.nuiton.util.csv.Common; - -import java.util.Map; - -/** - * Model to export {@link SpeciesProtocol}. - * - * @author tchemit <chemit@codelutin.com> - * @since 1.0 - */ -public class ProtocolSpeciesImportModel extends TuttiCsvUtil.AbstractTuttiImportModel<SpeciesRow> { - - public ProtocolSpeciesImportModel(char separator, - Map<String, Caracteristic> caracteristicMap, - Map<String, Species> speciesMap) { - super(separator); - - newForeignKeyColumn(SpeciesRow.PROPERTY_ID, - SpeciesRow.PROPERTY_SPECIES, - Species.class, - Species.PROPERTY_ID, - speciesMap); - - newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_CLASS, - SpeciesRow.PROPERTY_LENGTH_CLASS, - Caracteristic.class, - Caracteristic.PROPERTY_ID, - caracteristicMap); - - newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); - newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN); - newMandatoryColumn(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN); - newMandatoryColumn(SpeciesRow.PROPERTY_AGE_ENABLED, Common.PRIMITIVE_BOOLEAN); - newMandatoryColumn(SpeciesRow.PROPERTY_WEIGHT_ENABLED, Common.PRIMITIVE_BOOLEAN); - newMandatoryColumn(SpeciesRow.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, Common.PRIMITIVE_BOOLEAN); - newMandatoryColumn(SpeciesRow.PROPERTY_CALCIFY_SAMPLE_ENABLED, Common.PRIMITIVE_BOOLEAN); -// -// newIgnoredColumn(SpeciesRow.PROPERTY_PARAMETER); - } - - @Override - public SpeciesRow newEmptyInstance() { - return new SpeciesRow(); - } - - -} \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-01 10:54:50 UTC (rev 285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-01 11:03:51 UTC (rev 286) @@ -53,6 +53,7 @@ public static final String PROPERTY_AGE_ENABLED = "ageEnabled"; public static final String PROPERTY_LENGTH_CLASS = "lengthClass"; + public static final String PROPERTY_LENGTH_CLASS_ID = "lengthClassId"; public static final String PROPERTY_WEIGHT_ENABLED = "weightEnabled"; Copied: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java (from rev 285, trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolSpeciesImportModel.java) =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java (rev 0) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-01 11:03:51 UTC (rev 286) @@ -0,0 +1,88 @@ +package fr.ifremer.tutti.service.protocol; + +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.TuttiCsvUtil; +import org.nuiton.util.csv.Common; + +import java.util.Map; + +/** + * Model to import / export {@link SpeciesRow}. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.0 + */ +public class SpeciesRowModel extends TuttiCsvUtil.AbstractTuttiImportExportModel<SpeciesRow> { + + public SpeciesRowModel(char separator, + Map<String, Caracteristic> caracteristicMap, + Map<String, Species> speciesMap) { + super(separator); + + // import definition + + newForeignKeyColumn(SpeciesRow.PROPERTY_ID, + SpeciesRow.PROPERTY_SPECIES, + Species.class, + Species.PROPERTY_ID, + speciesMap); + + newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_CLASS, + SpeciesRow.PROPERTY_LENGTH_CLASS, + Caracteristic.class, + Caracteristic.PROPERTY_ID, + caracteristicMap); + + newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(SpeciesRow.PROPERTY_AGE_ENABLED, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(SpeciesRow.PROPERTY_WEIGHT_ENABLED, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(SpeciesRow.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, Common.PRIMITIVE_BOOLEAN); + newMandatoryColumn(SpeciesRow.PROPERTY_CALCIFY_SAMPLE_ENABLED, Common.PRIMITIVE_BOOLEAN); + + // export definition + + newColumnForExport(SpeciesRow.PROPERTY_ID); + newColumnForExport(SpeciesRow.PROPERTY_LENGTH_CLASS, SpeciesRow.PROPERTY_LENGTH_CLASS_ID); + newColumnForExport(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); + newColumnForExport(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN); + newColumnForExport(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN); + newColumnForExport(SpeciesRow.PROPERTY_AGE_ENABLED, Common.PRIMITIVE_BOOLEAN); + newColumnForExport(SpeciesRow.PROPERTY_WEIGHT_ENABLED, Common.PRIMITIVE_BOOLEAN); + newColumnForExport(SpeciesRow.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, Common.PRIMITIVE_BOOLEAN); + newColumnForExport(SpeciesRow.PROPERTY_CALCIFY_SAMPLE_ENABLED, Common.PRIMITIVE_BOOLEAN); + } + + @Override + public SpeciesRow newEmptyInstance() { + return new SpeciesRow(); + } + + +} \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-02-01 10:54:50 UTC (rev 285) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-02-01 11:03:51 UTC (rev 286) @@ -86,9 +86,9 @@ Multimap<CaracteristicType, String> ids = TreeMultimap.create(); - ProtocolCaracteristicImportModel csvModel = - new ProtocolCaracteristicImportModel(getCsvSeparator(), - caracteristicMap); + CaracteristicRowModel csvModel = + new CaracteristicRowModel(getCsvSeparator(), + caracteristicMap); Reader reader = Files.newReader(file, Charsets.UTF_8); try { @@ -161,8 +161,9 @@ Lists.newArrayList(caracteristicMap.keySet()), function); - ProtocolCaracteristicExportModel csvModel = - new ProtocolCaracteristicExportModel(getCsvSeparator()); + CaracteristicRowModel csvModel = + new CaracteristicRowModel(getCsvSeparator(), + caracteristicMap); BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); try { @@ -205,8 +206,9 @@ function.setType(CaracteristicType.HYDROLOGY); rows.addAll(Lists.transform(protocol.getHydrologyPmfmId(), function)); } - ProtocolCaracteristicExportModel csvModel = - new ProtocolCaracteristicExportModel(getCsvSeparator()); + CaracteristicRowModel csvModel = + new CaracteristicRowModel(getCsvSeparator(), + caracteristicMap); BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); try { @@ -240,10 +242,10 @@ } } - ProtocolSpeciesImportModel csvModel = - new ProtocolSpeciesImportModel(getCsvSeparator(), - caracteristicMap, - speciesMap); + SpeciesRowModel csvModel = + new SpeciesRowModel(getCsvSeparator(), + caracteristicMap, + speciesMap); Reader reader = Files.newReader(file, Charsets.UTF_8); try { @@ -311,8 +313,10 @@ speciesMap)); } - ProtocolSpeciesExportModel csvModel = - new ProtocolSpeciesExportModel(getCsvSeparator()); + SpeciesRowModel csvModel = + new SpeciesRowModel(getCsvSeparator(), + caracteristicMap, + speciesMap); BufferedWriter writer = Files.newWriter(file, Charsets.UTF_8); try {