# HG changeset patch # User Raimund Renkert # Date 1372680980 -7200 # Node ID bf7488ec0e8d3ff1c8023d49b526792e6bc73e4a # Parent e9e83fa2a4ae9ec52a70f11e40eac9a3695ceda5 Added method to delete objects from database. diff -r e9e83fa2a4ae -r bf7488ec0e8d src/main/java/de/intevation/lada/manage/DataManager.java --- a/src/main/java/de/intevation/lada/manage/DataManager.java Mon Jul 01 14:15:00 2013 +0200 +++ b/src/main/java/de/intevation/lada/manage/DataManager.java Mon Jul 01 14:16:20 2013 +0200 @@ -41,7 +41,9 @@ @Override @TransactionAttribute(TransactionAttributeType.REQUIRED) - public void delete(String id, Class clazz) throws Exception { - + public void delete(Object object) + throws IllegalArgumentException, + TransactionRequiredException { + em.remove(em.contains(object) ? object : em.merge(object)); } } diff -r e9e83fa2a4ae -r bf7488ec0e8d src/main/java/de/intevation/lada/manage/Manager.java --- a/src/main/java/de/intevation/lada/manage/Manager.java Mon Jul 01 14:15:00 2013 +0200 +++ b/src/main/java/de/intevation/lada/manage/Manager.java Mon Jul 01 14:16:20 2013 +0200 @@ -25,5 +25,7 @@ TransactionRequiredException; @TransactionAttribute(TransactionAttributeType.REQUIRED) - public void delete(String id, Class clazz) throws Exception; + public void delete(Object object) + throws IllegalArgumentException, + TransactionRequiredException; }