Author: kmorin Date: 2013-03-15 14:48:21 +0100 (Fri, 15 Mar 2013) New Revision: 636 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/636 Log: refs #2041 [PROTOCOLE] - Esp?\195?\168ces - Import des esp?\195?\168ces 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/SpeciesRowModel.java 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-03-15 12:55:36 UTC (rev 635) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-15 13:48:21 UTC (rev 636) @@ -29,6 +29,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import java.io.Serializable; +import org.apache.commons.lang3.StringUtils; /** * Row of a {@link SpeciesProtocol} to import or export. @@ -100,9 +101,11 @@ } public void setSpeciesName(String name) { - boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); - setMadeFromAReferentTaxon(madeFromAReferentTaxon && - species != null && species.getName().equals(name)); + if (!StringUtils.isEmpty(name)) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getName().equals(name)); + } } public String getSpeciesRefTaxCode() { @@ -110,9 +113,11 @@ } public void setSpeciesRefTaxCode(String refTaxCode) { - boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); - setMadeFromAReferentTaxon(madeFromAReferentTaxon && - species != null && species.getRefTaxCode().equals(refTaxCode)); + if (!StringUtils.isEmpty(refTaxCode)) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getRefTaxCode().equals(refTaxCode)); + } } public void setSpecies(Species species) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-03-15 12:55:36 UTC (rev 635) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-03-15 13:48:21 UTC (rev 636) @@ -71,6 +71,9 @@ } }); + newOptionalColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); + newOptionalColumn(SpeciesRow.PROPERTY_SPECIES_NAME); + newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID, SpeciesRow.PROPERTY_LENGTH_STEP_PMFM, Caracteristic.class, @@ -82,8 +85,6 @@ newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME); - newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); - newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_NAME); newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null, true)); newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN);