Index: topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.7 topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.8 --- topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java:1.7 Fri Mar 31 12:19:07 2006 +++ topia2/src/java/org/codelutin/topia/generator/DAOHelperGenerator.java Fri Mar 31 13:22:12 2006 @@ -25,9 +25,9 @@ * * @author Arnaud Thimel * - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ * - * Mise a jour: $Date: 2006/03/31 12:19:07 $ par : $Author: thimel $ + * Mise a jour: $Date: 2006/03/31 13:22:12 $ par : $Author: thimel $ */ package org.codelutin.topia.generator; @@ -41,7 +41,8 @@ import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; -import org.codelutin.generator.models.object.ObjectModelClassifier; + +import static org.codelutin.topia.generator.GeneratorUtil.STEREOTYPE_ENTITY; /** * Ce generateur permet d'avoir une classe permettant de recuperer les DAO @@ -78,7 +79,7 @@ }*/ for (Iterator i=model.getClasses().iterator(); i.hasNext();) { ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(!clazz.isAbstract() && clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)){ + if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ /*{ "<%=GeneratorUtil.getDOType(clazz, model)%><%=(i.hasNext()?",\" +":"\";")%> }*/ } @@ -88,7 +89,7 @@ }*/ for (Iterator i=model.getClasses().iterator(); i.hasNext();) { ObjectModelClass clazz = (ObjectModelClass)i.next(); - if (!clazz.isAbstract() && clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)){ + if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ /*{ <%=GeneratorUtil.getDOType(clazz, model)%>.class, }*/ } @@ -102,7 +103,7 @@ }*/ for (Iterator i=model.getClasses().iterator(); i.hasNext();) { ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(!clazz.isAbstract() && clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY)){ + if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ /*{ static public <%=clazz.getQualifiedName()%>DAO get<%=clazz.getName()%>DAO(TopiaContext context) throws TopiaException { TopiaContextImplementor ci = (TopiaContextImplementor)context;