This is an automated email from the git hooks/post-receive script. New commit to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit 09d849d26d8d7f810b99bb8b2baba4387bbd8d91 Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 23 15:09:14 2016 +0100 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 --- .gitignore | 12 ++--- .../src/main/xmi/tutti-persistence.zargo | Bin 62183 -> 62126 bytes .../entities/protocol/TuttiProtocolsTest.java | 14 ------ .../ProtocolPersistenceServiceReadTest.java | 6 --- .../catches/ValidateCruiseOperationsService.java | 4 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 ------- .../protocol/ProtocolImportExportServiceTest.java | 30 ------------ .../create/CreateBenthosBatchUIHandler.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 51 ++++++++++----------- .../protocol/EditProtocolSpeciesTableModel.java | 17 ++----- .../content/protocol/EditProtocolUIHandler.java | 24 ++++------ .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 14 files changed, 52 insertions(+), 130 deletions(-) diff --git a/.gitignore b/.gitignore index 64dc679..e21865b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,15 @@ /atlassian-ide-plugin.xml /.idea -/*/.idea +/**/.idea /target -/*/target/ +/**/target/ /*.iml -/*/*.iml +/**/*.iml /*.ipr -/*/*.ipr +/**/*.ipr /*.iws -/*/*.iws +/**/*.iws /tutti-service/src/test/data /tutti-persistence/src/test/data /*~ -/*/*~ \ No newline at end of file +/**/*~ \ No newline at end of file diff --git a/tutti-persistence/src/main/xmi/tutti-persistence.zargo b/tutti-persistence/src/main/xmi/tutti-persistence.zargo index d725495..99a27b0 100644 Binary files a/tutti-persistence/src/main/xmi/tutti-persistence.zargo and b/tutti-persistence/src/main/xmi/tutti-persistence.zargo differ diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java index 4b6f5cd..172113d 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java @@ -207,8 +207,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("BAR", sp1.getSpeciesSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertFalse(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -221,8 +219,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("CHIN", sp2.getSpeciesSurveyCode()); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -237,8 +233,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("BAR", b1.getSpeciesSurveyCode()); Assert.assertEquals("1394", b1.getLengthStepPmfmId()); Assert.assertFalse(b1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b1.isCalcifySampleEnabled()); - Assert.assertFalse(b1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(b1.containsMandatorySampleCategoryId(SIZE)); @@ -251,8 +245,6 @@ public class TuttiProtocolsTest { Assert.assertEquals("CHIN", b2.getSpeciesSurveyCode()); Assert.assertEquals("323", b2.getLengthStepPmfmId()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b2.isCalcifySampleEnabled()); - Assert.assertTrue(b2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SIZE)); @@ -281,7 +273,6 @@ public class TuttiProtocolsTest { sp1.setSpeciesReferenceTaxonId(11242); sp1.setSpeciesSurveyCode("BAR"); sp1.setLengthStepPmfmId("1394"); - sp1.setCalcifySampleEnabled(true); sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); @@ -294,8 +285,6 @@ public class TuttiProtocolsTest { sp2.setSpeciesSurveyCode("CHIN"); sp2.setLengthStepPmfmId("323"); sp2.addMandatorySampleCategoryId(AGE); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.addMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.addMandatorySampleCategoryId(SIZE); @@ -309,7 +298,6 @@ public class TuttiProtocolsTest { b1.setSpeciesReferenceTaxonId(11242); b1.setSpeciesSurveyCode("BAR"); b1.setLengthStepPmfmId("1394"); - b1.setCalcifySampleEnabled(true); b1.addMandatorySampleCategoryId(MATURITY); b1.addMandatorySampleCategoryId(SEX); b1.setWeightEnabled(true); @@ -322,8 +310,6 @@ public class TuttiProtocolsTest { b2.setSpeciesSurveyCode("CHIN"); b2.setLengthStepPmfmId("323"); b2.addMandatorySampleCategoryId(AGE); - b2.setCalcifySampleEnabled(true); - b2.setCountIfNoFrequencyEnabled(true); b2.addMandatorySampleCategoryId(MATURITY); b2.addMandatorySampleCategoryId(SEX); b2.addMandatorySampleCategoryId(SIZE); diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java index 6829a01..c9fccad 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceReadTest.java @@ -109,7 +109,6 @@ public class ProtocolPersistenceServiceReadTest { sp1.setSpeciesReferenceTaxonId(11242); sp1.setSpeciesSurveyCode("BAR"); sp1.setLengthStepPmfmId("1394"); - sp1.setCalcifySampleEnabled(true); sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); @@ -122,8 +121,6 @@ public class ProtocolPersistenceServiceReadTest { sp2.setSpeciesSurveyCode("CHIN"); sp2.setLengthStepPmfmId("323"); sp2.addMandatorySampleCategoryId(AGE); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.addMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.addMandatorySampleCategoryId(SIZE); @@ -137,7 +134,6 @@ public class ProtocolPersistenceServiceReadTest { b1.setSpeciesReferenceTaxonId(11242); b1.setSpeciesSurveyCode("BAR"); b1.setLengthStepPmfmId("1394"); - b1.setCalcifySampleEnabled(true); b1.addMandatorySampleCategoryId(MATURITY); b1.addMandatorySampleCategoryId(SEX); b1.setWeightEnabled(true); @@ -150,8 +146,6 @@ public class ProtocolPersistenceServiceReadTest { b2.setSpeciesSurveyCode("CHIN"); b2.setLengthStepPmfmId("323"); b2.addMandatorySampleCategoryId(AGE); - b2.setCalcifySampleEnabled(true); - b2.setCountIfNoFrequencyEnabled(true); b2.addMandatorySampleCategoryId(MATURITY); b2.addMandatorySampleCategoryId(SEX); b2.addMandatorySampleCategoryId(SIZE); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java index 79fd8e2..91084b8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java @@ -455,7 +455,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { browsingBatch = browsingBatch.getParentBatch(); } result = mandatoryCategories.isEmpty() && - (!speciesProtocol.isCountIfNoFrequencyEnabled() + (speciesProtocol.getLengthStepPmfmId() != null || CollectionUtils.isNotEmpty(frequencies) || batch.getNumber() != null); } @@ -561,7 +561,7 @@ public class ValidateCruiseOperationsService extends AbstractTuttiService { browsingBatch = browsingBatch.getParentBatch(); } result = mandatoryCategories.isEmpty() && - (!speciesProtocol.isCountIfNoFrequencyEnabled() + (speciesProtocol.getLengthStepPmfmId() != null || CollectionUtils.isNotEmpty(frequencies) || batch.getNumber() != null); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java index 59a9aa6..011cf5f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java @@ -177,22 +177,6 @@ public class SpeciesRow implements Serializable { delegate.setWeightEnabled(weightEnabled); } - public boolean isCountIfNoFrequencyEnabled() { - return delegate.isCountIfNoFrequencyEnabled(); - } - - public void setCountIfNoFrequencyEnabled(boolean countIfNoFrequencyEnabled) { - delegate.setCountIfNoFrequencyEnabled(countIfNoFrequencyEnabled); - } - - public boolean isCalcifySampleEnabled() { - return delegate.isCalcifySampleEnabled(); - } - - public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { - delegate.setCalcifySampleEnabled(calcifySampleEnabled); - } - public boolean isMadeFromAReferentTaxon() { return delegate.isMadeFromAReferentTaxon(); } diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java index f066012..4c7d6bc 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java @@ -226,7 +226,6 @@ public class ProtocolImportExportServiceTest { sp1.setSpeciesReferenceTaxonId(11242); sp1.setSpeciesSurveyCode("cruiseCode1"); sp1.setLengthStepPmfmId("1394"); - sp1.setCalcifySampleEnabled(true); sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); @@ -241,8 +240,6 @@ public class ProtocolImportExportServiceTest { sp2.setSpeciesReferenceTaxonId(3835); sp2.setLengthStepPmfmId("323"); sp2.addMandatorySampleCategoryId(AGE); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.addMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.addMandatorySampleCategoryId(SIZE); @@ -256,7 +253,6 @@ public class ProtocolImportExportServiceTest { bp1.setSpeciesSurveyCode("cruiseCode1"); bp1.setSpeciesReferenceTaxonId(11242); bp1.setLengthStepPmfmId("1394"); - bp1.setCalcifySampleEnabled(true); bp1.addMandatorySampleCategoryId(MATURITY); bp1.addMandatorySampleCategoryId(SEX); bp1.setWeightEnabled(true); @@ -268,8 +264,6 @@ public class ProtocolImportExportServiceTest { bp2.setSpeciesReferenceTaxonId(3835); bp2.setLengthStepPmfmId("323"); bp2.addMandatorySampleCategoryId(AGE); - bp2.setCalcifySampleEnabled(true); - bp2.setCountIfNoFrequencyEnabled(true); bp2.addMandatorySampleCategoryId(MATURITY); bp2.addMandatorySampleCategoryId(SEX); bp2.addMandatorySampleCategoryId(SIZE); @@ -320,8 +314,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertFalse(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -342,8 +334,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals(3835, sp2.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -361,8 +351,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", b1.getSpeciesSurveyCode()); Assert.assertEquals("1394", b1.getLengthStepPmfmId()); Assert.assertFalse(b1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b1.isCalcifySampleEnabled()); - Assert.assertFalse(b1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b1.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(b1.containsMandatorySampleCategoryId(SIZE)); @@ -377,8 +365,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals(3835, b2.getSpeciesReferenceTaxonId(), 0); Assert.assertEquals("323", b2.getLengthStepPmfmId()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(b2.isCalcifySampleEnabled()); - Assert.assertTrue(b2.isCountIfNoFrequencyEnabled()); Assert.assertTrue(b2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(b2.containsMandatorySampleCategoryId(SIZE)); @@ -497,8 +483,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); Assert.assertEquals("2", sp1.getLengthStepPmfmId()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertTrue(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -520,8 +504,6 @@ public class ProtocolImportExportServiceTest { Assert.assertNull(sp2.getSpeciesSurveyCode()); Assert.assertNull(sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -552,8 +534,6 @@ public class ProtocolImportExportServiceTest { sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); - sp1.setCountIfNoFrequencyEnabled(true); - sp1.setCalcifySampleEnabled(true); sp1.setLengthStepPmfmId("2"); sp1.setRtpMale(Rtps.newRtp(1f, 2f)); sp1.setRtpFemale(Rtps.newRtp(2f, 3f)); @@ -569,8 +549,6 @@ public class ProtocolImportExportServiceTest { sp2.removeMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.setWeightEnabled(true); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.setLengthStepPmfmId(null); protocol.addSpecies(sp2); @@ -607,8 +585,6 @@ public class ProtocolImportExportServiceTest { Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); Assert.assertEquals("2", sp1.getLengthStepPmfmId()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp1.isCalcifySampleEnabled()); - Assert.assertTrue(sp1.isCountIfNoFrequencyEnabled()); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SEX)); Assert.assertTrue(sp1.containsMandatorySampleCategoryId(SIZE)); @@ -623,8 +599,6 @@ public class ProtocolImportExportServiceTest { Assert.assertNull(sp2.getSpeciesSurveyCode()); Assert.assertNull(sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(AGE)); - Assert.assertTrue(sp2.isCalcifySampleEnabled()); - Assert.assertTrue(sp2.isCountIfNoFrequencyEnabled()); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(MATURITY)); Assert.assertTrue(sp2.containsMandatorySampleCategoryId(SEX)); Assert.assertFalse(sp2.containsMandatorySampleCategoryId(SIZE)); @@ -659,8 +633,6 @@ public class ProtocolImportExportServiceTest { sp1.addMandatorySampleCategoryId(MATURITY); sp1.addMandatorySampleCategoryId(SEX); sp1.setWeightEnabled(true); - sp1.setCountIfNoFrequencyEnabled(true); - sp1.setCalcifySampleEnabled(true); sp1.setLengthStepPmfmId("2"); protocol.addBenthos(sp1); @@ -674,8 +646,6 @@ public class ProtocolImportExportServiceTest { sp2.removeMandatorySampleCategoryId(MATURITY); sp2.addMandatorySampleCategoryId(SEX); sp2.setWeightEnabled(true); - sp2.setCalcifySampleEnabled(true); - sp2.setCountIfNoFrequencyEnabled(true); sp2.setLengthStepPmfmId(null); sp2.setRtpFemale(Rtps.newRtp(22f, 33f)); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java index 426bbd9..4d63da0 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java @@ -168,7 +168,7 @@ public class CreateBenthosBatchUIHandler extends AbstractTuttiTableUIHandler<Spl if (speciesProtocol != null) { if (speciesProtocol.getLengthStepPmfmId() != null) { frequencyMode = CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE; - } else if (speciesProtocol.isCountIfNoFrequencyEnabled()) { + } else { frequencyMode = CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java index f0abfb2..7781ff3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java @@ -167,7 +167,7 @@ public class CreateSpeciesBatchUIHandler extends AbstractTuttiTableUIHandler<Spl if (speciesProtocol != null) { if (speciesProtocol.getLengthStepPmfmId() != null) { frequencyMode = CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE; - } else if (speciesProtocol.isCountIfNoFrequencyEnabled()) { + } else { frequencyMode = CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java index 6c9f6d0..efde9b4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java @@ -53,12 +53,10 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie public static final String PROPERTY_WEIGHT_ENABLED = "weightEnabled"; - public static final String PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED = "countIfNoFrequencyEnabled"; - - public static final String PROPERTY_CALCIFY_SAMPLE_ENABLED = "calcifySampleEnabled"; - public static final String PROPERTY_MATURITY_PMFM = "maturityPmfm"; + public static final String PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM = "calcifiedPiecesSamplingTypePmfm"; + public static final String PROPERTY_USE_RTP = "useRtp"; protected Species species; @@ -79,6 +77,8 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie protected Caracteristic maturityPmfm; + protected Caracteristic calcifiedPiecesSamplingTypePmfm; + protected Rtp rtpMale; protected Rtp rtpFemale; @@ -162,30 +162,6 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie } @Override - public boolean isCountIfNoFrequencyEnabled() { - return countIfNoFrequencyEnabled; - } - - @Override - public void setCountIfNoFrequencyEnabled(boolean countIfNoFrequencyEnabled) { - Object oldValue = isCountIfNoFrequencyEnabled(); - this.countIfNoFrequencyEnabled = countIfNoFrequencyEnabled; - firePropertyChange(PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, oldValue, countIfNoFrequencyEnabled); - } - - @Override - public boolean isCalcifySampleEnabled() { - return calcifySampleEnabled; - } - - @Override - public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { - Object oldValue = isCalcifySampleEnabled(); - this.calcifySampleEnabled = calcifySampleEnabled; - firePropertyChange(PROPERTY_CALCIFY_SAMPLE_ENABLED, oldValue, calcifySampleEnabled); - } - - @Override public Float getLengthStep() { return null; } @@ -300,6 +276,25 @@ public class EditProtocolSpeciesRowModel extends AbstractTuttiBeanUIModel<Specie firePropertyChange(PROPERTY_MATURITY_PMFM, oldValue, maturityPmfm); } + @Override + public String getCalcifiedPiecesSamplingTypePmfmId() { + return calcifiedPiecesSamplingTypePmfm != null ? calcifiedPiecesSamplingTypePmfm.getId() : null; + } + + @Override + public void setCalcifiedPiecesSamplingTypePmfmId(String calcifiedPiecesSamplingTypePmfmId) { + } + + public Caracteristic getCalcifiedPiecesSamplingTypePmfm() { + return calcifiedPiecesSamplingTypePmfm; + } + + public void setCalcifiedPiecesSamplingTypePmfm(Caracteristic calcifiedPiecesSamplingTypePmfm) { + Object oldValue = getCalcifiedPiecesSamplingTypePmfm(); + this.calcifiedPiecesSamplingTypePmfm = calcifiedPiecesSamplingTypePmfm; + firePropertyChange(PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM, oldValue, calcifiedPiecesSamplingTypePmfm); + } + public boolean isUseRtp() { return withRtpFemale() && withRtpMale() && withRtpUndefined(); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java index eceb7c7..f47e924 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java @@ -61,16 +61,6 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel n("tutti.editProtocol.table.header.weight"), n("tutti.editProtocol.table.header.weight.tip")); - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> COUNT_IF_NO_FREQUENCY_ENABLED = ColumnIdentifier.newId( - EditProtocolSpeciesRowModel.PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED, - n("tutti.editProtocol.table.header.countIfNoFrequency"), - n("tutti.editProtocol.table.header.countIfNoFrequency.tip")); - - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFY_SAMPLE_ENABLED = ColumnIdentifier.newId( - EditProtocolSpeciesRowModel.PROPERTY_CALCIFY_SAMPLE_ENABLED, - n("tutti.editProtocol.table.header.calcifySample"), - n("tutti.editProtocol.table.header.calcifySample.tip")); - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> INDIVIDUAL_OBSERVATION_ENABLED = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_INDIVIDUAL_OBSERVATION_ENABLED, n("tutti.editProtocol.table.header.individualObservation"), @@ -81,6 +71,11 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel n("tutti.editProtocol.table.header.maturity"), n("tutti.editProtocol.table.header.maturity.tip")); + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID = ColumnIdentifier.newId( + EditProtocolSpeciesRowModel.PROPERTY_CALCIFIED_PIECES_SAMPLING_TYPE_PMFM, + n("tutti.editProtocol.table.header.calcifiedPiecesSamplingType"), + n("tutti.editProtocol.table.header.calcifiedPiecesSamplingType.tip")); + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> USE_RTP = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_USE_RTP, n("tutti.editProtocol.table.header.useRtp"), @@ -107,8 +102,6 @@ public class EditProtocolSpeciesTableModel extends AbstractApplicationTableModel result.setMandatorySampleCategoryId(mandatoryIds); result.setWeightEnabled(true); - result.setCountIfNoFrequencyEnabled(true); - result.setCalcifySampleEnabled(true); result.setValid(true); result.addPropertyChangeListener(EditProtocolSpeciesRowModel.PROPERTY_LENGTH_STEP_PMFM, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index bb7640b..e22cfd2 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -383,7 +383,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId(), table); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.COUNT_IF_NO_FREQUENCY_ENABLED, table); for (SampleCategoryModelEntry sampleCategoryModelEntry : sampleCategoryModel.getCategory()) { @@ -402,12 +401,12 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addBooleanColumnToModel(columnModel, identifier, table); } - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); - - addMaturityColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); addIndividualObservationColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); + addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), new RtpCellRenderer(), @@ -449,7 +448,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId(), table); addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.WEIGHT_ENABLED, table); - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.COUNT_IF_NO_FREQUENCY_ENABLED, table); for (SampleCategoryModelEntry sampleCategoryModelEntry : sampleCategoryModel.getCategory()) { @@ -468,12 +466,12 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addBooleanColumnToModel(columnModel, identifier, table); } - addBooleanColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFY_SAMPLE_ENABLED, table); - - addMaturityColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); addIndividualObservationColumnToModel(columnModel, table); + addPmfmColumnToModel(columnModel, EditProtocolSpeciesTableModel.CALCIFIED_PIECES_SAMPLING_TYPE_PMFM_ID); + addColumnToModel(columnModel, RtpCellEditor.newEditor(ui), new RtpCellRenderer(), @@ -1104,9 +1102,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel tableModel = (EditProtocolSpeciesTableModel) table.getModel(); EditProtocolSpeciesRowModel selectedRow = tableModel.getRows().get(table.convertRowIndexToModel(table.getSelectedRow())); Caracteristic lengthStepPmfm = selectedRow.getLengthStepPmfm(); - boolean withLengthStepPmfm = lengthStepPmfm != null; - selectedRow.setCountIfNoFrequencyEnabled(withLengthStepPmfm); - if (!withLengthStepPmfm) { + if (lengthStepPmfm == null) { selectedRow.setIndividualObservationEnabled(false); } } @@ -1123,8 +1119,8 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.LENGTH_STEP_PMFM_ID); } - protected void addMaturityColumnToModel(TableColumnModel model, - JTable table) { + protected void addPmfmColumnToModel(TableColumnModel model, + ColumnIdentifier<EditProtocolSpeciesRowModel> column) { Decorator<Caracteristic> decorator = getDecorator(Caracteristic.class, null); @@ -1148,7 +1144,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI addColumnToModel(model, editor, newTableCellRender(decorator), - EditProtocolSpeciesTableModel.MATURITY_PMFM_ID); + column); } protected void initTable(final JXTable table, diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 9a53100..1f79785 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1156,6 +1156,8 @@ tutti.editProtocol.tab.cps= tutti.editProtocol.tab.info= tutti.editProtocol.tab.species= tutti.editProtocol.tab.zone= +tutti.editProtocol.table.header.calcifiedPiecesSamplingType= +tutti.editProtocol.table.header.calcifiedPiecesSamplingType.tip= tutti.editProtocol.table.header.calcifySample= tutti.editProtocol.table.header.calcifySample.tip= tutti.editProtocol.table.header.caracteristics.importFileColumn= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 48c069d..3fa0322 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1103,6 +1103,8 @@ tutti.editProtocol.tab.cps=Prélèvement de pièces calcifiées tutti.editProtocol.tab.info=Informations générales tutti.editProtocol.tab.species=Espèces tutti.editProtocol.tab.zone=Zones +tutti.editProtocol.table.header.calcifiedPiecesSamplingType= +tutti.editProtocol.table.header.calcifiedPiecesSamplingType.tip= tutti.editProtocol.table.header.calcifySample=Prélèvement de pièces calcifiées tutti.editProtocol.table.header.calcifySample.tip=Prélèvement de pièces calcifiées (pour les données individuelles) tutti.editProtocol.table.header.caracteristics.importFileColumn=Colonne du fichier d'import -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit d4faf6d48d09439e4ced05c07e2ee6d5021389d8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 15:59:36 2016 +0100 migration du protocole (refs #8013) --- .../entities/protocol/TuttiProtocols.java | 108 +++- .../entities/protocol/v3/SpeciesProtocol3.java | 150 ++++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 330 ++++++++++++ .../entities/protocol/v3/TuttiProtocol3.java | 238 ++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 598 +++++++++++++++++++++ 5 files changed, 1413 insertions(+), 11 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index 9168b1f..dedda90 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -42,6 +42,10 @@ import fr.ifremer.tutti.persistence.entities.protocol.v1.TuttiProtocol1; import fr.ifremer.tutti.persistence.entities.protocol.v1.TuttiProtocolBean1; import fr.ifremer.tutti.persistence.entities.protocol.v2.TuttiProtocol2; import fr.ifremer.tutti.persistence.entities.protocol.v2.TuttiProtocolBean2; +import fr.ifremer.tutti.persistence.entities.protocol.v3.SpeciesProtocol3; +import fr.ifremer.tutti.persistence.entities.protocol.v3.SpeciesProtocolBean3; +import fr.ifremer.tutti.persistence.entities.protocol.v3.TuttiProtocol3; +import fr.ifremer.tutti.persistence.entities.protocol.v3.TuttiProtocolBean3; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; @@ -115,6 +119,9 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } } catch (Exception e) { + if (log.isInfoEnabled()) { + log.info("Protocol needs to be migrated", e); + } result = migrateProtocol(file); } finally { @@ -180,20 +187,39 @@ public class TuttiProtocols extends AbstractTuttiProtocols { protected static TuttiProtocol migrateProtocol(File file) { try { - //try to load a v2 - TuttiProtocol2 tuttiProtocol2 = fromFileV2(file); + //try to load a v3 + TuttiProtocol3 tuttiProtocol3 = fromFileV3(file); - TuttiProtocol result = fromTuttiProtocol2(tuttiProtocol2); + TuttiProtocol result = fromTuttiProtocol3(tuttiProtocol3); return result; } catch (Exception ee) { - // try to load a v1 - TuttiProtocol1 tuttiProtocol1 = fromFileV1(file); + if (log.isErrorEnabled()) { + log.error("Error on loading a v3", ee); + } + try { + //try to load a v2 + TuttiProtocol2 tuttiProtocol2 = fromFileV2(file); - TuttiProtocol2 tuttiProtocol2 = fromTuttiProtocol1(tuttiProtocol1); + TuttiProtocol3 tuttiProtocol3 = fromTuttiProtocol2(tuttiProtocol2); - TuttiProtocol result = fromTuttiProtocol2(tuttiProtocol2); - return result; + TuttiProtocol result = fromTuttiProtocol3(tuttiProtocol3); + return result; + + } catch (Exception ee2) { + if (log.isErrorEnabled()) { + log.error("Error on loading a v2", ee2); + } + // try to load a v1 + TuttiProtocol1 tuttiProtocol1 = fromFileV1(file); + + TuttiProtocol2 tuttiProtocol2 = fromTuttiProtocol1(tuttiProtocol1); + + TuttiProtocol3 tuttiProtocol3 = fromTuttiProtocol2(tuttiProtocol2); + + TuttiProtocol result = fromTuttiProtocol3(tuttiProtocol3); + return result; + } } } @@ -229,6 +255,22 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } } + public static TuttiProtocol3 fromFileV3(File file) { + + Reader fileReader = null; + try { + fileReader = Files.newReader(file, Charsets.UTF_8); + YamlReader reader = new YamlReader(fileReader, createConfigV3()); + TuttiProtocol3 result = reader.read(TuttiProtocolBean3.class); + fileReader.close(); + return result; + } catch (Exception e) { + throw new ApplicationTechnicalException(t("tutti.persistence.protocol.fromFile.error", file), e); + } finally { + IOUtils.closeQuietly(fileReader); + } + } + public static void checkSampleCategories(SampleCategoryModel sampleCategoryModel, TuttiProtocol protocol, Set<Integer> badCategories) { @@ -345,9 +387,9 @@ public class TuttiProtocols extends AbstractTuttiProtocols { return result; } - protected static TuttiProtocol fromTuttiProtocol2(TuttiProtocol2 tuttiProtocol2) { - TuttiProtocol result = newTuttiProtocol(); - Binder<TuttiProtocol2, TuttiProtocol> binder = BinderFactory.newBinder(TuttiProtocol2.class, TuttiProtocol.class); + protected static TuttiProtocol3 fromTuttiProtocol2(TuttiProtocol2 tuttiProtocol2) { + TuttiProtocol3 result = new TuttiProtocolBean3(); + Binder<TuttiProtocol2, TuttiProtocol3> binder = BinderFactory.newBinder(TuttiProtocol2.class, TuttiProtocol3.class); binder.copy(tuttiProtocol2, result); List<CaracteristicMappingRow> caracteristicMappingRows = new ArrayList<>(); @@ -370,6 +412,35 @@ public class TuttiProtocols extends AbstractTuttiProtocols { return result; } + protected static TuttiProtocol fromTuttiProtocol3(TuttiProtocol3 tuttiProtocol3) { + TuttiProtocol result = newTuttiProtocol(); + Binder<TuttiProtocol3, TuttiProtocol> binder = BinderFactory.newBinder(TuttiProtocol3.class, TuttiProtocol.class); + binder.copy(tuttiProtocol3, result); + + if (!tuttiProtocol3.isSpeciesEmpty()) { + result.setSpecies(Lists.<SpeciesProtocol>newArrayList()); + Binder<SpeciesProtocol3, SpeciesProtocol> binderSpecies = BinderFactory.newBinder(SpeciesProtocol3.class, SpeciesProtocol.class); + for (SpeciesProtocol3 speciesProtocol3 : tuttiProtocol3.getSpecies()) { + SpeciesProtocol row = SpeciesProtocols.newSpeciesProtocol(); + row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); + binderSpecies.copy(speciesProtocol3, row); + result.addSpecies(row); + } + } + if (!tuttiProtocol3.isBenthosEmpty()) { + result.setBenthos(Lists.<SpeciesProtocol>newArrayList()); + Binder<SpeciesProtocol3, SpeciesProtocol> binderSpecies = BinderFactory.newBinder(SpeciesProtocol3.class, SpeciesProtocol.class); + for (SpeciesProtocol3 speciesProtocol3 : tuttiProtocol3.getBenthos()) { + SpeciesProtocol row = SpeciesProtocols.newSpeciesProtocol(); + row.setMandatorySampleCategoryId(Lists.<Integer>newArrayList()); + binderSpecies.copy(speciesProtocol3, row); + result.addBenthos(row); + } + } + + return result; + } + protected static YamlConfig createConfig() { YamlConfig result = new YamlConfig(); result.setClassTag(SpeciesProtocol.class.getSimpleName(), @@ -404,6 +475,21 @@ public class TuttiProtocols extends AbstractTuttiProtocols { return result; } + protected static YamlConfig createConfigV3() { + YamlConfig result = new YamlConfig(); + result.setClassTag(SpeciesProtocol.class.getSimpleName(), SpeciesProtocolBean3.class); + result.setClassTag(CaracteristicMappingRow.class.getSimpleName(), + CaracteristicMappingRows.typeOfCaracteristicMappingRow()); + result.setClassTag(Zone.class.getSimpleName(), Zones.typeOfZone()); + result.setClassTag(Strata.class.getSimpleName(), Stratas.typeOfStrata()); + result.setClassTag(SubStrata.class.getSimpleName(), SubStratas.typeOfSubStrata()); + result.setClassTag(CalcifiedPiecesSamplingDefinition.class.getSimpleName(), + CalcifiedPiecesSamplingDefinitions.typeOfCalcifiedPiecesSamplingDefinition()); + result.writeConfig.setAlwaysWriteClassname(false); + result.writeConfig.setWriteRootTags(false); + return result; + } + public static SpeciesProtocol getSpeciesOrBenthosProtocol(TuttiProtocol protocol, Integer speciesReferenceTaxonId) { SpeciesProtocol speciesProtocol = getSpeciesProtocol(protocol, speciesReferenceTaxonId); if (speciesProtocol == null) { diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocol3.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocol3.java new file mode 100644 index 0000000..5cf0ddd --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocol3.java @@ -0,0 +1,150 @@ +package fr.ifremer.tutti.persistence.entities.protocol.v3; + +import fr.ifremer.tutti.persistence.entities.TuttiEntity; +import fr.ifremer.tutti.persistence.entities.protocol.CalcifiedPiecesSamplingDefinition; +import fr.ifremer.tutti.persistence.entities.protocol.Rtp; + +import javax.annotation.Generated; +import java.util.Collection; +import java.util.List; + +@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Wed Feb 24 14:48:37 CET 2016") +public interface SpeciesProtocol3 extends TuttiEntity { + + String PROPERTY_SPECIES_REFERENCE_TAXON_ID = "speciesReferenceTaxonId"; + + String PROPERTY_SPECIES_SURVEY_CODE = "speciesSurveyCode"; + + String PROPERTY_LENGTH_STEP_PMFM_ID = "lengthStepPmfmId"; + + String PROPERTY_WEIGHT_ENABLED = "weightEnabled"; + + String PROPERTY_COUNT_IF_NO_FREQUENCY_ENABLED = "countIfNoFrequencyEnabled"; + + String PROPERTY_CALCIFY_SAMPLE_ENABLED = "calcifySampleEnabled"; + + String PROPERTY_LENGTH_STEP = "lengthStep"; + + String PROPERTY_MADE_FROM_AREFERENT_TAXON = "madeFromAReferentTaxon"; + + String PROPERTY_MANDATORY_SAMPLE_CATEGORY_ID = "mandatorySampleCategoryId"; + + String PROPERTY_RTP_MALE = "rtpMale"; + + String PROPERTY_RTP_FEMALE = "rtpFemale"; + + String PROPERTY_RTP_UNDEFINED = "rtpUndefined"; + + String PROPERTY_INDIVIDUAL_OBSERVATION_ENABLED = "individualObservationEnabled"; + + String PROPERTY_MATURITY_PMFM_ID = "maturityPmfmId"; + + String PROPERTY_CALCIFIED_PIECES_SAMPLING_DEFINITION = "calcifiedPiecesSamplingDefinition"; + + Integer getSpeciesReferenceTaxonId(); + + void setSpeciesReferenceTaxonId(Integer speciesReferenceTaxonId); + + String getSpeciesSurveyCode(); + + void setSpeciesSurveyCode(String speciesSurveyCode); + + String getLengthStepPmfmId(); + + void setLengthStepPmfmId(String lengthStepPmfmId); + + boolean isWeightEnabled(); + + void setWeightEnabled(boolean weightEnabled); + + boolean isCountIfNoFrequencyEnabled(); + + void setCountIfNoFrequencyEnabled(boolean countIfNoFrequencyEnabled); + + boolean isCalcifySampleEnabled(); + + void setCalcifySampleEnabled(boolean calcifySampleEnabled); + + Float getLengthStep(); + + void setLengthStep(Float lengthStep); + + boolean isMadeFromAReferentTaxon(); + + void setMadeFromAReferentTaxon(boolean madeFromAReferentTaxon); + + Integer getMandatorySampleCategoryId(int index); + + boolean isMandatorySampleCategoryIdEmpty(); + + int sizeMandatorySampleCategoryId(); + + void addMandatorySampleCategoryId(Integer mandatorySampleCategoryId); + + void addAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId); + + boolean removeMandatorySampleCategoryId(Integer mandatorySampleCategoryId); + + boolean removeAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId); + + boolean containsMandatorySampleCategoryId(Integer mandatorySampleCategoryId); + + boolean containsAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId); + + List<Integer> getMandatorySampleCategoryId(); + + void setMandatorySampleCategoryId(List<Integer> mandatorySampleCategoryId); + + Rtp getRtpMale(); + + void setRtpMale(Rtp rtpMale); + + Rtp getRtpFemale(); + + void setRtpFemale(Rtp rtpFemale); + + Rtp getRtpUndefined(); + + void setRtpUndefined(Rtp rtpUndefined); + + boolean isIndividualObservationEnabled(); + + void setIndividualObservationEnabled(boolean individualObservationEnabled); + + String getMaturityPmfmId(); + + void setMaturityPmfmId(String maturityPmfmId); + + String getCalcifiedPiecesSamplingTypePmfmId(); + + void setCalcifiedPiecesSamplingTypePmfmId(String calcifiedPiecesSamplingTypePmfmId); + + CalcifiedPiecesSamplingDefinition getCalcifiedPiecesSamplingDefinition(int index); + + boolean isCalcifiedPiecesSamplingDefinitionEmpty(); + + int sizeCalcifiedPiecesSamplingDefinition(); + + void addCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition); + + void addAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition); + + boolean removeCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition); + + boolean removeAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition); + + boolean containsCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition); + + boolean containsAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition); + + Collection<CalcifiedPiecesSamplingDefinition> getCalcifiedPiecesSamplingDefinition(); + + void setCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition); + + boolean withRtpMale(); + + boolean withRtpFemale(); + + boolean withRtpUndefined(); + +} //SpeciesProtocol diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java new file mode 100644 index 0000000..648b76f --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java @@ -0,0 +1,330 @@ +package fr.ifremer.tutti.persistence.entities.protocol.v3; + +import fr.ifremer.tutti.persistence.entities.TuttiEntityBean; +import fr.ifremer.tutti.persistence.entities.protocol.CalcifiedPiecesSamplingDefinition; +import fr.ifremer.tutti.persistence.entities.protocol.Rtp; + +import javax.annotation.Generated; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Wed Feb 24 14:48:37 CET 2016") +public class SpeciesProtocolBean3 extends TuttiEntityBean implements SpeciesProtocol3 { + + private static final long serialVersionUID = 3486411950096802662L; + + protected Integer speciesReferenceTaxonId; + + protected String speciesSurveyCode; + + protected String lengthStepPmfmId; + + protected boolean weightEnabled; + + protected boolean countIfNoFrequencyEnabled; + + protected boolean calcifySampleEnabled; + + protected Float lengthStep; + + protected boolean madeFromAReferentTaxon; + + protected List<Integer> mandatorySampleCategoryId; + + protected Rtp rtpMale; + + protected Rtp rtpFemale; + + protected Rtp rtpUndefined; + + protected boolean individualObservationEnabled; + + protected String maturityPmfmId; + + protected String calcifiedPiecesSamplingTypePmfmId; + + protected Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition; + + @Override + public Integer getSpeciesReferenceTaxonId() { + return speciesReferenceTaxonId; + } + + @Override + public void setSpeciesReferenceTaxonId(Integer speciesReferenceTaxonId) { + this.speciesReferenceTaxonId = speciesReferenceTaxonId; + } + + @Override + public String getSpeciesSurveyCode() { + return speciesSurveyCode; + } + + @Override + public void setSpeciesSurveyCode(String speciesSurveyCode) { + this.speciesSurveyCode = speciesSurveyCode; + } + + @Override + public String getLengthStepPmfmId() { + return lengthStepPmfmId; + } + + @Override + public void setLengthStepPmfmId(String lengthStepPmfmId) { + this.lengthStepPmfmId = lengthStepPmfmId; + } + + @Override + public boolean isWeightEnabled() { + return weightEnabled; + } + + @Override + public void setWeightEnabled(boolean weightEnabled) { + this.weightEnabled = weightEnabled; + } + + @Override + public boolean isCountIfNoFrequencyEnabled() { + return countIfNoFrequencyEnabled; + } + + @Override + public void setCountIfNoFrequencyEnabled(boolean countIfNoFrequencyEnabled) { + this.countIfNoFrequencyEnabled = countIfNoFrequencyEnabled; + } + + @Override + public boolean isCalcifySampleEnabled() { + return calcifySampleEnabled; + } + + @Override + public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { + this.calcifySampleEnabled = calcifySampleEnabled; + } + + @Override + public Float getLengthStep() { + return lengthStep; + } + + @Override + public void setLengthStep(Float lengthStep) { + this.lengthStep = lengthStep; + } + + @Override + public boolean isMadeFromAReferentTaxon() { + return madeFromAReferentTaxon; + } + + @Override + public void setMadeFromAReferentTaxon(boolean madeFromAReferentTaxon) { + this.madeFromAReferentTaxon = madeFromAReferentTaxon; + } + + @Override + public Integer getMandatorySampleCategoryId(int index) { + Integer o = getChild(mandatorySampleCategoryId, index); + return o; + } + + @Override + public boolean isMandatorySampleCategoryIdEmpty() { + return mandatorySampleCategoryId == null || mandatorySampleCategoryId.isEmpty(); + } + + @Override + public int sizeMandatorySampleCategoryId() { + return mandatorySampleCategoryId == null ? 0 : mandatorySampleCategoryId.size(); + } + + @Override + public void addMandatorySampleCategoryId(Integer mandatorySampleCategoryId) { + getMandatorySampleCategoryId().add(mandatorySampleCategoryId); + } + + @Override + public void addAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId) { + getMandatorySampleCategoryId().addAll(mandatorySampleCategoryId); + } + + @Override + public boolean removeMandatorySampleCategoryId(Integer mandatorySampleCategoryId) { + boolean removed = getMandatorySampleCategoryId().remove(mandatorySampleCategoryId); + return removed; + } + + @Override + public boolean removeAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId) { + boolean removed = getMandatorySampleCategoryId().removeAll(mandatorySampleCategoryId); + return removed; + } + + @Override + public boolean containsMandatorySampleCategoryId(Integer mandatorySampleCategoryId) { + boolean contains = getMandatorySampleCategoryId().contains(mandatorySampleCategoryId); + return contains; + } + + @Override + public boolean containsAllMandatorySampleCategoryId(Collection<Integer> mandatorySampleCategoryId) { + boolean contains = getMandatorySampleCategoryId().containsAll(mandatorySampleCategoryId); + return contains; + } + + @Override + public List<Integer> getMandatorySampleCategoryId() { + if (mandatorySampleCategoryId == null) { + mandatorySampleCategoryId = new LinkedList<Integer>(); + } + return mandatorySampleCategoryId; +} + + @Override + public void setMandatorySampleCategoryId(List<Integer> mandatorySampleCategoryId) { + this.mandatorySampleCategoryId = mandatorySampleCategoryId; + } + + @Override + public Rtp getRtpMale() { + return rtpMale; + } + + @Override + public void setRtpMale(Rtp rtpMale) { + this.rtpMale = rtpMale; + } + + @Override + public Rtp getRtpFemale() { + return rtpFemale; + } + + @Override + public void setRtpFemale(Rtp rtpFemale) { + this.rtpFemale = rtpFemale; + } + + @Override + public Rtp getRtpUndefined() { + return rtpUndefined; + } + + @Override + public void setRtpUndefined(Rtp rtpUndefined) { + this.rtpUndefined = rtpUndefined; + } + + @Override + public boolean isIndividualObservationEnabled() { + return individualObservationEnabled; + } + + @Override + public void setIndividualObservationEnabled(boolean individualObservationEnabled) { + this.individualObservationEnabled = individualObservationEnabled; + } + + @Override + public String getMaturityPmfmId() { + return maturityPmfmId; + } + + @Override + public void setMaturityPmfmId(String maturityPmfmId) { + this.maturityPmfmId = maturityPmfmId; + } + + @Override + public String getCalcifiedPiecesSamplingTypePmfmId() { + return calcifiedPiecesSamplingTypePmfmId; + } + + @Override + public void setCalcifiedPiecesSamplingTypePmfmId(String calcifiedPiecesSamplingTypePmfmId) { + this.calcifiedPiecesSamplingTypePmfmId = calcifiedPiecesSamplingTypePmfmId; + } + + @Override + public CalcifiedPiecesSamplingDefinition getCalcifiedPiecesSamplingDefinition(int index) { + CalcifiedPiecesSamplingDefinition o = getChild(calcifiedPiecesSamplingDefinition, index); + return o; + } + + @Override + public boolean isCalcifiedPiecesSamplingDefinitionEmpty() { + return calcifiedPiecesSamplingDefinition == null || calcifiedPiecesSamplingDefinition.isEmpty(); + } + + @Override + public int sizeCalcifiedPiecesSamplingDefinition() { + return calcifiedPiecesSamplingDefinition == null ? 0 : calcifiedPiecesSamplingDefinition.size(); + } + + @Override + public void addCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition) { + getCalcifiedPiecesSamplingDefinition().add(calcifiedPiecesSamplingDefinition); + } + + @Override + public void addAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { + getCalcifiedPiecesSamplingDefinition().addAll(calcifiedPiecesSamplingDefinition); + } + + @Override + public boolean removeCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition) { + boolean removed = getCalcifiedPiecesSamplingDefinition().remove(calcifiedPiecesSamplingDefinition); + return removed; + } + + @Override + public boolean removeAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { + boolean removed = getCalcifiedPiecesSamplingDefinition().removeAll(calcifiedPiecesSamplingDefinition); + return removed; + } + + @Override + public boolean containsCalcifiedPiecesSamplingDefinition(CalcifiedPiecesSamplingDefinition calcifiedPiecesSamplingDefinition) { + boolean contains = getCalcifiedPiecesSamplingDefinition().contains(calcifiedPiecesSamplingDefinition); + return contains; + } + + @Override + public boolean containsAllCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { + boolean contains = getCalcifiedPiecesSamplingDefinition().containsAll(calcifiedPiecesSamplingDefinition); + return contains; + } + + @Override + public Collection<CalcifiedPiecesSamplingDefinition> getCalcifiedPiecesSamplingDefinition() { + if (calcifiedPiecesSamplingDefinition == null) { + calcifiedPiecesSamplingDefinition = new LinkedList<CalcifiedPiecesSamplingDefinition>(); + } + return calcifiedPiecesSamplingDefinition; +} + + @Override + public void setCalcifiedPiecesSamplingDefinition(Collection<CalcifiedPiecesSamplingDefinition> calcifiedPiecesSamplingDefinition) { + this.calcifiedPiecesSamplingDefinition = calcifiedPiecesSamplingDefinition; + } + + @Override + public boolean withRtpMale() { + return rtpMale != null; + } + + @Override + public boolean withRtpFemale() { + return rtpFemale != null; + } + + @Override + public boolean withRtpUndefined() { + return rtpUndefined != null; + } + +} //AbstractSpeciesProtocolBean diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocol3.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocol3.java new file mode 100644 index 0000000..7688a0c --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocol3.java @@ -0,0 +1,238 @@ +package fr.ifremer.tutti.persistence.entities.protocol.v3; + +import fr.ifremer.tutti.persistence.entities.CommentAware; +import fr.ifremer.tutti.persistence.entities.TuttiEntity; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.Zone; + +import javax.annotation.Generated; +import java.util.Collection; +import java.util.List; + +@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Wed Feb 24 14:48:37 CET 2016") +public interface TuttiProtocol3 extends CommentAware, TuttiEntity { + + String PROPERTY_NAME = "name"; + + String PROPERTY_COMMENT = "comment"; + + String PROPERTY_LENGTH_CLASSES_PMFM_ID = "lengthClassesPmfmId"; + + String PROPERTY_INDIVIDUAL_OBSERVATION_PMFM_ID = "individualObservationPmfmId"; + + String PROPERTY_VERSION = "version"; + + String PROPERTY_IMPORT_COLUMNS = "importColumns"; + + String PROPERTY_PROGRAM_ID = "programId"; + + String PROPERTY_USE_CALCIFIED_PIECE_SAMPLING = "useCalcifiedPieceSampling"; + + String PROPERTY_SPECIES = "species"; + + String PROPERTY_BENTHOS = "benthos"; + + String PROPERTY_CARACTERISTIC_MAPPING = "caracteristicMapping"; + + String PROPERTY_OPERATION_FIELD_MAPPING = "operationFieldMapping"; + + String PROPERTY_ZONE = "zone"; + + String getName(); + + void setName(String name); + + String getComment(); + + void setComment(String comment); + + String getLengthClassesPmfmId(int index); + + boolean isLengthClassesPmfmIdEmpty(); + + int sizeLengthClassesPmfmId(); + + void addLengthClassesPmfmId(String lengthClassesPmfmId); + + void addAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId); + + boolean removeLengthClassesPmfmId(String lengthClassesPmfmId); + + boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId); + + boolean containsLengthClassesPmfmId(String lengthClassesPmfmId); + + boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId); + + List<String> getLengthClassesPmfmId(); + + void setLengthClassesPmfmId(List<String> lengthClassesPmfmId); + + String getIndividualObservationPmfmId(int index); + + boolean isIndividualObservationPmfmIdEmpty(); + + int sizeIndividualObservationPmfmId(); + + void addIndividualObservationPmfmId(String individualObservationPmfmId); + + void addAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId); + + boolean removeIndividualObservationPmfmId(String individualObservationPmfmId); + + boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId); + + boolean containsIndividualObservationPmfmId(String individualObservationPmfmId); + + boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId); + + List<String> getIndividualObservationPmfmId(); + + void setIndividualObservationPmfmId(List<String> individualObservationPmfmId); + + Integer getVersion(); + + void setVersion(Integer version); + + String getImportColumns(int index); + + boolean isImportColumnsEmpty(); + + int sizeImportColumns(); + + void addImportColumns(String importColumns); + + void addAllImportColumns(Collection<String> importColumns); + + boolean removeImportColumns(String importColumns); + + boolean removeAllImportColumns(Collection<String> importColumns); + + boolean containsImportColumns(String importColumns); + + boolean containsAllImportColumns(Collection<String> importColumns); + + Collection<String> getImportColumns(); + + void setImportColumns(Collection<String> importColumns); + + String getProgramId(); + + void setProgramId(String programId); + + boolean isUseCalcifiedPieceSampling(); + + void setUseCalcifiedPieceSampling(boolean useCalcifiedPieceSampling); + + SpeciesProtocol3 getSpecies(int index); + + boolean isSpeciesEmpty(); + + int sizeSpecies(); + + void addSpecies(SpeciesProtocol3 species); + + void addAllSpecies(Collection<SpeciesProtocol3> species); + + boolean removeSpecies(SpeciesProtocol3 species); + + boolean removeAllSpecies(Collection<SpeciesProtocol3> species); + + boolean containsSpecies(SpeciesProtocol3 species); + + boolean containsAllSpecies(Collection<SpeciesProtocol3> species); + + List<SpeciesProtocol3> getSpecies(); + + void setSpecies(List<SpeciesProtocol3> species); + + SpeciesProtocol3 getBenthos(int index); + + boolean isBenthosEmpty(); + + int sizeBenthos(); + + void addBenthos(SpeciesProtocol3 benthos); + + void addAllBenthos(Collection<SpeciesProtocol3> benthos); + + boolean removeBenthos(SpeciesProtocol3 benthos); + + boolean removeAllBenthos(Collection<SpeciesProtocol3> benthos); + + boolean containsBenthos(SpeciesProtocol3 benthos); + + boolean containsAllBenthos(Collection<SpeciesProtocol3> benthos); + + List<SpeciesProtocol3> getBenthos(); + + void setBenthos(List<SpeciesProtocol3> benthos); + + CaracteristicMappingRow getCaracteristicMapping(int index); + + boolean isCaracteristicMappingEmpty(); + + int sizeCaracteristicMapping(); + + void addCaracteristicMapping(CaracteristicMappingRow caracteristicMapping); + + void addAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping); + + boolean removeCaracteristicMapping(CaracteristicMappingRow caracteristicMapping); + + boolean removeAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping); + + boolean containsCaracteristicMapping(CaracteristicMappingRow caracteristicMapping); + + boolean containsAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping); + + List<CaracteristicMappingRow> getCaracteristicMapping(); + + void setCaracteristicMapping(List<CaracteristicMappingRow> caracteristicMapping); + + OperationFieldMappingRow getOperationFieldMapping(int index); + + boolean isOperationFieldMappingEmpty(); + + int sizeOperationFieldMapping(); + + void addOperationFieldMapping(OperationFieldMappingRow operationFieldMapping); + + void addAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping); + + boolean removeOperationFieldMapping(OperationFieldMappingRow operationFieldMapping); + + boolean removeAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping); + + boolean containsOperationFieldMapping(OperationFieldMappingRow operationFieldMapping); + + boolean containsAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping); + + Collection<OperationFieldMappingRow> getOperationFieldMapping(); + + void setOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping); + + Zone getZone(int index); + + boolean isZoneEmpty(); + + int sizeZone(); + + void addZone(Zone zone); + + void addAllZone(Collection<Zone> zone); + + boolean removeZone(Zone zone); + + boolean removeAllZone(Collection<Zone> zone); + + boolean containsZone(Zone zone); + + boolean containsAllZone(Collection<Zone> zone); + + Collection<Zone> getZone(); + + void setZone(Collection<Zone> zone); + +} //TuttiProtocol diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java new file mode 100644 index 0000000..8bdeee0 --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java @@ -0,0 +1,598 @@ +package fr.ifremer.tutti.persistence.entities.protocol.v3; + +import fr.ifremer.tutti.persistence.entities.TuttiEntityBean; +import fr.ifremer.tutti.persistence.entities.protocol.CaracteristicMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.OperationFieldMappingRow; +import fr.ifremer.tutti.persistence.entities.protocol.Zone; + +import javax.annotation.Generated; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; + +@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanTransformer", date = "Wed Feb 24 14:48:37 CET 2016") +public class TuttiProtocolBean3 extends TuttiEntityBean implements TuttiProtocol3 { + + private static final long serialVersionUID = 3847260679792845110L; + + protected String name; + + protected String comment; + + protected List<String> lengthClassesPmfmId; + + protected List<String> individualObservationPmfmId; + + protected Integer version; + + protected Collection<String> importColumns; + + protected String programId; + + protected boolean useCalcifiedPieceSampling; + + protected List<SpeciesProtocol3> species; + + protected List<SpeciesProtocol3> benthos; + + protected List<CaracteristicMappingRow> caracteristicMapping; + + protected Collection<OperationFieldMappingRow> operationFieldMapping; + + protected Collection<Zone> zone; + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } + + @Override + public String getComment() { + return comment; + } + + @Override + public void setComment(String comment) { + this.comment = comment; + } + + @Override + public String getLengthClassesPmfmId(int index) { + String o = getChild(lengthClassesPmfmId, index); + return o; + } + + @Override + public boolean isLengthClassesPmfmIdEmpty() { + return lengthClassesPmfmId == null || lengthClassesPmfmId.isEmpty(); + } + + @Override + public int sizeLengthClassesPmfmId() { + return lengthClassesPmfmId == null ? 0 : lengthClassesPmfmId.size(); + } + + @Override + public void addLengthClassesPmfmId(String lengthClassesPmfmId) { + getLengthClassesPmfmId().add(lengthClassesPmfmId); + } + + @Override + public void addAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { + getLengthClassesPmfmId().addAll(lengthClassesPmfmId); + } + + @Override + public boolean removeLengthClassesPmfmId(String lengthClassesPmfmId) { + boolean removed = getLengthClassesPmfmId().remove(lengthClassesPmfmId); + return removed; + } + + @Override + public boolean removeAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { + boolean removed = getLengthClassesPmfmId().removeAll(lengthClassesPmfmId); + return removed; + } + + @Override + public boolean containsLengthClassesPmfmId(String lengthClassesPmfmId) { + boolean contains = getLengthClassesPmfmId().contains(lengthClassesPmfmId); + return contains; + } + + @Override + public boolean containsAllLengthClassesPmfmId(Collection<String> lengthClassesPmfmId) { + boolean contains = getLengthClassesPmfmId().containsAll(lengthClassesPmfmId); + return contains; + } + + @Override + public List<String> getLengthClassesPmfmId() { + if (lengthClassesPmfmId == null) { + lengthClassesPmfmId = new LinkedList<String>(); + } + return lengthClassesPmfmId; +} + + @Override + public void setLengthClassesPmfmId(List<String> lengthClassesPmfmId) { + this.lengthClassesPmfmId = lengthClassesPmfmId; + } + + @Override + public String getIndividualObservationPmfmId(int index) { + String o = getChild(individualObservationPmfmId, index); + return o; + } + + @Override + public boolean isIndividualObservationPmfmIdEmpty() { + return individualObservationPmfmId == null || individualObservationPmfmId.isEmpty(); + } + + @Override + public int sizeIndividualObservationPmfmId() { + return individualObservationPmfmId == null ? 0 : individualObservationPmfmId.size(); + } + + @Override + public void addIndividualObservationPmfmId(String individualObservationPmfmId) { + getIndividualObservationPmfmId().add(individualObservationPmfmId); + } + + @Override + public void addAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { + getIndividualObservationPmfmId().addAll(individualObservationPmfmId); + } + + @Override + public boolean removeIndividualObservationPmfmId(String individualObservationPmfmId) { + boolean removed = getIndividualObservationPmfmId().remove(individualObservationPmfmId); + return removed; + } + + @Override + public boolean removeAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { + boolean removed = getIndividualObservationPmfmId().removeAll(individualObservationPmfmId); + return removed; + } + + @Override + public boolean containsIndividualObservationPmfmId(String individualObservationPmfmId) { + boolean contains = getIndividualObservationPmfmId().contains(individualObservationPmfmId); + return contains; + } + + @Override + public boolean containsAllIndividualObservationPmfmId(Collection<String> individualObservationPmfmId) { + boolean contains = getIndividualObservationPmfmId().containsAll(individualObservationPmfmId); + return contains; + } + + @Override + public List<String> getIndividualObservationPmfmId() { + if (individualObservationPmfmId == null) { + individualObservationPmfmId = new LinkedList<String>(); + } + return individualObservationPmfmId; +} + + @Override + public void setIndividualObservationPmfmId(List<String> individualObservationPmfmId) { + this.individualObservationPmfmId = individualObservationPmfmId; + } + + @Override + public Integer getVersion() { + return version; + } + + @Override + public void setVersion(Integer version) { + this.version = version; + } + + @Override + public String getImportColumns(int index) { + String o = getChild(importColumns, index); + return o; + } + + @Override + public boolean isImportColumnsEmpty() { + return importColumns == null || importColumns.isEmpty(); + } + + @Override + public int sizeImportColumns() { + return importColumns == null ? 0 : importColumns.size(); + } + + @Override + public void addImportColumns(String importColumns) { + getImportColumns().add(importColumns); + } + + @Override + public void addAllImportColumns(Collection<String> importColumns) { + getImportColumns().addAll(importColumns); + } + + @Override + public boolean removeImportColumns(String importColumns) { + boolean removed = getImportColumns().remove(importColumns); + return removed; + } + + @Override + public boolean removeAllImportColumns(Collection<String> importColumns) { + boolean removed = getImportColumns().removeAll(importColumns); + return removed; + } + + @Override + public boolean containsImportColumns(String importColumns) { + boolean contains = getImportColumns().contains(importColumns); + return contains; + } + + @Override + public boolean containsAllImportColumns(Collection<String> importColumns) { + boolean contains = getImportColumns().containsAll(importColumns); + return contains; + } + + @Override + public Collection<String> getImportColumns() { + if (importColumns == null) { + importColumns = new LinkedList<String>(); + } + return importColumns; +} + + @Override + public void setImportColumns(Collection<String> importColumns) { + this.importColumns = importColumns; + } + + @Override + public String getProgramId() { + return programId; + } + + @Override + public void setProgramId(String programId) { + this.programId = programId; + } + + @Override + public boolean isUseCalcifiedPieceSampling() { + return useCalcifiedPieceSampling; + } + + @Override + public void setUseCalcifiedPieceSampling(boolean useCalcifiedPieceSampling) { + this.useCalcifiedPieceSampling = useCalcifiedPieceSampling; + } + + @Override + public SpeciesProtocol3 getSpecies(int index) { + SpeciesProtocol3 o = getChild(species, index); + return o; + } + + @Override + public boolean isSpeciesEmpty() { + return species == null || species.isEmpty(); + } + + @Override + public int sizeSpecies() { + return species == null ? 0 : species.size(); + } + + @Override + public void addSpecies(SpeciesProtocol3 species) { + getSpecies().add(species); + } + + @Override + public void addAllSpecies(Collection<SpeciesProtocol3> species) { + getSpecies().addAll(species); + } + + @Override + public boolean removeSpecies(SpeciesProtocol3 species) { + boolean removed = getSpecies().remove(species); + return removed; + } + + @Override + public boolean removeAllSpecies(Collection<SpeciesProtocol3> species) { + boolean removed = getSpecies().removeAll(species); + return removed; + } + + @Override + public boolean containsSpecies(SpeciesProtocol3 species) { + boolean contains = getSpecies().contains(species); + return contains; + } + + @Override + public boolean containsAllSpecies(Collection<SpeciesProtocol3> species) { + boolean contains = getSpecies().containsAll(species); + return contains; + } + + @Override + public List<SpeciesProtocol3> getSpecies() { + if (species == null) { + species = new LinkedList<SpeciesProtocol3>(); + } + return species; +} + + @Override + public void setSpecies(List<SpeciesProtocol3> species) { + this.species = species; + } + + @Override + public SpeciesProtocol3 getBenthos(int index) { + SpeciesProtocol3 o = getChild(benthos, index); + return o; + } + + @Override + public boolean isBenthosEmpty() { + return benthos == null || benthos.isEmpty(); + } + + @Override + public int sizeBenthos() { + return benthos == null ? 0 : benthos.size(); + } + + @Override + public void addBenthos(SpeciesProtocol3 benthos) { + getBenthos().add(benthos); + } + + @Override + public void addAllBenthos(Collection<SpeciesProtocol3> benthos) { + getBenthos().addAll(benthos); + } + + @Override + public boolean removeBenthos(SpeciesProtocol3 benthos) { + boolean removed = getBenthos().remove(benthos); + return removed; + } + + @Override + public boolean removeAllBenthos(Collection<SpeciesProtocol3> benthos) { + boolean removed = getBenthos().removeAll(benthos); + return removed; + } + + @Override + public boolean containsBenthos(SpeciesProtocol3 benthos) { + boolean contains = getBenthos().contains(benthos); + return contains; + } + + @Override + public boolean containsAllBenthos(Collection<SpeciesProtocol3> benthos) { + boolean contains = getBenthos().containsAll(benthos); + return contains; + } + + @Override + public List<SpeciesProtocol3> getBenthos() { + if (benthos == null) { + benthos = new LinkedList<SpeciesProtocol3>(); + } + return benthos; +} + + @Override + public void setBenthos(List<SpeciesProtocol3> benthos) { + this.benthos = benthos; + } + + @Override + public CaracteristicMappingRow getCaracteristicMapping(int index) { + CaracteristicMappingRow o = getChild(caracteristicMapping, index); + return o; + } + + @Override + public boolean isCaracteristicMappingEmpty() { + return caracteristicMapping == null || caracteristicMapping.isEmpty(); + } + + @Override + public int sizeCaracteristicMapping() { + return caracteristicMapping == null ? 0 : caracteristicMapping.size(); + } + + @Override + public void addCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { + getCaracteristicMapping().add(caracteristicMapping); + } + + @Override + public void addAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { + getCaracteristicMapping().addAll(caracteristicMapping); + } + + @Override + public boolean removeCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { + boolean removed = getCaracteristicMapping().remove(caracteristicMapping); + return removed; + } + + @Override + public boolean removeAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { + boolean removed = getCaracteristicMapping().removeAll(caracteristicMapping); + return removed; + } + + @Override + public boolean containsCaracteristicMapping(CaracteristicMappingRow caracteristicMapping) { + boolean contains = getCaracteristicMapping().contains(caracteristicMapping); + return contains; + } + + @Override + public boolean containsAllCaracteristicMapping(Collection<CaracteristicMappingRow> caracteristicMapping) { + boolean contains = getCaracteristicMapping().containsAll(caracteristicMapping); + return contains; + } + + @Override + public List<CaracteristicMappingRow> getCaracteristicMapping() { + if (caracteristicMapping == null) { + caracteristicMapping = new LinkedList<CaracteristicMappingRow>(); + } + return caracteristicMapping; +} + + @Override + public void setCaracteristicMapping(List<CaracteristicMappingRow> caracteristicMapping) { + this.caracteristicMapping = caracteristicMapping; + } + + @Override + public OperationFieldMappingRow getOperationFieldMapping(int index) { + OperationFieldMappingRow o = getChild(operationFieldMapping, index); + return o; + } + + @Override + public boolean isOperationFieldMappingEmpty() { + return operationFieldMapping == null || operationFieldMapping.isEmpty(); + } + + @Override + public int sizeOperationFieldMapping() { + return operationFieldMapping == null ? 0 : operationFieldMapping.size(); + } + + @Override + public void addOperationFieldMapping(OperationFieldMappingRow operationFieldMapping) { + getOperationFieldMapping().add(operationFieldMapping); + } + + @Override + public void addAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping) { + getOperationFieldMapping().addAll(operationFieldMapping); + } + + @Override + public boolean removeOperationFieldMapping(OperationFieldMappingRow operationFieldMapping) { + boolean removed = getOperationFieldMapping().remove(operationFieldMapping); + return removed; + } + + @Override + public boolean removeAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping) { + boolean removed = getOperationFieldMapping().removeAll(operationFieldMapping); + return removed; + } + + @Override + public boolean containsOperationFieldMapping(OperationFieldMappingRow operationFieldMapping) { + boolean contains = getOperationFieldMapping().contains(operationFieldMapping); + return contains; + } + + @Override + public boolean containsAllOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping) { + boolean contains = getOperationFieldMapping().containsAll(operationFieldMapping); + return contains; + } + + @Override + public Collection<OperationFieldMappingRow> getOperationFieldMapping() { + if (operationFieldMapping == null) { + operationFieldMapping = new LinkedList<OperationFieldMappingRow>(); + } + return operationFieldMapping; +} + + @Override + public void setOperationFieldMapping(Collection<OperationFieldMappingRow> operationFieldMapping) { + this.operationFieldMapping = operationFieldMapping; + } + + @Override + public Zone getZone(int index) { + Zone o = getChild(zone, index); + return o; + } + + @Override + public boolean isZoneEmpty() { + return zone == null || zone.isEmpty(); + } + + @Override + public int sizeZone() { + return zone == null ? 0 : zone.size(); + } + + @Override + public void addZone(Zone zone) { + getZone().add(zone); + } + + @Override + public void addAllZone(Collection<Zone> zone) { + getZone().addAll(zone); + } + + @Override + public boolean removeZone(Zone zone) { + boolean removed = getZone().remove(zone); + return removed; + } + + @Override + public boolean removeAllZone(Collection<Zone> zone) { + boolean removed = getZone().removeAll(zone); + return removed; + } + + @Override + public boolean containsZone(Zone zone) { + boolean contains = getZone().contains(zone); + return contains; + } + + @Override + public boolean containsAllZone(Collection<Zone> zone) { + boolean contains = getZone().containsAll(zone); + return contains; + } + + @Override + public Collection<Zone> getZone() { + if (zone == null) { + zone = new LinkedList<Zone>(); + } + return zone; +} + + @Override + public void setZone(Collection<Zone> zone) { + this.zone = zone; + } + +} //AbstractTuttiProtocolBean -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit 1d1c47ba9e77f2bcfc0162dbed9d15217ec8def8 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 16:42:53 2016 +0100 Il faut n'autoriser que les taxons dont on a une méthode de mensuration renseigner et du coup il faut aussi demander une confirmation à l'utilisateur si il veut supprimer la méthode de mensuration dans l'onglet espèces (ou benthos) car cela va supprimer des lignes dans l'onglet algo (refs #8013) --- .../content/protocol/EditProtocolUIHandler.java | 96 ++++++++++++++++------ .../protocol/actions/AddBenthosProtocolAction.java | 3 +- .../protocol/actions/AddSpeciesProtocolAction.java | 3 +- .../actions/RemoveBenthosProtocolAction.java | 25 +----- .../actions/RemoveSpeciesProtocolAction.java | 26 +----- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 7 files changed, 82 insertions(+), 77 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index e22cfd2..5c48932 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -55,6 +55,7 @@ import fr.ifremer.tutti.ui.swing.content.home.actions.EditProtocolAction; import fr.ifremer.tutti.ui.swing.content.home.actions.ImportProtocolAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHelper; import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorRowModel; +import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorTableModel; import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI; import fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpCellEditor; import fr.ifremer.tutti.ui.swing.content.protocol.rtp.RtpCellRenderer; @@ -79,16 +80,16 @@ import org.jdesktop.swingx.decorator.Highlighter; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.jdesktop.swingx.table.TableColumnExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.AbstractApplicationUIHandler; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.application.swing.util.CloseableUI; import javax.swing.JComboBox; import javax.swing.JComponent; +import javax.swing.JOptionPane; import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.ListSelectionModel; -import javax.swing.event.CellEditorListener; -import javax.swing.event.ChangeEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; import javax.swing.table.DefaultTableCellRenderer; @@ -106,6 +107,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeSet; import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; @@ -658,6 +660,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI if (speciesRows1 != null) { protocolSpecies.addAll(speciesRows1.stream() + .filter(sp -> sp.getLengthStepPmfm() != null) .map(EditProtocolSpeciesRowModel::toSpeciesWithSurveyCode) .collect(Collectors.toList())); @@ -667,16 +670,17 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI if (benthosRows1 != null) { protocolSpecies.addAll(benthosRows1.stream() + .filter(sp -> sp.getLengthStepPmfm() != null) .map(EditProtocolSpeciesRowModel::toSpeciesWithSurveyCode) .collect(Collectors.toList())); } protocolSpecies.removeAll(getModel().getCpsRows() - .stream() - .map(CalcifiedPiecesSamplingEditorRowModel::getProtocolSpecies) - .map(EditProtocolSpeciesRowModel::getSpecies) - .collect(Collectors.toList())); + .stream() + .map(CalcifiedPiecesSamplingEditorRowModel::getProtocolSpecies) + .map(EditProtocolSpeciesRowModel::getSpecies) + .collect(Collectors.toList())); // Si on ne vide pas la liste et que les espèces sont égales (sur l'id), rien n'est changé calcifiedPiecesSamplingEditorUI.getSpeciesComboBox().setData(null); @@ -806,7 +810,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI Preconditions.checkNotNull(species, "Espèce inconnue : " + taxonIdStr); speciesSet.add(species); - EditProtocolSpeciesRowModel row = EditProtocolSpeciesTableModel.newRow(sampleCategoryModel); + EditProtocolSpeciesRowModel row = createNewProtocolSpeciesRow(); row.setSpecies(species); String lengthStepPmfmId = speciesProtocol.getLengthStepPmfmId(); @@ -862,6 +866,67 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI return result; } + public EditProtocolSpeciesRowModel createNewProtocolSpeciesRow() { + EditProtocolSpeciesRowModel result = EditProtocolSpeciesTableModel.newRow(sampleCategoryModel); + + result.addPropertyChangeListener(EditProtocolSpeciesRowModel.PROPERTY_LENGTH_STEP_PMFM, evt -> { + + Caracteristic newValue = (Caracteristic) evt.getNewValue(); + if (newValue == null) { + + result.setIndividualObservationEnabled(false); + + List<CalcifiedPiecesSamplingEditorRowModel> speciesCpsRows = + getModel().getCpsRows() + .stream() + .filter(row -> row.getProtocolSpecies().equals(result)) + .collect(Collectors.toList()); + + if (!speciesCpsRows.isEmpty()) { + String htmlMessage = String.format( + AbstractApplicationUIHandler.CONFIRMATION_FORMAT, + t("tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.message"), + t("jaxx.application.common.askBeforeDelete.help")); + int i = JOptionPane.showConfirmDialog( + getUI(), + htmlMessage, + t("tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.QUESTION_MESSAGE); + + boolean deleteCpsRows = i == JOptionPane.OK_OPTION; + + if (deleteCpsRows) { + + deleteCpsRows(speciesCpsRows); + + } else { + + result.setLengthStepPmfm((Caracteristic) evt.getOldValue()); + + } + } + } + }); + return result; + } + + public void deleteCpsRows(Collection<CalcifiedPiecesSamplingEditorRowModel> cpsRowsToDelete) { + + CalcifiedPiecesSamplingEditorUI cpsEditor = getUI().getCalcifiedPiecesSamplingEditorUI(); + + List<CalcifiedPiecesSamplingEditorRowModel> cpsRows = getModel().getCpsRows(); + + TreeSet<Integer> indexesToDelete = + new TreeSet<>(cpsRowsToDelete.stream().map(cpsRows::indexOf).collect(Collectors.toSet())); + + cpsRows.removeAll(cpsRowsToDelete); + + CalcifiedPiecesSamplingEditorTableModel cpsTableModel = + (CalcifiedPiecesSamplingEditorTableModel) cpsEditor.getCpsTable().getModel(); + cpsTableModel.fireTableRowsDeleted(indexesToDelete.first(), indexesToDelete.last()); + } + public List<EditProtocolCaracteristicsRowModel> toProtocolCaracteristicRows(List<CaracteristicMappingRow> caracteristicMappingRows) { BeanFilterableComboBox<Caracteristic> caracteristicMappingComboBox = ui.getCaracteristicMappingComboBox(); Preconditions.checkNotNull(caracteristicMappingComboBox.getData()); @@ -1095,23 +1160,6 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI ObjectToStringConverter converter = BeanUIUtil.newDecoratedObjectToStringConverter(decorator); BeanUIUtil.decorate(comboBox, converter); ComboBoxCellEditor editor = new ComboBoxCellEditor(comboBox); - editor.addCellEditorListener(new CellEditorListener() { - - @Override - public void editingStopped(ChangeEvent e) { - EditProtocolSpeciesTableModel tableModel = (EditProtocolSpeciesTableModel) table.getModel(); - EditProtocolSpeciesRowModel selectedRow = tableModel.getRows().get(table.convertRowIndexToModel(table.getSelectedRow())); - Caracteristic lengthStepPmfm = selectedRow.getLengthStepPmfm(); - if (lengthStepPmfm == null) { - selectedRow.setIndividualObservationEnabled(false); - } - } - - @Override - public void editingCanceled(ChangeEvent e) { - - } - }); addColumnToModel(model, editor, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java index 0679e29..f111cfa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddBenthosProtocolAction.java @@ -60,7 +60,6 @@ public class AddBenthosProtocolAction extends LongActionSupport<EditProtocolUIMo EditProtocolUI ui = getUI(); - EditProtocolSpeciesTableModel tableModel = handler.getBenthosTableModel(); BeanFilterableComboBox<Species> benthosComboBox = ui.getBenthosComboBox(); species = (Species) benthosComboBox.getSelectedItem(); @@ -77,7 +76,7 @@ public class AddBenthosProtocolAction extends LongActionSupport<EditProtocolUIMo getModel().getAllSynonyms().removeAll(allSynonyms); // add new row to model (do it after combo stuff for ui best display) - newRow = tableModel.createNewRow(); + newRow = handler.createNewProtocolSpeciesRow(); newRow.setSpecies(species); getModel().getBenthosRow().add(newRow); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java index 0c73a65..9428894 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/AddSpeciesProtocolAction.java @@ -58,7 +58,6 @@ public class AddSpeciesProtocolAction extends LongActionSupport<EditProtocolUIMo EditProtocolUI ui = getUI(); - EditProtocolSpeciesTableModel tableModel = handler.getSpeciesTableModel(); BeanFilterableComboBox<Species> speciesComboBox = ui.getSpeciesComboBox(); species = (Species) speciesComboBox.getSelectedItem(); @@ -75,7 +74,7 @@ public class AddSpeciesProtocolAction extends LongActionSupport<EditProtocolUIMo getModel().getAllSynonyms().removeAll(allSynonyms); // add new row to model (do it after combo stuff for ui best display) - newRow = tableModel.createNewRow(); + newRow = handler.createNewProtocolSpeciesRow(); newRow.setSpecies(species); getModel().getSpeciesRow().add(newRow); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java index 3152a8a..ea0a8d5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveBenthosProtocolAction.java @@ -33,8 +33,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorRowModel; -import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorTableModel; -import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import jaxx.runtime.SwingUtil; @@ -43,7 +41,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; -import java.util.TreeSet; import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -158,8 +155,7 @@ public class RemoveBenthosProtocolAction extends LongActionSupport<EditProtocolU // remove the protocolSpecies from the cps table or combobox if (!cpsRowsToDelete.isEmpty()) { - updateCpsTable(); - updateCpsEditorCombo(); + handler.deleteCpsRows(cpsRowsToDelete); } // fire table data changed @@ -172,23 +168,4 @@ public class RemoveBenthosProtocolAction extends LongActionSupport<EditProtocolU sendMessage(t("tutti.flash.info.benthos.remove.from.protocol")); } - protected void updateCpsEditorCombo() { - CalcifiedPiecesSamplingEditorUI cpsEditor = getUI().getCalcifiedPiecesSamplingEditorUI(); - cpsEditor.getSpeciesComboBox().removeItems(removedSpecies); - } - - protected void updateCpsTable() { - CalcifiedPiecesSamplingEditorUI cpsEditor = getUI().getCalcifiedPiecesSamplingEditorUI(); - - List<CalcifiedPiecesSamplingEditorRowModel> cpsRows = getModel().getCpsRows(); - - TreeSet<Integer> indexesToDelete = - new TreeSet<>(cpsRowsToDelete.stream().map(cpsRows::indexOf).collect(Collectors.toSet())); - - cpsRows.removeAll(cpsRowsToDelete); - - CalcifiedPiecesSamplingEditorTableModel cpsTableModel = - (CalcifiedPiecesSamplingEditorTableModel) cpsEditor.getCpsTable().getModel(); - cpsTableModel.fireTableRowsDeleted(indexesToDelete.first(), indexesToDelete.last()); - } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java index 4d5754d..e9bff10 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/RemoveSpeciesProtocolAction.java @@ -33,8 +33,6 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorRowModel; -import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorTableModel; -import fr.ifremer.tutti.ui.swing.content.protocol.calcifiedpiecessampling.CalcifiedPiecesSamplingEditorUI; import fr.ifremer.tutti.ui.swing.util.actions.LongActionSupport; import jaxx.runtime.SwingUtil; @@ -43,7 +41,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; -import java.util.TreeSet; import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.t; @@ -155,8 +152,7 @@ public class RemoveSpeciesProtocolAction extends LongActionSupport<EditProtocolU // remove the protocolSpecies from the cps table or combobox if (!cpsRowsToDelete.isEmpty()) { - updateCpsTable(); - updateCpsEditorCombo(); + handler.deleteCpsRows(cpsRowsToDelete); } // fire table data changed @@ -169,24 +165,4 @@ public class RemoveSpeciesProtocolAction extends LongActionSupport<EditProtocolU sendMessage(t("tutti.flash.info.species.remove.from.protocol")); } - protected void updateCpsEditorCombo() { - CalcifiedPiecesSamplingEditorUI cpsEditor = getUI().getCalcifiedPiecesSamplingEditorUI(); - cpsEditor.getSpeciesComboBox().removeItems(removedSpecies); - } - - protected void updateCpsTable() { - CalcifiedPiecesSamplingEditorUI cpsEditor = getUI().getCalcifiedPiecesSamplingEditorUI(); - - List<CalcifiedPiecesSamplingEditorRowModel> cpsRows = getModel().getCpsRows(); - - TreeSet<Integer> indexesToDelete = - new TreeSet<>(cpsRowsToDelete.stream().map(cpsRows::indexOf).collect(Collectors.toSet())); - - cpsRows.removeAll(cpsRowsToDelete); - - CalcifiedPiecesSamplingEditorTableModel cpsTableModel = - (CalcifiedPiecesSamplingEditorTableModel) cpsEditor.getCpsTable().getModel(); - cpsTableModel.fireTableRowsDeleted(indexesToDelete.first(), indexesToDelete.last()); - } - } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index 1f79785..f717239 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -3,6 +3,7 @@ application.action.create.error= application.error.ui.business.warning= jaxx.application.action.create.error= +jaxx.application.common.askBeforeDelete.help= left= next= right= @@ -1116,6 +1117,8 @@ tutti.editProtocol.action.removeBenthosProtocol.tip= tutti.editProtocol.action.removeCaracteristicMapping= tutti.editProtocol.action.removeCaracteristicMapping.mnemonic= tutti.editProtocol.action.removeCaracteristicMapping.tip= +tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.message= +tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.title= tutti.editProtocol.action.removeSpeciesProtocol= tutti.editProtocol.action.removeSpeciesProtocol.mnemonic= tutti.editProtocol.action.removeSpeciesProtocol.removeCpsRows.message= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index aff2d0e..3838522 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1,6 +1,7 @@ application.action.create.error= application.error.ui.business.warning= jaxx.application.action.create.error= +jaxx.application.common.askBeforeDelete.help= swing.error.cannot.open.file=Aucun programme n'est défini pour ouvrir ce type de fichier. Enregistrez le fichier et ouvrez le en dehors de l'application tutti.about.bottomText=Copyright %s - %s - version %s tutti.about.message=<h3>Allegro Campagne</h3><p><strong>Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques.</strong></p><br/><p>Ce logiciel permettra la saisie en mer des données d'opération de pêche (positions, environnement, engin, etc) et des captures associées (composition de la capture en espèces scientifiques avec poids, nombres, tailles etc) pour l'ensemble des campagnes halieutiques réalisées par l'Ifremer.</p><p>Ce projet a été initiée en [...] @@ -1065,6 +1066,8 @@ tutti.editProtocol.action.removeBenthosProtocol.tip=Supprimer les les espèces d tutti.editProtocol.action.removeCaracteristicMapping=Supprimer les caractéristiques tutti.editProtocol.action.removeCaracteristicMapping.mnemonic=S tutti.editProtocol.action.removeCaracteristicMapping.tip=Supprimer les caractéristiques sélectionnés +tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.message=Vous avez paramétré les prélèvement de pièces calcifiées pour cette espèce.<br/>Seules les espèces avec une méthode de mensurations peuvent être dans l'algorithme de prélèvement des pièces calcifiées.<br/>Si vous supprimer la méthode de mensuration de cette espèce, elle sera supprimée du tableau de prélèvement des pièces calcifiées. +tutti.editProtocol.action.removeLengthStepPmfm.removeCpsRows.title=Espèce présente dans les prélèvements de pièces calcifiées tutti.editProtocol.action.removeSpeciesProtocol=Supprimer les espèces tutti.editProtocol.action.removeSpeciesProtocol.mnemonic=S tutti.editProtocol.action.removeSpeciesProtocol.removeCpsRows.message=Des espèces à supprimer sont présentes dans le tableau de prélèvement des pièces calcifiées.<br/>Si vous les supprimer du protocole, elles seront également supprimées du tableau de prélèvement des pièces calcifiées. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit f44790fa43297bfa7412fead2db47f25d9af1223 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 17:20:24 2016 +0100 coorection de la validité des lignes (refs #8013) --- .../ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java | 1 + .../calcifiedpiecessampling/actions/ImportProtocolCpsAction.java | 1 + 2 files changed, 2 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 2171c97..d562d7a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -842,6 +842,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI CalcifiedPiecesSamplingEditorRowModel cpsRow = new CalcifiedPiecesSamplingEditorRowModel(); cpsRow.fromEntity(def); cpsRow.setProtocolSpecies(row); + cpsRow.setValid(true); cpsRows.add(cpsRow); }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java index 594cc0f..a6cc75f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ImportProtocolCpsAction.java @@ -142,6 +142,7 @@ public class ImportProtocolCpsAction extends LongActionSupport<EditProtocolUIMod CalcifiedPiecesSamplingEditorRowModel cpsRow = new CalcifiedPiecesSamplingEditorRowModel(); cpsRow.fromEntity(def); cpsRow.setProtocolSpecies(rowsByRefTaxId.get(speciesProtocol.getSpeciesReferenceTaxonId())); + cpsRow.setValid(true); cpsRows.add(cpsRow); }); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch feature/8013 in repository tutti. See http://git.codelutin.com/tutti.git commit 9bcc6d4ff4907b37c735ca815d4f54c52af2fbef Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 24 17:28:04 2016 +0100 modif du nom par défaut des fichiers d'export (refs #8013) --- .../ui/swing/content/protocol/actions/ExportAllCaracteristicAction.java | 2 +- .../ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java | 2 +- .../content/protocol/actions/ExportProtocolCaracteristicAction.java | 2 +- .../ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java | 2 +- .../tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java | 2 +- .../calcifiedpiecessampling/actions/ExportProtocolCpsAction.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportAllCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportAllCaracteristicAction.java index e496ef4..a638635 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportAllCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportAllCaracteristicAction.java @@ -62,7 +62,7 @@ public class ExportAllCaracteristicAction extends LongActionSupport<EditProtocol // choose file to export file = saveFile( - "tuttiProtocol-" + getModel().getName() + "-allCaracteristics", + getModel().getName() + "-allCaracteristics", "csv", t("tutti.editProtocol.title.choose.caracteristicExportFile"), t("tutti.editProtocol.action.exportProtocolCaracteristicFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java index 37af49c..a42f463 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolBenthosAction.java @@ -66,7 +66,7 @@ public class ExportProtocolBenthosAction extends LongActionSupport<EditProtocolU // choose file to export file = saveFile( - "tuttiProtocol-" + getModel().getName() + "-benthos", + getModel().getName() + "-benthos", "csv", t("tutti.editProtocol.title.choose.benthosExportFile"), t("tutti.editProtocol.action.exportProtocolBenthosFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java index cc77055..6efc909 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolCaracteristicAction.java @@ -63,7 +63,7 @@ public class ExportProtocolCaracteristicAction extends LongActionSupport<EditPro // choose file to export file = saveFile( - "tuttiProtocol-" + getModel().getName() + "-caracteristics", + getModel().getName() + "-caracteristics", "csv", t("tutti.editProtocol.title.choose.caracteristicExportFile"), t("tutti.editProtocol.action.exportProtocolCaracteristicFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java index 09050c3..f2026da 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportProtocolSpeciesAction.java @@ -66,7 +66,7 @@ public class ExportProtocolSpeciesAction extends LongActionSupport<EditProtocolU // choose file to export file = saveFile( - "tuttiProtocol-" + getModel().getName() + "-species", + getModel().getName() + "-species", "csv", t("tutti.editProtocol.title.choose.speciesExportFile"), t("tutti.editProtocol.action.exportProtocolSpeciesFile"), diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java index 6097ff3..b4cad95 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/ExportPupitriAction.java @@ -66,7 +66,7 @@ public class ExportPupitriAction extends LongActionSupport<EditProtocolUIModel, // choose file to export file = saveFile( - "tuttiProtocol-" + getModel().getName() + "-pupitri", + getModel().getName() + "-pupitri", "csv", t("tutti.editProtocol.title.choose.speciesExportFile"), t("tutti.editProtocol.action.exportProtocolSpeciesFile") diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java index 944694b..2e97311 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/calcifiedpiecessampling/actions/ExportProtocolCpsAction.java @@ -69,7 +69,7 @@ public class ExportProtocolCpsAction extends LongActionSupport<EditProtocolUIMod // choose file to export file = saveFile( - "tuttiProtocol-" + getModel().getName() + "-cps", + getModel().getName() + "-cps", "csv", t("tutti.editProtocol.title.choose.cpsExportFile"), t("tutti.editProtocol.action.exportProtocolCpsFile"), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.