Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorytanguy2012-02-22 07:47:21 -0500
committerytanguy2012-02-22 07:47:21 -0500
commit8ec82ea54ac6d92566f651c1f38162d61217a2b3 (patch)
tree245adb06ab318df3958af81edbbbdcc5269bfef4 /plugins
parent0e3c601f08641140256b7a0299b24d0b4edd3df5 (diff)
downloadorg.eclipse.papyrus-8ec82ea54ac6d92566f651c1f38162d61217a2b3.tar.gz
org.eclipse.papyrus-8ec82ea54ac6d92566f651c1f38162d61217a2b3.tar.xz
org.eclipse.papyrus-8ec82ea54ac6d92566f651c1f38162d61217a2b3.zip
RESOLVED - bug 369505: [Refactor] Update to UML2.4 - Use getStereotypeApplication from UML plug-in
https://bugs.eclipse.org/bugs/show_bug.cgi?id=369505
Diffstat (limited to 'plugins')
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractStereotypedElementEditHelperAdvice.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
index 30414b6d88d..d92666a740b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src/org/eclipse/papyrus/sysml/diagram/blockdefinition/BlockDefinitionDiagramCondition.java
@@ -31,8 +31,8 @@ public class BlockDefinitionDiagramCondition extends PerspectiveContextDependenc
if(super.create(selectedElement)) {
if(selectedElement instanceof org.eclipse.uml2.uml.Package) {
org.eclipse.uml2.uml.Package pack = (org.eclipse.uml2.uml.Package)selectedElement;
- if(pack.isProfileApplied(UMLUtil.getProfile(BlocksPackage.eINSTANCE, pack))
- && pack.isProfileApplied(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE, pack))) {
+ if(pack.getAllAppliedProfiles().contains(UMLUtil.getProfile(BlocksPackage.eINSTANCE, pack))
+ && pack.getAllAppliedProfiles().contains(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE, pack))) {
return true;
}
}
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractStereotypedElementEditHelperAdvice.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractStereotypedElementEditHelperAdvice.java
index 641acd72d7a..b8d409b05ab 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractStereotypedElementEditHelperAdvice.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/helper/advice/AbstractStereotypedElementEditHelperAdvice.java
@@ -64,7 +64,7 @@ public abstract class AbstractStereotypedElementEditHelperAdvice extends Abstrac
// Ensure all necessary profiles are effectively applied
if(profileApplicationContext != null) {
for(EPackage requiredProfile : requiredProfiles) {
- if(! profileApplicationContext.isProfileApplied(UMLUtil.getProfile(requiredProfile, profileApplicationContext))) {
+ if(! profileApplicationContext.getAllAppliedProfiles().contains(UMLUtil.getProfile(requiredProfile, profileApplicationContext))) {
isApproved = false;
break;
}

Back to the top