Author: bpoussin Date: 2010-12-07 16:56:22 +0100 (Tue, 07 Dec 2010) New Revision: 573 Url: http://nuiton.org/repositories/revision/wikitty/573 Log: fix bug for generation of list Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-07 02:30:39 UTC (rev 572) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-07 15:56:22 UTC (rev 573) @@ -237,8 +237,6 @@ + "]"; } -// // generate a string line like " unique=true" or "" -// String unique = attribute.isUnique() ? " unique=true" : ""; // // generate a string line like " deprecated=true" or "" // String deprecated = attribute.hasTagValue("deprecated") ? " deprecated=" + attribute.getTagValue("deprecated") : ""; // // generate a string line like ' documentation="my documentation"' or "" @@ -250,12 +248,18 @@ // String notNull = attribute.hasTagValue("notNull") ? " notNull=" + attribute.getTagValue("notNull") : ""; // buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""' ///* { "<%=wikittyType%> <%=attribute.getName()%><%=multiplicity%><%=unique%><%=deprecated%><%=notNull%><%=attributeDocumentation%>"}* /); + + // generate a string line like " unique=true" if not already + // present in tag/value + if (attribute.isUnique() && !attribute.getTagValues().containsKey("unique")) { + attribute.getTagValues().put("unique", "true"); + } String tagvalue = ""; for (Map.Entry<String, String> tv : attribute.getTagValues().entrySet()) { tagvalue += " " + tv.getKey() + "=\\\"" + StringEscapeUtils.escapeJava(tv.getValue()) + "\\\""; } buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""' -/*{ "<%=wikittyType%> <%=attribute.getName()%><%=tagvalue%>"}*/); +/*{ "<%=wikittyType%> <%=attribute.getName()%><%=multiplicity%><%=tagvalue%>"}*/); } }