Author: tchemit Date: 2009-12-17 02:10:02 +0100 (Thu, 17 Dec 2009) New Revision: 1721 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java Log: - use AnnotationsManagerExtension to add annotation SearchField, it makes the transformer ok :) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2009-12-16 23:20:08 UTC (rev 1720) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceTransformer.java 2009-12-17 01:10:02 UTC (rev 1721) @@ -404,9 +404,13 @@ needAnnotation = true; } } - //FIXME introduce a annotation extension to generate them + + // generate @SearchFields annotation -/*@SearchFields (*/ + StringBuilder annotationCode = new StringBuilder(); + annotationCode.append("" +/*{SearchFields (}*/ + ); if (needAnnotation) { StringBuilder buffer = new StringBuilder(); if (!txtFields.isEmpty()) { @@ -430,11 +434,16 @@ if (!dateFields.isEmpty()) { buffer.append("\n dateFields={").append(getStringRepresentation(dateFields)).append("}"); } -/*<%=buffer.toString()%> -*/ + annotationCode.append("" +/*{<%=buffer.toString()%> +}*/ + ); } -/*) -*/ + annotationCode.append("" +/*{) +}*/ + ); + addAnnotation(result, result, annotationCode.toString()); } private void generateStaticColumnNames(ObjectModelInterface result, ObjectModelClass clazz) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java 2009-12-16 23:20:08 UTC (rev 1720) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaGenerator.java 2009-12-17 01:10:02 UTC (rev 1721) @@ -66,8 +66,8 @@ protected static final List<Class<? extends Template<ObjectModel>>> DEFAULT_GENERATORS = java.util.Collections .unmodifiableList(Arrays.asList( - EntityInterfaceGenerator.class, -// EntityInterfaceTransformer.class, +// EntityInterfaceGenerator.class, + EntityInterfaceTransformer.class, EntityAbstractGenerator.class, // EntityAbstractTransformer.class, EntityImplTransformer.class, @@ -133,7 +133,7 @@ validateModel(model); // test before all if there is some entities to generate - List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); + List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); if (classes.isEmpty()) { // no entity to generate, can stop safely