Index: topia2/src/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java:1.11 topia2/src/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java:1.12 --- topia2/src/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java:1.11 Mon Jan 28 15:54:56 2008 +++ topia2/src/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java Mon Jan 28 17:09:13 2008 @@ -48,7 +48,7 @@ * Created: 19 juin 2007 * * @author dupont -* @version $Revision: 1.11 $ +* @version $Revision: 1.12 $ * * Le service abstrait etend TopiaApplicationServiceAbstract et implemente * l'interface du service. @@ -59,7 +59,7 @@ * @see ServiceInterfaceGenerator * @see TopiaApplicationServiceAbstract * -* Mise a jour: $Date: 2008-01-28 15:54:56 $ +* Mise a jour: $Date: 2008-01-28 17:09:13 $ * par : $Author: chatellier $ */ public class ServiceAbstractGenerator extends ObjectModelGenerator { @@ -156,9 +156,9 @@ for (Iterator it = classifier.getOperations().iterator(); it.hasNext();) { ObjectModelOperation op = (ObjectModelOperation)it.next(); /*{ - - /** - * Implementation a la charge du developpeur + + /** + * Implementation a la charge du developpeur }*/ if (GeneratorUtil.hasDocumentation(op)) { /*{ * <%=op.getName()%> : <%=op.getDocumentation()%> @@ -168,9 +168,9 @@ for(ObjectModelParameter param : params) { if(log.isTraceEnabled()) {log.trace("Param" + param);} /*{ * @param <%=param.getName()%> <%=param.getDocumentation()%> - }*/ +}*/ } -/*{ *) +/*{ *) <%=op.getVisibility()%> abstract <%=op.getReturnType()%> <%=op.getName()%>(}*/ String vir = ""; for(ObjectModelParameter param : params){ Index: topia2/src/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java diff -u topia2/src/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java:1.9 topia2/src/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java:1.10 --- topia2/src/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java:1.9 Mon Jan 28 15:42:23 2008 +++ topia2/src/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java Mon Jan 28 17:09:13 2008 @@ -51,7 +51,7 @@ * Created: 14 juin 2007 * * @author ndupont -* @version $Revision: 1.9 $ +* @version $Revision: 1.10 $ * * L'interface du service etend TopiaApplicationService * @@ -68,7 +68,7 @@ * * @see TopiaApplicationService * -* Mise a jour: $Date: 2008-01-28 15:42:23 $ +* Mise a jour: $Date: 2008-01-28 17:09:13 $ * par : $Author: chatellier $ */ public class ServiceInterfaceGenerator extends ObjectModelGenerator { @@ -114,14 +114,16 @@ generateAssociatedClassOperations(output, interfacez); /*{ - // methodes du service - public String[] methods = {}*/ + // methodes du service + public String[] methods = { +}*/ String vir=" "; for(String m : methods){ - /*{ <%=vir%>"<%=m%>"}*/ +/*{ <%=vir%>"<%=m%>" +}*/ vir=", "; } - /*{}; }*/ +/*{ }; }*/ /*{ } //<%=interfacez.getName()%> }*/ @@ -174,7 +176,7 @@ } private void generateMethodsGetter(Writer output, ObjectModelClassifier classifier) throws IOException { -/*{ public abstract String[] getMethods(); +/*{ public abstract String[] getMethods(); // =====> methodes utilisant celles des entites <==== }*/ @@ -188,7 +190,7 @@ String method = op.getReturnType()+ " "+op.getName()+"("; /*{ /** - * Methode metier + * Methode metier }*/ if (GeneratorUtil.hasDocumentation(op)) { /*{ * <%=op.getName()%> : <%=op.getDocumentation()%> @@ -198,7 +200,7 @@ for(ObjectModelParameter param : params) { if(log.isTraceEnabled()) {log.trace("Param" + param);} /*{ * @param <%=param.getName()%> <%=param.getDocumentation()%> - }*/ +}*/ } /*{ *) <%=op.getVisibility()%> <%=op.getReturnType()%> <%=op.getName()%>(}*/ @@ -228,7 +230,7 @@ private void generateInheritedInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { /*{ // =====> methodes utilisant celles des daos <==== - }*/ +}*/ for (Iterator i=classifier.getInterfaces().iterator(); i.hasNext();) { ObjectModelClassifier parent = (ObjectModelClassifier)i.next(); // pour tous les DAOInterface