From f6e78f3bc02f0295555b29b2ee7d67d6613a2d41 Mon Sep 17 00:00:00 2001 From: Cristina Alvarino Date: Fri, 15 Jul 2011 08:51:44 +0200 Subject: [PATCH] Add "throws InstanceNotFoundException" to delete method and catch the exception into confirmDelete method --- .../org/navalplanner/web/common/BaseCRUDController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java index b8408629d..bf9a8d880 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/BaseCRUDController.java @@ -23,6 +23,7 @@ import static org.navalplanner.web.I18nHelper._; import org.apache.commons.lang.StringUtils; import org.navalplanner.business.common.IHumanIdentifiable; +import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.util.GenericForwardComposer; @@ -319,6 +320,11 @@ public abstract class BaseCRUDController extends } } catch (InterruptedException e) { throw new RuntimeException(e); + } catch (InstanceNotFoundException ie) { + messagesForUser.showMessage( + Level.ERROR, + _("{0} \"{1}\" could not be deleted, it was already removed", getEntityType(), + entity.getHumanId())); } } @@ -343,6 +349,6 @@ public abstract class BaseCRUDController extends * @param entity * Entity to be removed */ - protected abstract void delete(T entity); + protected abstract void delete(T entity) throws InstanceNotFoundException; }