From: Vance K. <va...@us...> - 2007-03-26 12:01:13
|
User: vancek Date: 07/03/26 05:01:06 Modified: andromda-ejb3/src/site changes.xml andromda-ejb3/src/main/resources/templates/ejb3 EntityEmbeddable.vsl Log: fix support for abstract entity class declaration by modelliing entity as abstract (not mapped or having an implementation) Revision Changes Path 1.12 +8 -0 cartridges/andromda-ejb3/src/site/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/site/changes.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -r1.11 -r1.12 --- changes.xml 18 Feb 2007 10:43:08 -0000 1.11 +++ changes.xml 26 Mar 2007 12:01:05 -0000 1.12 @@ -390,6 +390,14 @@ Set default topic subscription durability as NonDurable in case a Topic does not have the subscription durability TV modelled. </action> + <action dev="vancek" due-to="heapifyman" type="fix"> + Fix entity constructor generation when no attributes modelled but operation and associations exist. + </action> + <action dev="vancek" due-to="jonnyBgood" type="fix"> + Fix support for abstract super entity (add super to class declaration) even when super entity is not a + mapped superclass or specializes another entity. This also cleaned up the constructor implementation in + the inheriting entity. + </action> </release> </body> </document> \ No newline at end of file 1.46 +1 -4 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl Index: EntityEmbeddable.vsl =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/EntityEmbeddable.vsl,v retrieving revision 1.45 retrieving revision 1.46 diff -u -w -r1.45 -r1.46 --- EntityEmbeddable.vsl 28 Feb 2007 00:56:18 -0000 1.45 +++ EntityEmbeddable.vsl 26 Mar 2007 12:01:06 -0000 1.46 @@ -119,7 +119,7 @@ #* *##end #**##end #end -public#if ($entity.entityImplementationRequired || $entity.embeddableSuperclass) abstract class ${entity.entityEmbeddableName}#else class ${entity.entityName}#end +public#if ($entity.entityImplementationRequired || $entity.embeddableSuperclass) abstract class ${entity.entityEmbeddableName}#else#if($entity.abstract) abstract#end class ${entity.entityName}#end #if($entity.requiresGeneralizationMapping) #**##if($entity.embeddableSuperclassGeneralizationExists) @@ -258,9 +258,6 @@ */ public #if ($entity.entityImplementationRequired || $entity.embeddableSuperclass)${entity.entityEmbeddableName}#else${entity.entityName}#end($entity.getAttributesAsList($allAttributes, true, true, false)) { -#**##if(!$inheritedAttributes.empty) - super($entity.getAttributesAsList($inheritedAttributes, false, true, false)); -#**##end #**##foreach ($attribute in $updatableAttributes) ${attribute.setterName}(${attribute.name}); #**##end |