Author: fdesbois Date: 2010-04-08 12:21:34 +0200 (Thu, 08 Apr 2010) New Revision: 1885 Log: - Remove constructor and put logger initialization as defaultValue (FIX #474 from EUGene) - Evo #475 : Don't generate treateError method abstract with no transaction argument, implements it directly in serviceAbstract generated Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-08 09:30:09 UTC (rev 1884) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2010-04-08 10:21:34 UTC (rev 1885) @@ -259,32 +259,16 @@ addInterface(serviceAbstract, serviceContract.getQualifiedName()); // Add Logger attribute - // FIXME in EUGene, we want the default value not to be managed - // for import. -// addAttribute(service, "log", -// Log.class, -// "LogFactory.getLog(" + interfacez.getName() + ".class)", -// ObjectModelModifier.PRIVATE, -// ObjectModelModifier.STATIC, -// ObjectModelModifier.FINAL); addAttribute(serviceAbstract, "log", - Log.class, null, + Log.class, + "LogFactory.getLog(" + source.getName() + ".class)", ObjectModelModifier.PRIVATE, + ObjectModelModifier.STATIC, ObjectModelModifier.FINAL); addImport(serviceAbstract, Log.class); addImport(serviceAbstract, LogFactory.class); - // Constructor - ObjectModelOperation constructor = - addConstructor(serviceAbstract, ObjectModelModifier.PUBLIC); - setOperationBody(constructor, "" - /*{ - // FIXME : must be fixed attribute value in EUGene - this.log = LogFactory.getLog(<%=serviceAbstract.getName()%>.class); - }*/ - ); - // Create abstract methods ObjectModelOperation beginTransaction = addOperation(serviceAbstract, OP_NAME_BEGIN_TRANSACTION, @@ -293,10 +277,22 @@ ObjectModelModifier.PROTECTED); addException(beginTransaction, TopiaException.class); +// ObjectModelOperation treateError1 = +// addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", +// ObjectModelModifier.ABSTRACT, +// ObjectModelModifier.PROTECTED); +// addParameter(treateError1, Exception.class, "eee"); +// addParameter(treateError1, String.class, "message"); +// addParameter(treateError1, "Object...", "args"); +// if (exceptionName != null) { +// addException(treateError1, exceptionName); +// } + ObjectModelOperation treateError1 = addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", ObjectModelModifier.ABSTRACT, ObjectModelModifier.PROTECTED); + addParameter(treateError1, TopiaContext.class, "transaction"); addParameter(treateError1, Exception.class, "eee"); addParameter(treateError1, String.class, "message"); addParameter(treateError1, "Object...", "args"); @@ -304,18 +300,6 @@ addException(treateError1, exceptionName); } - ObjectModelOperation treateError2 = - addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", - ObjectModelModifier.ABSTRACT, - ObjectModelModifier.PROTECTED); - addParameter(treateError2, TopiaContext.class, "transaction"); - addParameter(treateError2, Exception.class, "eee"); - addParameter(treateError2, String.class, "message"); - addParameter(treateError2, "Object...", "args"); - if (exceptionName != null) { - addException(treateError2, exceptionName); - } - ObjectModelOperation closeTransaction = addOperation(serviceAbstract, OP_NAME_CLOSE_TRANSACTION, "void", ObjectModelModifier.ABSTRACT, @@ -335,6 +319,22 @@ abstOps.put(getAbstractOperationKeyMap(op), abstOp); } + ObjectModelOperation treateError2 = + addOperation(serviceAbstract, OP_NAME_TREATE_ERROR, "void", + ObjectModelModifier.PROTECTED); + addParameter(treateError2, Exception.class, "eee"); + addParameter(treateError2, String.class, "message"); + addParameter(treateError2, "Object...", "args"); + if (exceptionName != null) { + addException(treateError2, exceptionName); + } + + setOperationBody(treateError2, "" + /*{ + treateError(null, eee, message, args); + }*/ + ); + // Imports for implementations addImport(serviceAbstract, TopiaContext.class); addImport(serviceAbstract, I18n.class);