Author: tchemit Date: 2008-11-02 20:08:40 +0000 (Sun, 02 Nov 2008) New Revision: 1207 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java Log: add somes method on TopiaEntityEnumEntry (should add all TopiaEntity ones...) Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2008-11-01 22:16:50 UTC (rev 1206) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2008-11-02 20:08:40 UTC (rev 1207) @@ -89,7 +89,7 @@ /*{public enum <%=className%> { }*/ - List<ObjectModelClass> classes = GeneratorUtil.getEntityClasses(model,true); + List<ObjectModelClass> classes = GeneratorUtil.getEntityClasses(model, true); if (classes.isEmpty()) { /*{ TopiaEntity(TopiaEntity.class); @@ -111,8 +111,9 @@ <%=className%>(Class<? extends TopiaEntity> contractClass) { entry = new TopiaEntityEnumEntry(contractClass); } +}*/ - public Class<? extends TopiaEntity> getContractClass() { +/* public Class<? extends TopiaEntity> getContractClass() { return entry.getContractClass(); } @@ -128,14 +129,18 @@ return entry.create(ctxt); } - public TopiaEntity update(TopiaEntity entity, TopiaContext ctxt) throws TopiaException { + public TopiaEntity update(TopiaEntity entity, TopiaContext + ctxt) throws TopiaException + { return entry.update(entity, ctxt); } public void delete(TopiaEntity entity, TopiaContext ctxt) throws TopiaException { entry.delete(entity, ctxt); } +*/ +/*{ public static <%=className%> valueOf(TopiaEntity entity) { return valueOf(entity.getClass()); } @@ -145,7 +150,7 @@ return <%=modelName%>EntityEnum.valueOf(klass.getSimpleName()); } for (<%=className%> entityEnum : <%=className%>.values()) { - if (entityEnum.getContractClass().isAssignableFrom(klass)) { + if (entityEnum.entry.getContractClass().isAssignableFrom(klass)) { return entityEnum; } } @@ -153,20 +158,22 @@ } public static <T extends TopiaEntity> Class<T> getContractClass(Class<T> klass) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (Class<T>) e.getContractClass(); + return (Class<T>) e.entry.getContractClass(); } public static <T extends TopiaEntity> Class<T> getImplementationClass(Class<T> klass) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (Class<T>) e.getImplementationClass(); + return (Class<T>) e.entry.getImplementationClass(); } public static Class<? extends TopiaEntity>[] getContractClasses() { <%=className%>[] values = <%=className%>.values(); Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) java.lang.reflect.Array.newInstance(Class.class, values.length); for (int i = 0; i < values.length; i++) { - result[i] = values[i].getContractClass(); + result[i] = values[i].entry.getContractClass(); } return result; } @@ -175,7 +182,7 @@ <%=className%>[] values = <%=className%>.values(); Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) java.lang.reflect.Array.newInstance(Class.class, values.length); for (int i = 0; i < values.length; i++) { - result[i] = values[i].getImplementationClass(); + result[i] = values[i].entry.getImplementationClass(); } return result; } @@ -189,29 +196,54 @@ } public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(Class<T> klass, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (D) e.getDAO(ctxt); + return (D) e.entry.getDAO(ctxt); } public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(T entity, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(entity); <%=className%> e = <%=className%>.valueOf(entity); - return (D) e.getDAO(ctxt); + return (D) e.entry.getDAO(ctxt); } - public static <T extends TopiaEntity> T doCreate(Class<T> klass, TopiaContext ctxt) throws TopiaException { + public static <T extends TopiaEntity> T create(Class<T> klass, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (T) e.create(ctxt); + return (T) e.entry.create(ctxt); } - public static <T extends TopiaEntity> T doUpdate(T entity, TopiaContext ctxt) throws TopiaException { + public static <T extends TopiaEntity> T update(T entity, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(entity); <%=className%> e = <%=className%>.valueOf(entity); - return (T) e.update(entity, ctxt); + return (T) e.entry.update(entity, ctxt); } - public static <T extends TopiaEntity> void doDelete(T entity, TopiaContext ctxt) throws TopiaException { + public static <T extends TopiaEntity> void delete(T entity, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(entity); <%=className%> e = <%=className%>.valueOf(entity); - e.delete(entity, ctxt); + e.entry.delete(entity, ctxt); } + + public static <T extends TopiaEntity> java.util.List<T> findAll(Class<T> klass, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); + return entry.findAll(ctxt); + } + + public static <T extends TopiaEntity> T findByTopiaId(Class<T> klass, TopiaContext ctxt,String topiaId) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); + return entry.findByTopiaId(topiaId,ctxt); + } + + public static <T extends TopiaEntity> TopiaEntityEnumEntry<T> getEntry(T entity) throws TopiaException { + <%=className%> e = <%=className%>.valueOf(entity); + return (TopiaEntityEnumEntry<T>)e.entry; + } + + public static <T extends TopiaEntity> TopiaEntityEnumEntry<T> getEntry(Class<T> klass) throws TopiaException { + <%=className%> e = <%=className%>.valueOf(klass); + return (TopiaEntityEnumEntry<T>)e.entry; + } } }*/ } Modified: topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-01 22:16:50 UTC (rev 1206) +++ topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-02 20:08:40 UTC (rev 1207) @@ -4,6 +4,8 @@ import org.codelutin.topia.TopiaException; import org.codelutin.topia.framework.TopiaContextImplementor; +import java.util.List; + /** @author chemit */ public class TopiaEntityEnumEntry<T extends TopiaEntity> implements java.io.Serializable { @@ -58,4 +60,14 @@ dao.delete(entity); } + public List<T> findAll(TopiaContext ctxt) throws TopiaException { + TopiaDAO<T> dao = getDAO(ctxt); + return dao.findAll(); + } + + public T findByTopiaId(String topiaId, TopiaContext ctxt) throws TopiaException { + TopiaDAO<T> dao = getDAO(ctxt); + return dao.findByTopiaId(topiaId); + } + }