From: <cat...@us...> - 2009-12-29 22:30:32
|
Revision: 13266 http://andromda.svn.sourceforge.net/andromda/?rev=13266&view=rev Author: catforce Date: 2009-12-29 22:30:23 +0000 (Tue, 29 Dec 2009) Log Message: ----------- Added new methods to create "addXXX" and "removeXXX" methodnames for AssociationEnds Modified Paths: -------------- trunk/metafacades/uml/common/src/uml/andromda-metafacades-uml.xml.zip trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/AssociationEndFacadeLogicImpl.java trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndFacadeLogicImpl.java trunk/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java Modified: trunk/metafacades/uml/common/src/uml/andromda-metafacades-uml.xml.zip =================================================================== (Binary files differ) Modified: trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/AssociationEndFacadeLogicImpl.java =================================================================== --- trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/AssociationEndFacadeLogicImpl.java 2009-12-29 12:59:30 UTC (rev 13265) +++ trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/AssociationEndFacadeLogicImpl.java 2009-12-29 22:30:23 UTC (rev 13266) @@ -194,6 +194,24 @@ } /** + * @see org.andromda.metafacades.uml.AssociationEndFacade#getAdderName() + */ + @Override + protected String handleGetAdderName() + { + return "add" + StringUtils.capitalize(this.getName()); + } + + /** + * @see org.andromda.metafacades.uml.AssociationEndFacade#getRemoverName() + */ + @Override + protected String handleGetRemoverName() + { + return "remove" + StringUtils.capitalize(this.getName()); + } + + /** * @see org.andromda.metafacades.uml.AssociationEndFacade#getGetterSetterTypeName() */ @Override @@ -208,8 +226,7 @@ name = mappings.getTo(this.isOrdered() ? UMLProfile.LIST_TYPE_NAME : UMLProfile.COLLECTION_TYPE_NAME); } - // set this association end's type as a template parameter if - // required + // set this association end's type as a template parameter if required if (this.getType() != null && BooleanUtils.toBoolean( ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.ENABLE_TEMPLATING)))) { Modified: trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndFacadeLogicImpl.java =================================================================== --- trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndFacadeLogicImpl.java 2009-12-29 12:59:30 UTC (rev 13265) +++ trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AssociationEndFacadeLogicImpl.java 2009-12-29 22:30:23 UTC (rev 13266) @@ -195,6 +195,24 @@ } /** + * @see org.andromda.metafacades.uml.AssociationEndFacade#getAdderName() + */ + @Override + protected String handleGetAdderName() + { + return "add" + StringUtils.capitalize(this.getName()); + } + + /** + * @see org.andromda.metafacades.uml.AssociationEndFacade#getRemoverName() + */ + @Override + protected String handleGetRemoverName() + { + return "remove" + StringUtils.capitalize(this.getName()); + } + + /** * @see org.andromda.metafacades.uml.AssociationEndFacade#getGetterSetterTypeName() */ @Override @@ -269,7 +287,7 @@ @Override protected Association handleGetAssociation() { - return (Association)this.metaObject.getAssociation(); + return this.metaObject.getAssociation(); } /** Modified: trunk/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java =================================================================== --- trunk/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java 2009-12-29 12:59:30 UTC (rev 13265) +++ trunk/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java 2009-12-29 22:30:23 UTC (rev 13266) @@ -54,10 +54,9 @@ @Override protected AssociationEnd handleGetOtherEnd() { - final Collection ends = metaObject.getAssociation().getConnection(); - for (final Iterator endIt = ends.iterator(); endIt.hasNext();) + final Collection<AssociationEnd> ends = metaObject.getAssociation().getConnection(); + for (final AssociationEnd end : ends) { - final AssociationEnd end = (AssociationEnd)endIt.next(); if (!metaObject.equals(end)) { return end; @@ -183,10 +182,8 @@ final Collection<MultiplicityRange> ranges = multiplicity.getRange(); if (ranges != null && !ranges.isEmpty()) { - final Iterator<MultiplicityRange> rangeIt = ranges.iterator(); - while (rangeIt.hasNext()) + for (MultiplicityRange multiplicityRange : ranges) { - final MultiplicityRange multiplicityRange = rangeIt.next(); final int upper = multiplicityRange.getUpper(); isMany = upper > 1 || upper < 0; } @@ -291,6 +288,24 @@ } /** + * @see org.andromda.metafacades.uml.AssociationEndFacade#getAdderName() + */ + @Override + protected String handleGetAdderName() + { + return "add" + StringUtils.capitalize(this.getName()); + } + + /** + * @see org.andromda.metafacades.uml.AssociationEndFacade#getRemoverName() + */ + @Override + protected String handleGetRemoverName() + { + return "remove" + StringUtils.capitalize(this.getName()); + } + + /** * @see org.andromda.metafacades.uml.AssociationEndFacade#getAssociation() */ @Override @@ -361,12 +376,10 @@ if (multiplicity != null) { final Collection<MultiplicityRange> ranges = multiplicity.getRange(); - if (ranges != null && !ranges.isEmpty()) + if (ranges != null) { - final Iterator<MultiplicityRange> rangeIt = ranges.iterator(); - while (rangeIt.hasNext()) + for (MultiplicityRange multiplicityRange : ranges) { - final MultiplicityRange multiplicityRange = rangeIt.next(); upper = multiplicityRange.getUpper(); } } @@ -390,12 +403,10 @@ if (multiplicity != null) { final Collection<MultiplicityRange> ranges = multiplicity.getRange(); - if (ranges != null && !ranges.isEmpty()) + if (ranges != null) { - final Iterator<MultiplicityRange> rangeIt = ranges.iterator(); - while (rangeIt.hasNext()) + for (MultiplicityRange multiplicityRange : ranges) { - final MultiplicityRange multiplicityRange = rangeIt.next(); lower = multiplicityRange.getLower(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |