Author: tchemit Date: 2011-09-22 11:03:20 +0200 (Thu, 22 Sep 2011) New Revision: 2337 Url: http://nuiton.org/repositories/revision/topia/2337 Log: Use generated serialVersionUID from eugene Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-21 22:20:20 UTC (rev 2336) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-22 09:03:20 UTC (rev 2337) @@ -176,16 +176,39 @@ generateToStringOperation(input); } + // Generate serialVersionUID on abstract class + generateSerialVersionUID(input, outputAbstract); + // Generate Entity Implementation class boolean generateImpl = isGenerateImpl(input, input.getOperations()); if (generateImpl) { generateImpl(input); + generateSerialVersionUID(input, outputImpl); } + + // Clean data output after transformation clean(); } + protected void generateSerialVersionUID(ObjectModelClass input, + ObjectModelClass ouput) { + + // serialVersionUID + String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, + input, + model + ); + if (svUID == null) { + + // use a default one + svUID = "" + TopiaGeneratorUtil.generateSerialVersionUID(ouput); + } + addConstant(ouput, SERIAL_VERSION_UID, long.class, svUID, + ObjectModelModifier.PRIVATE); + } + protected void createEntityInterface(ObjectModelClass input) { outputInterface = createInterface(input.getName(), @@ -278,19 +301,6 @@ setSuperClass(outputAbstract, TopiaEntityAbstract.class); } - // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, - input, - model - ); - if (svUID == null) { - - // use a default one - svUID = "1L"; - } - addConstant(outputAbstract, SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); - addContextableMethods(input, outputAbstract); } @@ -386,16 +396,6 @@ setDocumentation(outputImpl, "Implantation des operations pour l'entité " + input.getName() + "."); setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); - - String svUID = - TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model); - if (svUID == null) { - - // use a default one - svUID = "1L"; - } - addConstant(outputImpl, SERIAL_VERSION_UID, long.class, svUID, - ObjectModelModifier.PRIVATE); } /**