Author: fdesbois Date: 2012-05-30 12:35:42 +0200 (Wed, 30 May 2012) New Revision: 2566 Url: http://nuiton.org/repositories/revision/topia/2566 Log: ensure isolation in loops for getComposite and getAggregate Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-05-30 08:54:49 UTC (rev 2565) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2012-05-30 10:35:42 UTC (rev 2566) @@ -1232,18 +1232,22 @@ if (TopiaGeneratorUtil.isNMultiplicity(attr)) { addImport(result, Collection.class); body.append("" -/*{ Collection<<%=type%>> ee = entity.<%=getterName%>(); - if (ee != null) { - tmp.putAll(<%=type%>.class, ee); - } +/*{ { + Collection<<%=type%>> ee = entity.<%=getterName%>(); + if (ee != null) { + tmp.putAll(<%=type%>.class, ee); + } + } }*/ ); } else { body.append("" -/*{ <%=type%> ee = entity.<%=getterName%>(); - if (ee != null) { - tmp.put(<%=type%>.class, ee); - } +/*{ { + <%=type%> ee = entity.<%=getterName%>(); + if (ee != null) { + tmp.put(<%=type%>.class, ee); + } + } }*/ ); } @@ -1267,10 +1271,12 @@ assocAttrName)); if (!TopiaGeneratorUtil.isNMultiplicity(attr)) { body.append("" -/*{ <%=assocClassFQN%> ee = entity.<%=getterName%>(); - if (ee != null) { - tmp.put(<%=assocClassFQN%>.class, ee); - } +/*{ { + <%=assocClassFQN%> ee = entity.<%=getterName%>(); + if (ee != null) { + tmp.put(<%=assocClassFQN%>.class, ee); + } + } }*/ ); } else { @@ -1359,18 +1365,22 @@ type = TopiaGeneratorUtil.getSimpleName(type); if (TopiaGeneratorUtil.isNMultiplicity(attr)) { body.append("" -/*{ <%=type%> ee = entity.<%=getterName%>(); - if (ee != null) { - tmp.put(<%=type%>.class, ee); - } +/*{ { + <%=type%> ee = entity.<%=getterName%>(); + if (ee != null) { + tmp.put(<%=type%>.class, ee); + } + } }*/ ); } else { body.append("" -/*{ Collection<<%=type%>> ee = entity.<%=getterName%>(); - if (ee != null) { - tmp.putAll(<%=type%>.class, ee); - } +/*{ { + Collection<<%=type%>> ee = entity.<%=getterName%>(); + if (ee != null) { + tmp.putAll(<%=type%>.class, ee); + } + } }*/ ); }