Index: topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java:1.19 topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java:1.20 --- topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java:1.19 Fri Jun 18 18:29:19 2004 +++ topia/src/java/org/codelutin/topia/generators/commons/ObjectModelToEntityTOClassGenerator.java Fri Jun 18 18:58:24 2004 @@ -215,7 +215,7 @@ if(!Util.isDerived(attribute)){ /*{ // variable declaration, the name is prefixed by _ - protected <%=Util.getAttributeType(attribute)%> _<%=attribute.getName()%> = <%=Util.getInitValue(attribute)%>; + protected <%=Util.getAttributeType(attribute)%> <%=attribute.getName()%> = <%=Util.getInitValue(attribute)%>; protected boolean _<%=attribute.getName()%>Modified_ = false; }*/ @@ -265,7 +265,7 @@ getContext().getPersistenceService(<%=attribute.getType()%>.class); PrivateTopiaPersistenceService ptps = (PrivateTopiaPersistenceService)tps; - _<%=attribute.getName()%> = <%=(Util.isNMultiplicity(attribute)?"":"("+Util.getAttributeType(attribute)+")")%> + <%=attribute.getName()%> = <%=(Util.isNMultiplicity(attribute)?"":"("+Util.getAttributeType(attribute)+")")%> ptps.findByTopiaId(_<%=attribute.getName()%>Id_); this._<%=attribute.getName()%>ReferenceLoaded_ = true; } @@ -273,9 +273,9 @@ <% } if(Util.isNMultiplicity(attribute)){ %> - return Collections.unmodifiableList(_<%=attribute.getName()%>); + return Collections.unmodifiableList(<%=attribute.getName()%>); <% }else{ %> - return _<%=attribute.getName()%>; + return <%=attribute.getName()%>; <% } %> } }*/ @@ -298,7 +298,7 @@ /*{ public void set<%=Util.capitalize(attribute.getName())%>(<%=Util.getAttributeType(attribute)%> <%=attribute.getName()%>) throws TopiaException { this._<%=attribute.getName()%>Modified_ = true; - this._<%=attribute.getName()%> = <%=attribute.getName()%>; + this.<%=attribute.getName()%> = <%=attribute.getName()%>; <% if (attribute.referenceClassifier()) { %> this._<%=attribute.getName()%>ReferenceLoaded_ = true; <% } %> @@ -312,7 +312,7 @@ // on force le chargement get<%=Util.capitalize(attribute.getName())%>(); <% } %> - this._<%=attribute.getName()%>.add(<%=attribute.getName()%>); + this.<%=attribute.getName()%>.add(<%=attribute.getName()%>); } public void remove<%=Util.capitalize(attribute.getName())%>(<%=attribute.getType()%> <%=attribute.getName()%>) throws TopiaException { @@ -321,11 +321,11 @@ // on force le chargement get<%=Util.capitalize(attribute.getName())%>(); <% } %> - this._<%=attribute.getName()%>.remove(<%=attribute.getName()%>); + this.<%=attribute.getName()%>.remove(<%=attribute.getName()%>); } public void clear<%=Util.capitalize(attribute.getName())%>() throws TopiaException { - this._<%=attribute.getName()%> = <%=Util.getInitValue(attribute)%>; + this.<%=attribute.getName()%> = <%=Util.getInitValue(attribute)%>; } }*/ } @@ -457,12 +457,12 @@ if(! Util.isDerived(attribute)){ if (! attribute.referenceClassifier()) { /*{ - this._<%=attribute.getName()%> = entity.get<%=Util.capitalize(attribute.getName())%>(); + this.<%=attribute.getName()%> = entity.get<%=Util.capitalize(attribute.getName())%>(); }*/ } else { /*{ this._<%=attribute.getName()%>ReferenceLoaded_ = false; - this._<%=attribute.getName()%> = null; + this.<%=attribute.getName()%> = null; }*/ if (!Util.isNMultiplicity(attribute)) { /*{