Author: tchemit Date: 2012-08-18 11:57:33 +0200 (Sat, 18 Aug 2012) New Revision: 2629 Url: http://nuiton.org/repositories/revision/topia/2629 Log: refs #2260: Add a metadata package in persistence (improve api) Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java 2012-08-17 13:58:26 UTC (rev 2628) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java 2012-08-18 09:57:33 UTC (rev 2629) @@ -47,10 +47,13 @@ /** All types non editables. */ protected final Set<T> nonEditableTypes; - public static <T extends TopiaEntityEnum> DbMeta<T> newDbMeta(T[] universe, - T[] nonEditables, - TopiaEntityEnumProvider<T> typeProvider) { - return new DbMeta<T>(universe, nonEditables, typeProvider); + protected final TopiaEntityEnumProvider<T> entityEnumProvider; + + public static <T extends TopiaEntityEnum> DbMeta<T> newDbMeta( + TopiaEntityEnumProvider<T> typeProvider, + T[] universe, + T... nonEditables) { + return new DbMeta<T>(typeProvider, universe, nonEditables); } public List<String> getTableNames() { @@ -82,11 +85,14 @@ return getTables().iterator(); } - protected DbMeta(T[] entityTypes, T[] nonEditableTypes, TopiaEntityEnumProvider<T> typeProvider) { + protected DbMeta(TopiaEntityEnumProvider<T> entityEnumProvider, + T[] entityTypes, + T... nonEditableTypes) { + this.entityEnumProvider = entityEnumProvider; this.nonEditableTypes = Sets.newHashSet(nonEditableTypes); tables = Lists.newArrayList(); for (T entityEnum : entityTypes) { - TableMeta<T> tableMeta = TableMeta.newMeta(entityEnum, typeProvider); + TableMeta<T> tableMeta = TableMeta.newMeta(entityEnum, entityEnumProvider); tables.add(tableMeta); } } @@ -94,4 +100,8 @@ public boolean isEditable(TableMeta<T> meta) { return !nonEditableTypes.contains(meta.getSource()); } + + public TopiaEntityEnumProvider<T> getEntityEnumProvider() { + return entityEnumProvider; + } } Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java 2012-08-17 13:58:26 UTC (rev 2628) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java 2012-08-18 09:57:33 UTC (rev 2629) @@ -31,7 +31,7 @@ import java.util.List; /** - * USeful methods around metadatas. + * Useful methods around metadatas. * * @author tchemit <chemit@codelutin.com> * @since 2.6.12 Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2012-08-17 13:58:26 UTC (rev 2628) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2012-08-18 09:57:33 UTC (rev 2629) @@ -57,8 +57,8 @@ private static final long serialVersionUID = 1L; - public static <T extends TopiaEntityEnum> TableMeta newMeta(T entityEnum, - TopiaEntityEnumProvider<T> typeProvider) { + public static <T extends TopiaEntityEnum> TableMeta<T> newMeta(T entityEnum, + TopiaEntityEnumProvider<T> typeProvider) { return new TableMeta<T>(entityEnum, typeProvider); }