This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 75d034868f81adea31fa77afc1cdb65744b5e3e5 Author: Kevin Morin <morin@codelutin.com> Date: Mon Oct 27 17:29:24 2014 +0100 refs #5997 [IMPORT] Améliorer la gestion des référentiels temporaires --- .../persistence/service/ReferentialPersistenceService.java | 14 +++++++++----- .../referential/replace/AbstractReplaceTemporaryUI.css | 7 +++++++ .../referential/replace/AbstractReplaceTemporaryUI.jaxx | 7 +++++++ .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java index d7a2795..4bdcc19 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java @@ -326,7 +326,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm * @since 3.6 */ @Transactional(readOnly = false) - @CacheEvict(value = "fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", allEntries = true) + @CacheEvict(value = {"fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", "gears"}, allEntries = true) void replaceGear(Gear source, Gear target, boolean delete); /** @@ -339,7 +339,9 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm * @since 3.6 */ @Transactional(readOnly = false) - @CacheEvict(value = "fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", allEntries = true) + @CacheEvict(value = {"fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", + "species", "referentSpecies", "referentSpeciesById", "referentSpeciesByIdVernacular"}, + allEntries = true) void replaceSpecies(Species source, Species target, boolean delete); /** @@ -352,7 +354,8 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm * @since 3.6 */ @Transactional(readOnly = false) - @CacheEvict(value = "fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", allEntries = true) + @CacheEvict(value = {"fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", "persons", "personById"}, + allEntries = true) void replacePerson(Person source, Person target, boolean delete); /** @@ -365,7 +368,8 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm * @since 3.6 */ @Transactional(readOnly = false) - @CacheEvict(value = "fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", allEntries = true) + @CacheEvict(value = {"fr.ifremer.adagio.core.dao.data.batch.CatchBatchCache", "fishingVessels", "vesselByCode"}, + allEntries = true) void replaceVessel(Vessel source, Vessel target, boolean delete); /** @@ -382,7 +386,7 @@ public interface ReferentialPersistenceService extends TuttiPersistenceServiceIm /** * Delete the temporary gears with the given {@code idss}. * - * @param id ids of the gears to remove + * @param ids ids of the gears to remove * @param checkIfUsed to check if gear is used before trying to delete it * @since 3.8 */ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css index de63f29..82bcf0c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.css @@ -59,6 +59,13 @@ BeanFilterableComboBox { _help: {"tutti.replaceTemporaryReferential.field.targetList.help"}; } +#deleteCheckBox { + text: "tutti.replaceTemporaryReferential.field.delete"; + selected: {model.isDelete()}; + toolTipText: "tutti.replaceTemporaryReferential.field.delete.tip"; + _help: {"tutti.replaceTemporaryReferential.field.delete.help"}; +} + #replaceButton { actionIcon: replace; text: "tutti.replaceTemporaryReferential.action.replace"; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx index f9c0e40..18e8810 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/AbstractReplaceTemporaryUI.jaxx @@ -71,6 +71,13 @@ </row> <row> + <cell anchor="west" fill="both" columns="2"> + <JCheckBox id='deleteCheckBox' + onItemStateChanged='model.setDelete(event.getStateChange() == ItemEvent.SELECTED)'/> + </cell> + </row> + + <row> <cell columns='2' fill='both'> <JSeparator/> </cell> 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 b9b2c86..7ce6de1 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 @@ -1561,6 +1561,8 @@ tutti.replaceTemporaryReferential.action.cancel.tip= tutti.replaceTemporaryReferential.action.replace= tutti.replaceTemporaryReferential.action.replace.mnemonic= tutti.replaceTemporaryReferential.action.replace.tip= +tutti.replaceTemporaryReferential.field.delete= +tutti.replaceTemporaryReferential.field.delete.tip= tutti.replaceTemporaryReferential.field.sourceList= tutti.replaceTemporaryReferential.field.sourceList.tip= tutti.replaceTemporaryReferential.field.targetList= 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 fe489f8..72597ac 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 @@ -1491,6 +1491,8 @@ tutti.replaceTemporaryReferential.action.cancel.tip=Annuler le remplacement tutti.replaceTemporaryReferential.action.replace=Remplacer tutti.replaceTemporaryReferential.action.replace.mnemonic=R tutti.replaceTemporaryReferential.action.replace.tip=Remplacer le référentiel temporaire sélectionné +tutti.replaceTemporaryReferential.field.delete=Supprimer la donnée temporaire après le remplacement +tutti.replaceTemporaryReferential.field.delete.tip=Supprimer la donnée temporaire après le remplacement tutti.replaceTemporaryReferential.field.sourceList=Référentiel temporaire tutti.replaceTemporaryReferential.field.sourceList.tip=Sélectionner le référentiel temporaire à remplacer tutti.replaceTemporaryReferential.field.targetList=Référentiel officiel -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.