Author: echatellier Date: 2012-11-09 14:45:28 +0100 (Fri, 09 Nov 2012) New Revision: 1521 Url: http://nuiton.org/repositories/revision/wikitty/1521 Log: fixes #2405 : Wikitty purifier template generate accessor for non navigable association Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel Modified: trunk/wikitty-api/pom.xml trunk/wikitty-api/src/it/generation/pom.xml trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2012-10-30 07:45:06 UTC (rev 1520) +++ trunk/wikitty-api/pom.xml 2012-11-09 13:45:28 UTC (rev 1521) @@ -283,10 +283,6 @@ </build> </profile> - <!-- Commented because some test are in fail : - http://www.nuiton.org/issues/show/1160 - and http://www.nuiton.org/issues/show/1161--> - <profile> <id>run-its</id> <activation> Modified: trunk/wikitty-api/src/it/generation/pom.xml =================================================================== --- trunk/wikitty-api/src/it/generation/pom.xml 2012-10-30 07:45:06 UTC (rev 1520) +++ trunk/wikitty-api/src/it/generation/pom.xml 2012-11-09 13:45:28 UTC (rev 1521) @@ -152,7 +152,21 @@ <goal>smart-generate</goal> </goals> </execution> - </executions> + + <execution> + <id>entities6 generator</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>src/main/models:mymodel6.objectmodel</input> + <input>classpath:model:/:wikitty.objectmodel</input> + </inputs> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> <dependencies> <dependency> Added: trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel =================================================================== (Binary files differ) Property changes on: trunk/wikitty-api/src/it/generation/src/main/models/mymodel6.objectmodel ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-10-30 07:45:06 UTC (rev 1520) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2012-11-09 13:45:28 UTC (rev 1521) @@ -92,24 +92,27 @@ superClass = model.getClass(superClass.getQualifiedName()); for (ObjectModelAttribute attribute : superClass.getAttributes()) { - String attributeName; + + if (attribute.isNavigable()) { + String attributeName; - // tag value définie par le developpeur - if (attribute.hasTagValue(TAG_ALTERNATIVE_NAME)) { - attributeName = attribute.getTagValue(TAG_ALTERNATIVE_NAME); - } else { - attributeName = attribute.getName(); - } + // tag value définie par le developpeur + if (attribute.hasTagValue(TAG_ALTERNATIVE_NAME)) { + attributeName = attribute.getTagValue(TAG_ALTERNATIVE_NAME); + } else { + attributeName = attribute.getName(); + } - // check conflics - if (attributeNames.contains(attributeName)) { - attributeName += "From" + superClass.getName(); - builder.addTagValue(clazz, TAG_ALTERNATIVE_NAME - + "." + superClass.getName() + "." + attribute.getName(), attributeName); + // check conflics + if (attributeNames.contains(attributeName)) { + attributeName += "From" + superClass.getName(); + builder.addTagValue(clazz, TAG_ALTERNATIVE_NAME + + "." + superClass.getName() + "." + attribute.getName(), attributeName); + } + + // remember new getter name + attributeNames.add(attributeName); } - - // remember new getter name - attributeNames.add(attributeName); } } }