Author: tchemit Date: 2011-10-19 18:07:41 +0200 (Wed, 19 Oct 2011) New Revision: 2359 Url: http://nuiton.org/repositories/revision/topia/2359 Log: Evolution #1778: Do not generate delete method in DAOAbstract if not needed Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-17 07:55:21 UTC (rev 2358) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-19 16:07:41 UTC (rev 2359) @@ -49,7 +49,6 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; -import java.net.URL; import java.security.Permission; import java.util.ArrayList; import java.util.Collection; @@ -551,11 +550,7 @@ protected void generateDelete(ObjectModelClass clazz, ObjectModelClass result) { - ObjectModelOperation op; - op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); - addAnnotation(result, op,Override.class.getSimpleName()); - addException(op, TopiaException.class); - addParameter(op, "E", "entity"); + StringBuilder body = new StringBuilder(); String modelName = StringUtils.capitalize(model.getName()); String providerFQN = getOutputProperties().getProperty( @@ -682,13 +677,24 @@ } } - body.append("" + + if (body.length()>0) { + // something specific was done, need to generate the method + ObjectModelOperation op; + op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); + addAnnotation(result, op,Override.class.getSimpleName()); + addException(op, TopiaException.class); + addParameter(op, "E", "entity"); + body.append("" /*{ super.delete(entity); }*/ ); + setOperationBody(op, body.toString()); + } - setOperationBody(op, body.toString()); + + } protected void generateFindUsages(ObjectModelClass clazz,