From: Vance K. <va...@us...> - 2006-11-28 12:26:30
|
User: vancek Date: 06/11/28 04:26:30 Modified: andromda-ejb3/src/main/resources/templates/ejb3 GlobalMacros.vm Log: prevent compareTo compare entity properties with Collection/List/Set types Revision Changes Path 1.4 +1 -1 cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm Index: GlobalMacros.vm =================================================================== RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/resources/templates/ejb3/GlobalMacros.vm,v retrieving revision 1.3 retrieving revision 1.4 diff -u -w -r1.3 -r1.4 --- GlobalMacros.vm 1 Jul 2006 10:13:01 -0000 1.3 +++ GlobalMacros.vm 28 Nov 2006 12:26:29 -0000 1.4 @@ -155,7 +155,7 @@ else { #* *##foreach ($attribute in $attributes) -#* *##if (!$attribute.type.primitive && !$attribute.type.arrayType && !$attribute.lob && !$attribute.identifier && !$attribute.containsEmbeddedObject) +#* *##if (!$attribute.type.primitive && !$attribute.type.arrayType && !$attribute.lob && !$attribute.identifier && !$attribute.containsEmbeddedObject && !$attribute.type.collectionType) if (this.${attribute.getterName}() != null) { cmp = (cmp != 0 ? cmp : this.${attribute.getterName}().compareTo(o.${attribute.getterName}())); |