Author: tchemit Date: 2011-11-23 18:50:27 +0100 (Wed, 23 Nov 2011) New Revision: 109 Url: http://forge.codelutin.com/repositories/revision/echobase/109 Log: use entityEnum instead of name Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2011-11-23 10:34:23 UTC (rev 108) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2011-11-23 17:50:27 UTC (rev 109) @@ -66,18 +66,6 @@ return tables; } - public TableMeta getTable(String tableName) { - Preconditions.checkNotNull(tableName); - TableMeta result = null; - for (TableMeta tableMeta : getTables()) { - if (tableName.equals(tableMeta.getName())) { - result = tableMeta; - break; - } - } - return result; - } - public TableMeta getTable(EchoBaseEntityEnum tableName) { Preconditions.checkNotNull(tableName); TableMeta result = null; Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-23 10:34:23 UTC (rev 108) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/TableMeta.java 2011-11-23 17:50:27 UTC (rev 109) @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.EntityOperator; +import org.nuiton.util.ObjectUtil; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderModelBuilder; @@ -47,8 +48,6 @@ private static final long serialVersionUID = 1L; - protected final String name; - protected final String i18nKey; protected final EntityOperator<?> operator; @@ -62,7 +61,6 @@ public TableMeta(EchoBaseEntityEnum entityEnum) { Preconditions.checkNotNull(entityEnum); this.entityEnum = entityEnum; - name = entityEnum.getImplementationFQN(); Class<? extends TopiaEntity> contract = entityEnum.getContract(); i18nKey = "echobase.common." + Introspector.decapitalize(contract.getSimpleName()); @@ -70,7 +68,7 @@ } public String getName() { - return name; + return entityEnum.name(); } public EchoBaseEntityEnum getEntityEnum() { @@ -140,6 +138,10 @@ return getColumns().iterator(); } + public TopiaEntity newEntity() { + return ObjectUtil.newInstance(entityEnum.getImplementation()); + } + protected static <E extends TopiaEntity> Binder<E, E> newbinder(TableMeta meta) { BinderModelBuilder<E, E> binderModelBuilder = (BinderModelBuilder<E, E>) BinderModelBuilder.newEmptyBuilder(meta.getEntityType());