Author: tchemit Date: 2011-09-12 14:09:52 +0200 (Mon, 12 Sep 2011) New Revision: 2328 Url: http://nuiton.org/repositories/revision/topia/2328 Log: Anomalie #1640: Cannot create TopiaContext when using an abstract class Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.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-12 11:10:40 UTC (rev 2327) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-12 12:09:52 UTC (rev 2328) @@ -88,6 +88,8 @@ /** Logger */ private static final Log log = LogFactory.getLog(EntityTransformer.class); + public static final String SERIAL_VERSION_UID = "serialVersionUID"; + protected ObjectModelInterface outputInterface; protected ObjectModelClass outputAbstract; @@ -255,17 +257,19 @@ // Extends for (ObjectModelClass parent : input.getSuperclasses()) { - String extendClass = parent.getQualifiedName(); - //Si une des classes parentes définies des méthodes abstraites, son - // impl ne sera pas créé - boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); - if (TopiaGeneratorUtil.isEntity(parent)) { - if (abstractParent) { - extendClass += "Abstract"; - } else { - extendClass += "Impl"; - } - } + //tchemit-2011-09-12 What ever abstract or not, we alwyas use an Impl, moreover use the util method instead + String extendClass = TopiaGeneratorUtil.getDOType(parent, model); +// String extendClass = parent.getQualifiedName(); +// //Si une des classes parentes définies des méthodes abstraites, son +// // impl ne sera pas créé +// boolean abstractParent = TopiaGeneratorUtil.shouldBeAbstract(parent); +// if (TopiaGeneratorUtil.isEntity(parent)) { +// if (abstractParent) { +// extendClass += "Abstract"; +// } else { +// extendClass += "Impl"; +// } +// } setSuperClass(outputAbstract, extendClass); } @@ -275,7 +279,7 @@ } // serialVersionUID - String svUID = TopiaGeneratorUtil.findTagValue("serialVersionUID", + String svUID = TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model ); @@ -284,7 +288,7 @@ // use a default one svUID = "1L"; } - addConstant(outputAbstract, "serialVersionUID", long.class, svUID, + addConstant(outputAbstract, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE); addContextableMethods(input, outputAbstract); @@ -384,13 +388,13 @@ setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); String svUID = - TopiaGeneratorUtil.findTagValue("serialVersionUID", input, model); + TopiaGeneratorUtil.findTagValue(SERIAL_VERSION_UID, input, model); if (svUID == null) { // use a default one svUID = "1L"; } - addConstant(outputImpl, "serialVersionUID", long.class, svUID, + addConstant(outputImpl, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE); } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-09-12 11:10:40 UTC (rev 2327) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-09-12 12:09:52 UTC (rev 2328) @@ -43,7 +43,6 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.eugene.models.object.validator.AttributeNamesValidator; import org.nuiton.topia.persistence.TopiaDAOImpl; import java.util.ArrayList; @@ -523,11 +522,13 @@ } ObjectModelClass clazz = model.getClass(type); if (isEntity(clazz)) { - if (shouldBeAbstract(clazz)) { - type += "Abstract"; - } else { - type += "Impl"; - } + //tchemit-2011-09-12 What ever abstract or not, we alwyas use an Impl + type += "Impl"; +// if (shouldBeAbstract(clazz)) { +// type += "Abstract"; +// } else { +// type += "Impl"; +// } } return type; }