Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.2 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.3 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java:1.2 Fri Aug 6 17:48:52 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityGenerator.java Thu Sep 16 15:55:03 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/08/06 17:48:52 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/09/16 15:55:03 $ + * par : $Author: mazelier $ */ package org.codelutin.topia.generators; @@ -84,7 +84,6 @@ } } - ////////////////////////////////////////////////////////////////////// // G E T A T T R I B U T E S A C C E S S O R S ////////////////////////////////////////////////////////////////////// @@ -126,6 +125,10 @@ public void remove<%=Util.capitalize(attribute.getName())%>(<%=attribute.getType()%> value) throws TopiaException; public void clear<%=Util.capitalize(attribute.getName())%>() throws TopiaException; + + public void add<%=Util.capitalize(attribute.getName())%>(<%=Util.getAttributeType(attribute)%> list) throws TopiaException; + + public void add<%=Util.capitalize(attribute.getName())%>(<%=Util.getAttributeType(attribute)%> list, boolean duplicate) throws TopiaException; }*/ } @@ -144,6 +147,20 @@ public void generateOperationBody(Writer output, ObjectModelOperation operation) throws IOException { String args = Util.getMethodParameterListName(operation.getParameters()); /*{; +}*/ + } + + + ////////////////////////////////////////////////////////////////////// + // REMOVE ENTITY DECLARATION + ////////////////////////////////////////////////////////////////////// + public void generateRemoveEntity(Writer output, ObjectModelClassifier clazz) + throws IOException { +/*{ + /** + * Delete this entity with its persistenceService + *) + public void remove() throws TopiaException; }*/ } Index: topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.3 topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.4 --- topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java:1.3 Thu Sep 16 14:07:45 2004 +++ topia/src/java/org/codelutin/topia/generators/ObjectModelToEntityImplGenerator.java Thu Sep 16 15:55:03 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * - * Mise a jour: $Date: 2004/09/16 14:07:45 $ - * par : $Author: pineau $ + * Mise a jour: $Date: 2004/09/16 15:55:03 $ + * par : $Author: mazelier $ */ package org.codelutin.topia.generators; @@ -171,6 +171,23 @@ this._<%=attribute.getName()%>Modified_ = true; this.<%=attribute.getName()%> = <%=Util.getInitValue(attribute)%>; } + + public void add<%=Util.capitalize(attribute.getName())%>(<%=Util.getAttributeType(attribute)%> list) throws TopiaException{ + add<%=Util.capitalize(attribute.getName())%>(list, false); + } + + public void add<%=Util.capitalize(attribute.getName())%>(<%=Util.getAttributeType(attribute)%> list, boolean duplicate) throws TopiaException{ + if(!duplicate){ + java.util.ArrayList listClone = new java.util.ArrayList(); + listClone.addAll(list); + listClone.removeAll(get<%=Util.capitalize(attribute.getName())%>()); + list=listClone; + } + for(java.util.Iterator i = list.iterator(); i.hasNext();){ + <%=attribute.getType()%> value = (<%=attribute.getType()%>)i.next(); + add<%=Util.capitalize(attribute.getName())%>(value); + } + } }*/ } @@ -199,6 +216,22 @@ } public void generateInterfaceOperationBody(Writer output, ObjectModelOperation operation) throws IOException { generateOperationBody(output, operation); + } + + ////////////////////////////////////////////////////////////////////// + // REMOVE ENTITY DECLARATION + ////////////////////////////////////////////////////////////////////// + public void generateRemoveEntity(Writer output, ObjectModelClassifier clazz) + throws IOException { +/*{ + /** + * Delete this entity with its persistenceService + *) + public void remove() throws TopiaException{ + <%=clazz.getName()%>PersistenceService persistenceService = getPersistenceService(); + persistenceService.delete(this); + } +}*/ } ////////////////////////////////////////////////////////////////////// Index: topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java diff -u topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.2 topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.3 --- topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java:1.2 Fri Aug 6 17:48:52 2004 +++ topia/src/java/org/codelutin/topia/generators/TopiaAbstractObjectModelGenerator.java Thu Sep 16 15:55:03 2004 @@ -23,10 +23,10 @@ * * @author Benjamin Poussin * Copyright Code Lutin - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * - * Mise a jour: $Date: 2004/08/06 17:48:52 $ - * par : $Author: bpoussin $ + * Mise a jour: $Date: 2004/09/16 15:55:03 $ + * par : $Author: mazelier $ */ package org.codelutin.topia.generators; @@ -115,7 +115,9 @@ generateInterfaceOperationBody(output, operation); } } -// + + // ---------------- declaration of remove method + generateRemoveEntity(output, clazz); // ---------------- All that framework used generateOther(output, clazz); /*{ @@ -447,7 +449,15 @@ public void generateSuperclassOperationBody(Writer output, ObjectModelOperation operation) throws IOException { } - + ////////////////////////////////////////////////////////////////////// + // REMOVE ENTITY DECLARATION + ////////////////////////////////////////////////////////////////////// + /** + * generate nothing by default + */ + public void generateRemoveEntity(Writer output, ObjectModelClassifier clazz) + throws IOException { + } ////////////////////////////////////////////////////////////////////// // O T H E R //////////////////////////////////////////////////////////////////////