From cf65db023050d60feb38933d6c00a7aa5e0381a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 10 Aug 2009 17:50:23 +0200 Subject: [PATCH] ItEr20S04ArquitecturaServidorItEr19S04: Adding automatic OptimistLockingFailureException handling to WorkerCRUDController. --- .../web/resources/worker/WorkerCRUDController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java index fdf481aca..eaae57aed 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java @@ -1,12 +1,13 @@ package org.navalplanner.web.resources.worker; +import static org.navalplanner.web.common.ConcurrentModificationDetector.detectConcurrentModification; + import java.util.List; import org.hibernate.validator.InvalidValue; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.resources.entities.CriterionSatisfaction; import org.navalplanner.business.resources.entities.Worker; -import org.navalplanner.business.resources.services.ICriterionService; import org.navalplanner.web.common.IMessagesForUser; import org.navalplanner.web.common.Level; import org.navalplanner.web.common.MessagesForUser; @@ -155,6 +156,8 @@ public class WorkerCRUDController extends GenericForwardComposer implements @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); + this.workerModel = detectConcurrentModification(IWorkerModel.class, + this.workerModel, "/resources/worker/worker.zul"); localizationsForEditionController = createLocalizationsController(comp, "editWindow"); localizationsForCreationController = createLocalizationsController(