Author: tchemit Date: 2013-04-15 17:38:46 +0200 (Mon, 15 Apr 2013) New Revision: 778 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/778 Log: fixes #2283: [PROTOCOLE] - A la cr?\195?\169ation d'un nouveau protocole le logiciel d?\195?\169place les esp?\195?\168ces benthos dans esp?\195?\168ces Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java 2013-04-15 15:38:46 UTC (rev 778) @@ -140,7 +140,7 @@ SpeciesProtocol s = TuttiBeanFactory.newSpeciesProtocol(); speciesProtocolBinder.copy(speciesProtocol, s); s.setId(UUID.randomUUID().toString()); - species.add(s); + benthos.add(s); } } result.setBenthos(benthos); Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java 2013-04-15 15:38:46 UTC (rev 778) @@ -38,12 +38,11 @@ import java.util.List; /** - * To test {@link ProtocolPersistenceService} for read operation. + * To test {@link ProtocolPersistenceService} for read operations. * * @author tchemit <chemit@codelutin.com> * @since 0.3 */ -@Ignore public class ProtocolPersistenceServiceReadTest { @ClassRule @@ -111,6 +110,30 @@ sp2.setSizeEnabled(true); sp2.setWeightEnabled(true); protocol.addSpecies(sp2); + + protocol.setBenthos(Lists.<SpeciesProtocol>newArrayList()); + SpeciesProtocol bp1 = TuttiBeanFactory.newSpeciesProtocol(); + bp1.setId("21"); + bp1.setSpeciesReferenceTaxonId(11242); + bp1.setLengthStepPmfmId("1394"); + bp1.setCalcifySampleEnabled(true); + bp1.setMaturityEnabled(true); + bp1.setSexEnabled(true); + bp1.setWeightEnabled(true); + protocol.addBenthos(bp1); + + SpeciesProtocol bp2 = TuttiBeanFactory.newSpeciesProtocol(); + bp2.setId("22"); + bp2.setSpeciesReferenceTaxonId(3835); + bp2.setLengthStepPmfmId("323"); + bp2.setAgeEnabled(true); + bp2.setCalcifySampleEnabled(true); + bp2.setCountIfNoFrequencyEnabled(true); + bp2.setMaturityEnabled(true); + bp2.setSexEnabled(true); + bp2.setSizeEnabled(true); + bp2.setWeightEnabled(true); + protocol.addBenthos(bp2); return protocol; } } Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceWriteTest.java 2013-04-15 15:38:46 UTC (rev 778) @@ -36,12 +36,11 @@ import org.junit.Test; /** - * To test {@link ProtocolPersistenceService} for write operation. + * To test {@link ProtocolPersistenceService} for write operations. * * @author tchemit <chemit@codelutin.com> * @since 0.3 */ -@Ignore public class ProtocolPersistenceServiceWriteTest { @ClassRule @@ -50,6 +49,26 @@ protected ProtocolPersistenceService service; public static final String PROTOCOL_FILE_CONTENT = + "benthos: \n" + + "- !SpeciesProtocol\n" + + " id: 21\n" + + " calcifySampleEnabled: true\n" + + " lengthStepPmfmId: 1394\n" + + " maturityEnabled: true\n" + + " sexEnabled: true\n" + + " speciesReferenceTaxonId: 11242\n" + + " weightEnabled: true\n" + + "- !SpeciesProtocol\n" + + " id: 22\n" + + " ageEnabled: true\n" + + " calcifySampleEnabled: true\n" + + " countIfNoFrequencyEnabled: true\n" + + " lengthStepPmfmId: 323\n" + + " maturityEnabled: true\n" + + " sexEnabled: true\n" + + " sizeEnabled: true\n" + + " speciesReferenceTaxonId: 3835\n" + + " weightEnabled: true\n" + "id: 1\n" + "name: protocolName\n" + "comment: Commentaire\n" + @@ -160,6 +179,31 @@ sp2.setSizeEnabled(true); sp2.setWeightEnabled(true); protocol.addSpecies(sp2); + + protocol.setBenthos(Lists.<SpeciesProtocol>newArrayList()); + SpeciesProtocol bp1 = TuttiBeanFactory.newSpeciesProtocol(); + bp1.setId("21"); + bp1.setSpeciesReferenceTaxonId(11242); + bp1.setLengthStepPmfmId("1394"); + bp1.setCalcifySampleEnabled(true); + bp1.setMaturityEnabled(true); + bp1.setSexEnabled(true); + bp1.setWeightEnabled(true); + protocol.addBenthos(bp1); + + SpeciesProtocol bp2 = TuttiBeanFactory.newSpeciesProtocol(); + bp2.setId("22"); + bp2.setSpeciesReferenceTaxonId(3835); + bp2.setLengthStepPmfmId("323"); + bp2.setAgeEnabled(true); + bp2.setCalcifySampleEnabled(true); + bp2.setCountIfNoFrequencyEnabled(true); + bp2.setMaturityEnabled(true); + bp2.setSexEnabled(true); + bp2.setSizeEnabled(true); + bp2.setWeightEnabled(true); + protocol.addBenthos(bp2); + return protocol; } } 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-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-04-15 15:38:46 UTC (rev 778) @@ -226,4 +226,12 @@ public void setMadeFromAReferentTaxon(boolean referent) { delegate.setMadeFromAReferentTaxon(referent); } + + public void setId(String id) { + delegate.setId(id); + } + + public String getId() { + return delegate.getId(); + } } \ No newline at end of file Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-15 15:38:46 UTC (rev 778) @@ -1,6 +1,7 @@ tutti.config.option.basedir.description= tutti.config.option.csv.separator.description= tutti.config.option.data.directory.description= +tutti.config.option.export.countryId.description= tutti.config.option.inceptionYear.description= tutti.config.option.organizationName.description= tutti.config.option.site.url.description= @@ -56,6 +57,8 @@ tutti.service.catches.computeWeights.error.incoherentSampleWeight= tutti.service.catches.computeWeights.error.incoherentSpeciesTotalSorted= tutti.service.catches.computeWeights.error.incoherentTotal= +tutti.service.export.invalid.cruise= +tutti.service.export.invalid.fishingOperation= tutti.validator.error.comment.too.long= tutti.validator.error.cruise.beginDate.required= tutti.validator.error.cruise.dates.endBeforeStart= Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-04-15 15:38:46 UTC (rev 778) @@ -57,6 +57,7 @@ "name: protocolName\n" + "benthos: \n" + "- !SpeciesProtocol\n" + + " id: 21\n" + " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " maturityEnabled: true\n" + @@ -65,6 +66,7 @@ " speciesSurveyCode: cruiseCode1\n" + " weightEnabled: true\n" + "- !SpeciesProtocol\n" + + " id: 22\n" + " ageEnabled: true\n" + " calcifySampleEnabled: true\n" + " countIfNoFrequencyEnabled: true\n" + @@ -83,6 +85,7 @@ "- 18\n" + "species: \n" + "- !SpeciesProtocol\n" + + " id: 1\n" + " calcifySampleEnabled: true\n" + " lengthStepPmfmId: 1394\n" + " maturityEnabled: true\n" + @@ -91,6 +94,7 @@ " speciesSurveyCode: cruiseCode1\n" + " weightEnabled: true\n" + "- !SpeciesProtocol\n" + + " id: 2\n" + " ageEnabled: true\n" + " calcifySampleEnabled: true\n" + " countIfNoFrequencyEnabled: true\n" + @@ -163,6 +167,7 @@ protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList()); SpeciesProtocol sp1 = TuttiBeanFactory.newSpeciesProtocol(); + sp1.setId(1); sp1.setSpeciesReferenceTaxonId(11242); sp1.setSpeciesSurveyCode("cruiseCode1"); sp1.setLengthStepPmfmId("1394"); @@ -173,6 +178,7 @@ protocol.addSpecies(sp1); SpeciesProtocol sp2 = TuttiBeanFactory.newSpeciesProtocol(); + sp2.setId(2); sp2.setSpeciesReferenceTaxonId(3835); sp2.setLengthStepPmfmId("323"); sp2.setAgeEnabled(true); @@ -185,27 +191,29 @@ protocol.addSpecies(sp2); protocol.setBenthos(Lists.<SpeciesProtocol>newArrayList()); - SpeciesProtocol b1 = TuttiBeanFactory.newSpeciesProtocol(); - b1.setSpeciesReferenceTaxonId(11242); - b1.setSpeciesSurveyCode("cruiseCode1"); - b1.setLengthStepPmfmId("1394"); - b1.setCalcifySampleEnabled(true); - b1.setMaturityEnabled(true); - b1.setSexEnabled(true); - b1.setWeightEnabled(true); - protocol.addBenthos(b1); + SpeciesProtocol bp1 = TuttiBeanFactory.newSpeciesProtocol(); + bp1.setId(21); + bp1.setSpeciesSurveyCode("cruiseCode1"); + bp1.setSpeciesReferenceTaxonId(11242); + bp1.setLengthStepPmfmId("1394"); + bp1.setCalcifySampleEnabled(true); + bp1.setMaturityEnabled(true); + bp1.setSexEnabled(true); + bp1.setWeightEnabled(true); + protocol.addBenthos(bp1); - SpeciesProtocol b2 = TuttiBeanFactory.newSpeciesProtocol(); - b2.setSpeciesReferenceTaxonId(3835); - b2.setLengthStepPmfmId("323"); - b2.setAgeEnabled(true); - b2.setCalcifySampleEnabled(true); - b2.setCountIfNoFrequencyEnabled(true); - b2.setMaturityEnabled(true); - b2.setSexEnabled(true); - b2.setSizeEnabled(true); - b2.setWeightEnabled(true); - protocol.addBenthos(b2); + SpeciesProtocol bp2 = TuttiBeanFactory.newSpeciesProtocol(); + bp2.setId(22); + bp2.setSpeciesReferenceTaxonId(3835); + bp2.setLengthStepPmfmId("323"); + bp2.setAgeEnabled(true); + bp2.setCalcifySampleEnabled(true); + bp2.setCountIfNoFrequencyEnabled(true); + bp2.setMaturityEnabled(true); + bp2.setSexEnabled(true); + bp2.setSizeEnabled(true); + bp2.setWeightEnabled(true); + protocol.addBenthos(bp2); service.exportProtocol(protocol, exportFile); Assert.assertTrue(exportFile.exists()); @@ -237,6 +245,7 @@ Assert.assertEquals(2, protocol.sizeSpecies()); SpeciesProtocol sp1 = protocol.getSpecies(0); Assert.assertNotNull(sp1); + Assert.assertEquals(1, sp1.getIdAsInt(), 0); Assert.assertEquals(11242, sp1.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); @@ -250,6 +259,7 @@ SpeciesProtocol sp2 = protocol.getSpecies(1); Assert.assertNotNull(sp2); + Assert.assertEquals(2, sp2.getIdAsInt(), 0); Assert.assertEquals(3835, sp2.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.isAgeEnabled()); @@ -264,6 +274,7 @@ Assert.assertEquals(2, protocol.sizeBenthos()); SpeciesProtocol b1 = protocol.getBenthos(0); Assert.assertNotNull(b1); + Assert.assertEquals(21, b1.getIdAsInt(), 0); Assert.assertEquals(11242, b1.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("cruiseCode1", b1.getSpeciesSurveyCode()); Assert.assertEquals("1394", b1.getLengthStepPmfmId()); @@ -277,6 +288,7 @@ SpeciesProtocol b2 = protocol.getBenthos(1); Assert.assertNotNull(b2); + Assert.assertEquals(22, b2.getIdAsInt(), 0); Assert.assertEquals(3835, b2.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("323", b2.getLengthStepPmfmId()); Assert.assertTrue(b2.isAgeEnabled()); @@ -513,6 +525,7 @@ protocol.setBenthos(Lists.<SpeciesProtocol>newArrayList()); SpeciesProtocol sp1 = TuttiBeanFactory.newSpeciesProtocol(); + sp1.setId(21); sp1.setSpeciesReferenceTaxonId(1); sp1.setSpeciesSurveyCode("cruiseCode1"); sp1.setAgeEnabled(true); @@ -527,10 +540,11 @@ protocol.addBenthos(sp1); SpeciesProtocol sp2 = TuttiBeanFactory.newSpeciesProtocol(); + sp2.setId(22); sp2.setSpeciesReferenceTaxonId(2); sp2.setAgeEnabled(true); - sp1.setSizeEnabled(true); - sp1.setMaturityEnabled(true); + sp2.setSizeEnabled(false); + sp2.setMaturityEnabled(false); sp2.setSexEnabled(true); sp2.setWeightEnabled(true); sp2.setCalcifySampleEnabled(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-04-15 15:38:46 UTC (rev 778) @@ -133,48 +133,6 @@ return (EditProtocolSpeciesTableModel) getBenthosTable().getModel(); } -// -// @Override -// public EditProtocolSpeciesTableModel getTableModel() { -// return (EditProtocolSpeciesTableModel) getTable().getModel(); -// } -// -// @Override -// public JXTable getTable() { -// return ui.getSpeciesTable(); -// } -// -// @Override -// protected boolean isRowValid(EditProtocolSpeciesRowModel row) { -// return true; -// } - -// @Override -// protected void onRowModified(int rowIndex, -// EditProtocolSpeciesRowModel row, -// String propertyName, -// Object oldValue, -// Object newValue) { -// -// recomputeRowValidState(row); -// } -// -// -// @Override -// protected void onRowValidStateChanged(int rowIndex, -// EditProtocolSpeciesRowModel row, -// Boolean oldValue, -// Boolean newValue) { -// super.onRowValidStateChanged(rowIndex, row, oldValue, newValue); -// -// if (row != null && row.isModify() && newValue != null && newValue) { -// // row was modified and is valid, we can save protocol -// // even if after the row becomes again not valid, this is not a -// // problem since we will only save valid data! -// getModel().setModify(true); -// } -// } - //------------------------------------------------------------------------// //-- AbstractTuttiUIHandler methods --// //------------------------------------------------------------------------// @@ -204,9 +162,6 @@ getDataContext().getReferentSpecies()); model.setAllReferentSpeciesByTaxonId(allReferentSpeciesByTaxonId); -// List<TuttiProtocol> protocols = Lists.newArrayList(persistenceService.getAllProtocol()); -// model.setExistingProtocols(protocols); - List<Caracteristic> caracteristics = Lists.newArrayList(getDataContext().getCaracteristics()); model.setCaracteristics(caracteristics); @@ -300,7 +255,7 @@ } } - // set to model ( will propagate to tableModel) + // set to model (will propagate to tableModel) model.setSpeciesRow(speciesRows); model.setBenthosRow(benthosRows); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/SaveProtocolAction.java 2013-04-15 15:38:46 UTC (rev 778) @@ -115,6 +115,4 @@ EditProtocolUIHandler.getTitle(true)); } - - } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-15 14:48:55 UTC (rev 777) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-15 15:38:46 UTC (rev 778) @@ -651,9 +651,9 @@ tutti.editProtocol.action.exportProtocolSpecies=Exporter les espèces tutti.editProtocol.action.exportProtocolSpecies.mnemonic=è tutti.editProtocol.action.exportProtocolSpecies.tip=Exporter les espèces du protocole -tutti.editProtocol.action.exportPupitri= -tutti.editProtocol.action.exportPupitri.mnemonic= -tutti.editProtocol.action.exportPupitri.tip= +tutti.editProtocol.action.exportPupitri=Export pupitri +tutti.editProtocol.action.exportPupitri.mnemonic=p +tutti.editProtocol.action.exportPupitri.tip=Exporter les espèces au format Pupitri tutti.editProtocol.action.importProtocolBenthos=Importer les benthos tutti.editProtocol.action.importProtocolBenthos.mnemonic=i tutti.editProtocol.action.importProtocolBenthos.tip=Importer les benthos dans le protocole