Author: echatellier Date: 2010-06-11 11:54:13 +0200 (Fri, 11 Jun 2010) New Revision: 119 Url: http://nuiton.org/repositories/revision/wikitty/119 Log: Fix inheritance from entities in different package. Fix extension tag value in tag value is "documentation". Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-06-10 16:11:16 UTC (rev 118) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-06-11 09:54:13 UTC (rev 119) @@ -76,15 +76,16 @@ for (ObjectModelClass parent : clazz.getSuperclasses()) { if (EugengoUtils.isBusinessEntity(parent)) { addImport(parent); - parentImpl = parent.getQualifiedName() + "Impl"; - addImport( parentImpl ); + parentImpl = parent.getQualifiedName() + "Impl"; + addImport(parentImpl); + addImport(parent.getQualifiedName() + "Abstract"); } } lookForAttributeImports(clazz); generateImports(output, packageName); generateClazzDocumentation(output, clazz); - String extendsString = " extends " + ( parentImpl != null ? parentImpl : getType("org.nuiton.wikitty.BusinessEntityWikitty") ); + String extendsString = " extends " + getType( parentImpl != null ? parentImpl : "org.nuiton.wikitty.BusinessEntityWikitty" ); String implementsString = "implements " + getType(clazz.getQualifiedName()); for (ObjectModelClass parent : clazz.getSuperclasses()) { @@ -205,7 +206,7 @@ } } -/*{ static final protected List<WikittyExtension> extensions; +/*{ static final public List<WikittyExtension> extensions; static final public WikittyExtension extension<%=clazz.getName()%> = new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", <%=requires%>, WikittyUtil.buildFieldMapExtension(}*/ @@ -293,8 +294,11 @@ System.out.println("+++ DEBUG +++ " + attr.getName() + " " + attr.getTagValues()); } for (String tag : attr.getTagValues().keySet()) { - String value = attr.getTagValue(tag); - tagValues += " " + tag + "=" + value; + // EC20100611 : documentation has no sense in wikitty extension definition + if (!"documentation".equals(tag)) { + String value = attr.getTagValue(tag); + tagValues += " " + tag + "=" + value; + } } /*{"<%=attrType%> <%=attrName%><%=card%><%=unique%><%=tagValues%>"}*/