From bc951b612ca9fd810b9d90830dc8ea56be9dbe4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Tue, 16 Mar 2010 12:44:56 +0100
Subject: [PATCH] ItEr51S04ValidacionEProbasFuncionaisItEr50S04: Removing
 manual signaling of detection of ConcurrentModification.

It was added applying transparent proxies on after compose. A less
intrusive technique is required.
---
 .../ConcurrentModificationDetector.java       | 51 -------------------
 .../worker/WorkerCRUDController.java          |  4 --
 2 files changed, 55 deletions(-)
 delete mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java
deleted file mode 100644
index 84e40c1c8..000000000
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * This file is part of NavalPlan
- *
- * Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
- *                    Desenvolvemento Tecnolóxico de Galicia
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.navalplanner.web.common;
-
-import org.navalplanner.web.common.ExceptionCatcherProxy.IExceptionHandler;
-import org.springframework.dao.OptimisticLockingFailureException;
-
-public class ConcurrentModificationDetector {
-
-    private ConcurrentModificationDetector() {
-    }
-
-    public static <T> T addAutomaticHandlingOfConcurrentModification(Class<T> interfaceClass,
-            T model, final String backURL) {
-        IExceptionHandler<OptimisticLockingFailureException> handler = createHandler(backURL);
-        return ExceptionCatcherProxy.doCatchFor(interfaceClass).when(
-                OptimisticLockingFailureException.class, handler)
-                .applyTo(model);
-    }
-
-    private static IExceptionHandler<OptimisticLockingFailureException> createHandler(
-            final String backURL) {
-        return new IExceptionHandler<OptimisticLockingFailureException>() {
-
-            @Override
-            public void onException(OptimisticLockingFailureException exception) {
-                ConcurrentModificationController.showException(exception,
-                        backURL);
-            }
-        };
-    }
-
-}
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 c3cce9297..c5264dc9c 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
@@ -21,7 +21,6 @@
 package org.navalplanner.web.resources.worker;
 
 import static org.navalplanner.web.I18nHelper._;
-import static org.navalplanner.web.common.ConcurrentModificationDetector.addAutomaticHandlingOfConcurrentModification;
 
 import java.util.Date;
 import java.util.List;
@@ -269,9 +268,6 @@ public class WorkerCRUDController extends GenericForwardComposer implements
     @Override
     public void doAfterCompose(Component comp) throws Exception {
         super.doAfterCompose(comp);
-        this.workerModel = addAutomaticHandlingOfConcurrentModification(
-                IWorkerModel.class, this.workerModel,
-                "/resources/worker/worker.zul");
         localizationsForEditionController = createLocalizationsController(comp,
                 "editWindow");
         localizationsForCreationController = createLocalizationsController(