From: Chad B. <cwb...@us...> - 2004-11-21 23:57:16
|
User: cwbrandon Date: 04/11/21 15:56:22 Modified: andromda-spring/src/test/uml SpringCartridgeTestModel.xml.zip uml/uml14/src/java/org/andromda/metafacades/uml14 AssociationEndFacadeLogicImpl.java AttributeFacadeLogicImpl.java andromda-spring/src/test/expected cartridge-output.zip Log: Fix issue with '*' not working for multiplicity. Also add a new test to the spring cartridge. Revision Changes Path 1.18 +67 -68 cartridges/andromda-spring/src/test/uml/SpringCartridgeTestModel.xml.zip <<Binary file>> 1.12 +4 -20 metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java Index: AssociationEndFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -w -r1.11 -r1.12 --- AssociationEndFacadeLogicImpl.java 25 Oct 2004 01:13:55 -0000 1.11 +++ AssociationEndFacadeLogicImpl.java 21 Nov 2004 23:56:20 -0000 1.12 @@ -3,12 +3,9 @@ import java.util.Collection; import java.util.Iterator; -import org.andromda.core.mapping.Mappings; import org.andromda.core.common.StringUtilsHelper; -import org.andromda.metafacades.uml.AssociationEndFacade; +import org.andromda.core.mapping.Mappings; import org.andromda.metafacades.uml.ClassifierFacade; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.collections.Predicate; import org.apache.commons.lang.StringUtils; import org.omg.uml.foundation.core.AssociationEnd; import org.omg.uml.foundation.datatypes.AggregationKindEnum; @@ -118,7 +115,7 @@ */ public boolean handleIsMany() { - boolean isMultiple = false; + boolean isMany = false; Multiplicity multiplicity = this.metaObject.getMultiplicity(); //we'll say a null multiplicity is 1 if (multiplicity != null) @@ -132,24 +129,11 @@ MultiplicityRange multiplicityRange = (MultiplicityRange)rangeIt .next(); int upper = multiplicityRange.getUpper(); - int lower = multiplicityRange.getLower(); - int rangeSize = upper - lower; - if (upper > 1) - { - isMultiple = true; - } - else if (rangeSize < 0) - { - isMultiple = true; - } - else - { - isMultiple = false; - } + isMany = upper > 1 || upper < 0; } } } - return isMultiple; + return isMany; } /** 1.18 +1 -14 metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AttributeFacadeLogicImpl.java Index: AttributeFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AttributeFacadeLogicImpl.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -r1.17 -r1.18 --- AttributeFacadeLogicImpl.java 24 Oct 2004 22:20:30 -0000 1.17 +++ AttributeFacadeLogicImpl.java 21 Nov 2004 23:56:21 -0000 1.18 @@ -164,20 +164,7 @@ MultiplicityRange multiplicityRange = (MultiplicityRange)rangeIt .next(); int upper = multiplicityRange.getUpper(); - int lower = multiplicityRange.getLower(); - int rangeSize = upper - lower; - if (upper > 1) - { - isMany = true; - } - else if (rangeSize < 0) - { - isMany = true; - } - else - { - isMany = false; - } + isMany = upper > 1 || upper < 0; } } } 1.33 +143 -105 cartridges/andromda-spring/src/test/expected/cartridge-output.zip <<Binary file>> |