Author: bpoussin Date: 2010-12-07 03:30:39 +0100 (Tue, 07 Dec 2010) New Revision: 572 Url: http://nuiton.org/repositories/revision/wikitty/572 Log: fix bug in tag/value generation. now attribute support all tag/value not only some 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 00:49:39 UTC (rev 571) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-12-07 02:30:39 UTC (rev 572) @@ -237,19 +237,25 @@ + "]"; } - // 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 "" - String attributeDocumentation = - attribute.hasTagValue("documentation") ? " documentation=\\\"" - + StringEscapeUtils.escapeJava(attribute.getTagValue("documentation")) - + "\\\"": ""; - // generate a string like " notNull=true" or "" - String notNull = attribute.hasTagValue("notNull") ? " notNull=" + attribute.getTagValue("notNull") : ""; +// // 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 "" +// String attributeDocumentation = +// attribute.hasTagValue("documentation") ? " documentation=\\\"" +// + StringEscapeUtils.escapeJava(attribute.getTagValue("documentation")) +// + "\\\"": ""; +// // generate a string like " notNull=true" or "" +// 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%>"}* /); + 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()%><%=multiplicity%><%=unique%><%=deprecated%><%=notNull%><%=attributeDocumentation%>"}*/); +/*{ "<%=wikittyType%> <%=attribute.getName()%><%=tagvalue%>"}*/); } }