Author: thn Date: 2011-02-24 01:06:37-0800 New Revision: 19067 Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Log: handling of "*" as a valid UnlimitedNatural value Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java?view=diff&pathrev=19067&r1=19066&r2=19067 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ExtensionMechanismsHelperEUMLImpl.java 2011-02-24 01:06:37-0800 @@ -20,7 +20,6 @@ import java.util.List; import org.argouml.model.ExtensionMechanismsHelper; -import org.argouml.model.UmlHelper; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; @@ -29,6 +28,7 @@ import org.eclipse.uml2.uml.Class; import org.eclipse.uml2.uml.Element; import org.eclipse.uml2.uml.Extension; +import org.eclipse.uml2.uml.LiteralUnlimitedNatural; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.Package; import org.eclipse.uml2.uml.Profile; @@ -366,6 +366,11 @@ } Element elem = (Element) handle; Property prop = (Property) property; + if (prop.getType() != null + && "UnlimitedNatural".equals(prop.getType().getName()) + && "*".equals(value)) { + value = LiteralUnlimitedNatural.UNLIMITED; + } Stereotype stereotype = (Stereotype) prop.eContainer(); UMLUtil.setTaggedValue(elem, stereotype, prop.getName(), value); } Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&pathrev=19067&r1=19066&r2=19067 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java 2011-02-24 01:06:37-0800 @@ -85,6 +85,7 @@ import org.eclipse.uml2.uml.LiteralBoolean; import org.eclipse.uml2.uml.LiteralInteger; import org.eclipse.uml2.uml.LiteralString; +import org.eclipse.uml2.uml.LiteralUnlimitedNatural; import org.eclipse.uml2.uml.Message; import org.eclipse.uml2.uml.Model; import org.eclipse.uml2.uml.MultiplicityElement; @@ -1662,8 +1663,14 @@ Element elem = (Element) handle; Property prop = (Property) property; Stereotype stereotype = (Stereotype) prop.eContainer(); - return UMLUtil.getTaggedValue(elem, stereotype.getQualifiedName(), + Object value = UMLUtil.getTaggedValue(elem, stereotype.getQualifiedName(), prop.getName()); + if (prop.getType() != null + && "UnlimitedNatural".equals(prop.getType().getName()) + && (new Integer(LiteralUnlimitedNatural.UNLIMITED)).equals(value)) { + value = "*"; + } + return value; } public VisibilityKind getVisibility(Object handle) { ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2707137 To unsubscribe from this discussion, e-mail: [[email protected]].
