Author: tchemit Date: 2008-10-23 22:00:21 +0000 (Thu, 23 Oct 2008) New Revision: 1193 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java Log: fix bug when no entity defined in model + improve and clean code Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) @@ -80,38 +80,38 @@ public class <%=model.getName()%>DAOHelper { +}*/ + String entitiesList = ""; + if (model.getClasses().isEmpty()) { +/*{ + public static final String entitiesList = ""; + public static final Class [] entitiesClasses = new Class []{}; +}*/ + } else { +/*{ public static final String entitiesList = "" + }*/ - String entitiesList = ""; - for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ - entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); + + for (Iterator i=model.getClasses().iterator(); i.hasNext();) { + ObjectModelClass clazz = (ObjectModelClass)i.next(); + if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ + entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); /*{ "<%=GeneratorUtil.getDOType(clazz, model)%><%=(i.hasNext()?",\" +":"\";")%> }*/ + } } } -// log.info("Full entities list : " + entitiesList); -/* - public static final Class [] entitiesClasses = new Class []{ - */ - //for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - // ObjectModelClass clazz = (ObjectModelClass)i.next(); - // if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ -/* <%=GeneratorUtil.getDOType(clazz, model)%>.class, -*/ - // } - //} -// }; - + if (log.isDebugEnabled()) { + log.debug("Full entities list : " + entitiesList); + } /*{ /** *) protected <%=model.getName()%>DAOHelper() { } }*/ - for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ + for (ObjectModelClass objectModelClass : model.getClasses()) { + ObjectModelClass clazz = objectModelClass; + if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)) { /*{ static public <%=clazz.getQualifiedName()%>DAO get<%=clazz.getName()%>DAO(TopiaContext context) throws TopiaException { TopiaContextImplementor ci = (TopiaContextImplementor)context; @@ -126,4 +126,4 @@ }*/ } -} // DAOGenerator +} // DAOHelperGenerator Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) @@ -37,10 +37,12 @@ import org.codelutin.generator.models.object.ObjectModelClass; /** - * Ce generateur permet d'avoir une classe permettant de recuperer les DAO - * sans cast. - * @author poussin + * Ce generateur permet d'avoir les implantations des entites concretes a partir des + * interfaces des entites de maniere dynamique (i.e qu'on n'aura pas dans cette classe + * les classes desces implantations) : ceci permet la modularite. * + * @author chemit + * */ public class EntityProviderGenerator extends ObjectModelGenerator { @@ -68,20 +70,25 @@ /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.persistence.TopiaEntity; -import java.util.Map; @SuppressWarnings({"unchecked"}) public class <%=model.getName()%>EntityProvider { protected static java.util.Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> cache; - protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{ }*/ - String entitiesList = ""; + if (model.getClasses().isEmpty()) { +/*{ + protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{}; +}*/ + } else { +/*{ + protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{ +}*/ + } for (Iterator i=model.getClasses().iterator(); i.hasNext();) { ObjectModelClass clazz = (ObjectModelClass)i.next(); if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ - entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); /*{ <%=clazz.getQualifiedName()%>.class<%=(i.hasNext()?", ":"\n};")%> }*/ } @@ -111,6 +118,7 @@ } } + /** * should have no instance *) @@ -120,4 +128,4 @@ }*/ } -} // DAOGenerator +} // EntityPoviderGenerator