Author: kmorin Date: 2013-03-12 19:49:46 +0100 (Tue, 12 Mar 2013) New Revision: 598 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/598 Log: fixes #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-12 18:49:20 UTC (rev 597) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-12 18:49:46 UTC (rev 598) @@ -84,6 +84,7 @@ public SpeciesRow() { delegate = new SpeciesProtocol(); + delegate.setMadeFromAReferentTaxon(true); } public Species getSpecies() { @@ -98,10 +99,22 @@ return species == null ? null : species.getName(); } + public void setSpeciesName(String name) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getName().equals(name)); + } + public String getSpeciesRefTaxCode() { return species.getRefTaxCode(); } + public void setSpeciesRefTaxCode(String refTaxCode) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getRefTaxCode().equals(refTaxCode)); + } + public void setSpecies(Species species) { this.species = species; delegate.setSpeciesReferenceTaxonId(species == null ? null : species.getReferenceTaxonId()); @@ -199,4 +212,12 @@ public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { delegate.setCalcifySampleEnabled(calcifySampleEnabled); } + + public boolean isMadeFromAReferentTaxon() { + return delegate.isMadeFromAReferentTaxon(); + } + + public void setMadeFromAReferentTaxon(boolean referent) { + delegate.setMadeFromAReferentTaxon(referent); + } } \ No newline at end of file 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-12 18:49:20 UTC (rev 597) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-03-12 18:49:46 UTC (rev 598) @@ -77,13 +77,13 @@ Caracteristic.PROPERTY_ID, caracteristicMap); - newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); - newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME); 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);