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 9547ab18ccd9f458f8af63aab51cdb8e7cccb66c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 10:31:31 2015 +0100 refs #6805 recharcher les données après un remplacement de donnée temporaire --- .../java/fr/ifremer/tutti/service/TuttiDataContext.java | 13 ++++++++++++- .../replace/actions/AbstractReplaceTemporaryUIAction.java | 13 +++++++++++++ .../replace/actions/ReplaceTemporaryGearAction.java | 7 +++++++ .../replace/actions/ReplaceTemporaryPersonAction.java | 7 +++++++ .../replace/actions/ReplaceTemporarySpeciesAction.java | 6 ++++++ .../replace/actions/ReplaceTemporaryVesselAction.java | 7 +++++++ 6 files changed, 52 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java index fb6f415..52b26f8 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiDataContext.java @@ -505,7 +505,7 @@ public class TuttiDataContext extends AbstractBean implements Closeable { Preconditions.checkState(isCruiseFilled()); String id = getCruiseId(); if (log.isInfoEnabled()) { - log.info("Loading cruise: " + id); + log.info("Reloading cruise: " + id); } cruise = service.getCruise(id); return cruise; @@ -550,6 +550,17 @@ public class TuttiDataContext extends AbstractBean implements Closeable { return fishingOperation; } + public FishingOperation reloadFishingOperation() { + checkOpened(); + Preconditions.checkState(isFishingOperationFilled()); + String id = getFishingOperationId(); + if (log.isInfoEnabled()) { + log.info("Reloading fishingOperation: " + id); + } + fishingOperation = service.getFishingOperation(id); + return fishingOperation ; + } + public List<Caracteristic> getCaracteristics() { checkOpened(); if (caracteristics == null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java index a1a212f..6365ec4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/AbstractReplaceTemporaryUIAction.java @@ -130,4 +130,17 @@ public abstract class AbstractReplaceTemporaryUIAction<E extends TuttiReferentia } + + protected void reloadCruise() { + if (getDataContext().isCruiseFilled()) { + getDataContext().reloadCruise(); + } + } + + protected void reloadFishingOperation() { + if (getDataContext().isFishingOperationFilled()) { + getDataContext().reloadFishingOperation(); + } + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java index a4b06d5..6cbbd66 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryGearAction.java @@ -62,4 +62,11 @@ public class ReplaceTemporaryGearAction extends AbstractReplaceTemporaryUIAction persistenceService.replaceGear(source, target, delete); } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadCruise(); + reloadFishingOperation(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java index 0428e77..716a882 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryPersonAction.java @@ -62,4 +62,11 @@ public class ReplaceTemporaryPersonAction extends AbstractReplaceTemporaryUIActi persistenceService.replacePerson(source, target, delete); } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadCruise(); + reloadFishingOperation(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java index aeb8449..651d871 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporarySpeciesAction.java @@ -63,4 +63,10 @@ public class ReplaceTemporarySpeciesAction extends AbstractReplaceTemporaryUIAct } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadFishingOperation(); + } + } \ No newline at end of file diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java index 6d8f22a..9f548dc 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/replace/actions/ReplaceTemporaryVesselAction.java @@ -62,4 +62,11 @@ public class ReplaceTemporaryVesselAction extends AbstractReplaceTemporaryUIActi persistenceService.replaceVessel(source, target, delete); } + @Override + public void postSuccessAction() { + super.postSuccessAction(); + reloadCruise(); + reloadFishingOperation(); + } + } \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.