Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkhussey2010-05-26 15:54:18 +0000
committerkhussey2010-05-26 15:54:18 +0000
commita524bce28255fbf5169110679a2ec355e68fcb65 (patch)
treec3e9a78e5dea64ce4d37c423cb20571f837d760d /plugins/org.eclipse.uml2.uml
parent4cd4a78cc5b8515dbd215ae72682014f478df5d1 (diff)
downloadorg.eclipse.uml2.test-a524bce28255fbf5169110679a2ec355e68fcb65.tar.gz
org.eclipse.uml2.test-a524bce28255fbf5169110679a2ec355e68fcb65.tar.xz
org.eclipse.uml2.test-a524bce28255fbf5169110679a2ec355e68fcb65.zip
[313601] Safely returning stereotype applications for required stereotypes.
Diffstat (limited to 'plugins/org.eclipse.uml2.uml')
-rw-r--r--plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
index 967131c8..f3426308 100644
--- a/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
+++ b/plugins/org.eclipse.uml2.uml/src/org/eclipse/uml2/uml/util/UMLUtil.java
@@ -9,9 +9,9 @@
* IBM - initial API and implementation
* Kenn Hussey (Embarcadero Technologies) - 199624, 184249, 204406, 208125, 204200, 213218, 213903, 220669, 208016, 226396, 271470
* Nicolas Rouquette (JPL) - 260120, 313837
- * Kenn Hussey - 286329
+ * Kenn Hussey - 286329, 313601
*
- * $Id: UMLUtil.java,v 1.86 2010/05/25 13:37:10 khussey Exp $
+ * $Id: UMLUtil.java,v 1.87 2010/05/26 15:54:18 khussey Exp $
*/
package org.eclipse.uml2.uml.util;
@@ -9076,7 +9076,10 @@ public class UMLUtil
: nearestPackage).applyProfile(profile);
}
- stereotypeApplication = element.applyStereotype(stereotype);
+ stereotypeApplication = element
+ .isStereotypeRequired(stereotype)
+ ? element.getStereotypeApplication(stereotype)
+ : element.applyStereotype(stereotype);
}
}

Back to the top