diff options
author | ytanguy | 2012-02-21 16:27:18 +0000 |
---|---|---|
committer | ytanguy | 2012-02-21 16:27:18 +0000 |
commit | bc2fbe85dc0e0606b800b34287c1dc473057e5fd (patch) | |
tree | 8e135832404c761e1dab326ce7ac590e6e4dd765 /plugins/sysml | |
parent | b9efd33191fe47cf43db7acda23ccf9dd7505756 (diff) | |
download | org.eclipse.papyrus-bc2fbe85dc0e0606b800b34287c1dc473057e5fd.tar.gz org.eclipse.papyrus-bc2fbe85dc0e0606b800b34287c1dc473057e5fd.tar.xz org.eclipse.papyrus-bc2fbe85dc0e0606b800b34287c1dc473057e5fd.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/sysml')
27 files changed, 47 insertions, 56 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 ed19113e480..30414b6d88d 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 @@ -16,6 +16,7 @@ package org.eclipse.papyrus.sysml.diagram.blockdefinition; import org.eclipse.emf.ecore.EObject;
import org.eclipse.papyrus.infra.core.extension.commands.PerspectiveContextDependence;
import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
+import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
import org.eclipse.uml2.uml.util.UMLUtil;
/**
@@ -30,7 +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))) {
+ if(pack.isProfileApplied(UMLUtil.getProfile(BlocksPackage.eINSTANCE, pack))
+ && pack.isProfileApplied(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE, pack))) {
return true;
}
}
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java index 6af8195aa9c..45065b1199c 100644 --- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java +++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/utils/SysMLSelectionTester.java @@ -20,7 +20,7 @@ import org.eclipse.papyrus.infra.core.resource.NotFoundException; import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.utils.ServiceUtilsForActionHandlers;
-import org.eclipse.papyrus.sysml.SysmlPackage;
+import org.eclipse.papyrus.sysml.blocks.BlocksPackage;
import org.eclipse.papyrus.sysml.diagram.common.Activator;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.PlatformUI;
@@ -65,27 +65,34 @@ public class SysMLSelectionTester extends PropertyTester { protected boolean testSysMLModelNature(Object receiver) {
boolean isSysMLModel = false;
+ EObject root = getRoot();
+ if(root instanceof Package) {
+ Profile sysml = UMLUtil.getProfile(BlocksPackage.eINSTANCE, root);
+ if(((Package)root).isProfileApplied(sysml)) {
+ isSysMLModel = true;
+ }
+ }
+
+ return isSysMLModel;
+ }
+
+ /** Returns the root EObject of currently opened model */
+ private EObject getRoot() {
+ EObject root = null;
+
try {
- ServiceUtilsForActionHandlers serviceUtils = new ServiceUtilsForActionHandlers();
+ ServiceUtilsForActionHandlers serviceUtils = ServiceUtilsForActionHandlers.getInstance();
UmlModel openedModel = (UmlModel)serviceUtils.getModelSet().getModel(UmlModel.MODEL_ID);
if(openedModel != null) {
-
- EObject root = openedModel.lookupRoot();
- if(root instanceof Package) {
- Profile sysml = UMLUtil.getProfile(SysmlPackage.eINSTANCE);
- if(((Package)root).isProfileApplied(sysml)) {
- isSysMLModel = true;
- }
- }
+ root = openedModel.lookupRoot();
}
-
} catch (ServiceException e) {
Activator.log.error(e);
} catch (NotFoundException e) {
Activator.log.error(e);
}
- return isSysMLModel;
+ return root;
}
}
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java index 4d17d259d0f..cad044bb8da 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/AllocateEditHelperAdvice.java @@ -22,7 +22,6 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Allocate} edit helper advice */
@@ -30,7 +29,7 @@ public class AllocateEditHelperAdvice extends AbstractStereotypedElementEditHelp /** Default constructor */
public AllocateEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(AllocationsPackage.eINSTANCE));
+ requiredProfiles.add(AllocationsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java index f2df8b1030b..4453a4a0853 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/BlockEditHelperAdvice.java @@ -30,7 +30,6 @@ import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedEl import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML Block edit helper advice */
@@ -38,7 +37,7 @@ public class BlockEditHelperAdvice extends AbstractStereotypedElementEditHelperA /** Default constructor */
public BlockEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(BlocksPackage.eINSTANCE));
+ requiredProfiles.add(BlocksPackage.eINSTANCE);
}
/**
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java index bc1840a9ea7..18c1accd4de 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConformEditHelperAdvice.java @@ -22,7 +22,6 @@ import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Conform} edit helper advice */
@@ -30,7 +29,7 @@ public class ConformEditHelperAdvice extends AbstractStereotypedElementEditHelpe /** Default constructor */
public ConformEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(ModelelementsPackage.eINSTANCE));
+ requiredProfiles.add(ModelelementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java index 7108c066a89..503c08ca3c1 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintBlockEditHelperAdvice.java @@ -27,7 +27,6 @@ import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link ConstraintBlock} edit helper advice */
@@ -35,7 +34,7 @@ public class ConstraintBlockEditHelperAdvice extends AbstractStereotypedElementE /** Default constructor */
public ConstraintBlockEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(ConstraintsPackage.eINSTANCE));
+ requiredProfiles.add(ConstraintsPackage.eINSTANCE);
}
/**
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java index 454db389b58..b3248f9da43 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ConstraintPropertyEditHelperAdvice.java @@ -35,7 +35,7 @@ public class ConstraintPropertyEditHelperAdvice extends AbstractStereotypedEleme /** Default constructor */
public ConstraintPropertyEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(ConstraintsPackage.eINSTANCE));
+ requiredProfiles.add(ConstraintsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java index e13cff9d4c0..be375263e0e 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/CopyEditHelperAdvice.java @@ -22,7 +22,6 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Copy} edit helper advice */
@@ -30,7 +29,7 @@ public class CopyEditHelperAdvice extends AbstractStereotypedElementEditHelperAd /** Default constructor */
public CopyEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(RequirementsPackage.eINSTANCE));
+ requiredProfiles.add(RequirementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java index aec5dac1f2f..b61c7039d09 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DeriveReqtEditHelperAdvice.java @@ -24,7 +24,6 @@ import org.eclipse.papyrus.sysml.requirements.RequirementsPackage; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML DeriveReqt edit helper advice */
@@ -32,7 +31,7 @@ public class DeriveReqtEditHelperAdvice extends AbstractStereotypedElementEditHe /** Default constructor */
public DeriveReqtEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(RequirementsPackage.eINSTANCE));
+ requiredProfiles.add(RequirementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java index 0df608561b6..7ec00a33396 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/DimensionEditHelperAdvice.java @@ -23,7 +23,6 @@ import org.eclipse.papyrus.sysml.blocks.BlocksPackage; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Dimension} edit helper advice */
@@ -31,7 +30,7 @@ public class DimensionEditHelperAdvice extends AbstractStereotypedElementEditHel /** Default constructor */
public DimensionEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(BlocksPackage.eINSTANCE));
+ requiredProfiles.add(BlocksPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java index 890a114e375..7b7151bf25b 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortEditHelperAdvice.java @@ -45,7 +45,7 @@ public class FlowPortEditHelperAdvice extends AbstractStereotypedElementEditHelp /** Default constructor */
public FlowPortEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/**
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java index 9f9bd80e599..d42690c1554 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInEditHelperAdvice.java @@ -32,7 +32,7 @@ public class FlowPortInEditHelperAdvice extends AbstractStereotypedElementEditHe /** Default constructor */
public FlowPortInEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java index fd43c9f85a6..59bded5565a 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortInOutEditHelperAdvice.java @@ -32,7 +32,7 @@ public class FlowPortInOutEditHelperAdvice extends AbstractStereotypedElementEdi /** Default constructor */
public FlowPortInOutEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java index 13e55aa1d1d..2cb930b617e 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortNAEditHelperAdvice.java @@ -31,7 +31,7 @@ public class FlowPortNAEditHelperAdvice extends AbstractStereotypedElementEditHe /** Default constructor */
public FlowPortNAEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/** Verify that the new FlowPort is typed by a FlowSpecification */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java index a8622048f59..75720c8e0fb 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPortOutEditHelperAdvice.java @@ -32,7 +32,7 @@ public class FlowPortOutEditHelperAdvice extends AbstractStereotypedElementEditH /** Default constructor */
public FlowPortOutEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java index be1d27f9a44..4010472bf93 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowPropertyEditHelperAdvice.java @@ -44,7 +44,7 @@ public class FlowPropertyEditHelperAdvice extends AbstractStereotypedElementEdit /** Default constructor */
public FlowPropertyEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/**
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java index 4f5b677aa0a..4f90474b6cc 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/FlowSpecificationEditHelperAdvice.java @@ -37,7 +37,6 @@ import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedEl import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML FlowSpecification edit helper advice */
@@ -45,7 +44,7 @@ public class FlowSpecificationEditHelperAdvice extends AbstractStereotypedElemen /** Default constructor */
public FlowSpecificationEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/**
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java index b3257739e89..86bc550f3fe 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ItemFlowEditHelperAdvice.java @@ -22,7 +22,6 @@ import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link ItemFlow} edit helper advice */
@@ -30,7 +29,7 @@ public class ItemFlowEditHelperAdvice extends AbstractStereotypedElementEditHelp /** Default constructor */
public ItemFlowEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(PortandflowsPackage.eINSTANCE));
+ requiredProfiles.add(PortandflowsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java index 69554b0cb2b..29afaa4ba3b 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ProblemEditHelperAdvice.java @@ -21,7 +21,6 @@ import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage; import org.eclipse.papyrus.sysml.modelelements.Problem;
import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Problem} edit helper advice */
@@ -29,7 +28,7 @@ public class ProblemEditHelperAdvice extends AbstractStereotypedElementEditHelpe /** Default constructor */
public ProblemEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(ModelelementsPackage.eINSTANCE));
+ requiredProfiles.add(ModelelementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java index 47d5d3477f7..1fcea33dadb 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RationaleEditHelperAdvice.java @@ -21,7 +21,6 @@ import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage; import org.eclipse.papyrus.sysml.modelelements.Rationale;
import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.uml2.uml.Element;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Rationale} edit helper advice */
@@ -29,7 +28,7 @@ public class RationaleEditHelperAdvice extends AbstractStereotypedElementEditHel /** Default constructor */
public RationaleEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(ModelelementsPackage.eINSTANCE));
+ requiredProfiles.add(ModelelementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java index adcc8dc8696..8f3a88c2a08 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/RequirementEditHelperAdvice.java @@ -29,7 +29,6 @@ import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedEl import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML Requirement edit helper advice */
@@ -37,7 +36,7 @@ public class RequirementEditHelperAdvice extends AbstractStereotypedElementEditH /** Default constructor */
public RequirementEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(RequirementsPackage.eINSTANCE));
+ requiredProfiles.add(RequirementsPackage.eINSTANCE);
}
/**
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java index dbc1a7d505f..455e60ef1ff 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/SatisfyEditHelperAdvice.java @@ -25,7 +25,6 @@ import org.eclipse.papyrus.sysml.requirements.Satisfy; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Satisfy} edit helper advice */
@@ -33,7 +32,7 @@ public class SatisfyEditHelperAdvice extends AbstractStereotypedElementEditHelpe /** Default constructor */
public SatisfyEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(RequirementsPackage.eINSTANCE));
+ requiredProfiles.add(RequirementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java index d411e088a3e..313f9fd9186 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/UnitEditHelperAdvice.java @@ -22,7 +22,6 @@ import org.eclipse.papyrus.sysml.blocks.Unit; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Unit} edit helper advice */
@@ -30,7 +29,7 @@ public class UnitEditHelperAdvice extends AbstractStereotypedElementEditHelperAd /** Default constructor */
public UnitEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(BlocksPackage.eINSTANCE));
+ requiredProfiles.add(BlocksPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java index 504ab9c1399..9debed1f5d6 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ValueTypeEditHelperAdvice.java @@ -22,7 +22,6 @@ import org.eclipse.papyrus.sysml.blocks.ValueType; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link ValueType} edit helper advice */
@@ -30,7 +29,7 @@ public class ValueTypeEditHelperAdvice extends AbstractStereotypedElementEditHel /** Default constructor */
public ValueTypeEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(BlocksPackage.eINSTANCE));
+ requiredProfiles.add(BlocksPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java index b2059996530..8cb2f15efdf 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/VerifyEditHelperAdvice.java @@ -25,7 +25,6 @@ import org.eclipse.papyrus.sysml.requirements.Verify; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link Verify} edit helper advice */
@@ -33,7 +32,7 @@ public class VerifyEditHelperAdvice extends AbstractStereotypedElementEditHelper /** Default constructor */
public VerifyEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(RequirementsPackage.eINSTANCE));
+ requiredProfiles.add(RequirementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java index ae801e6a52f..d9ce3818013 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewEditHelperAdvice.java @@ -23,7 +23,6 @@ import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link View} edit helper advice */
@@ -31,7 +30,7 @@ public class ViewEditHelperAdvice extends AbstractStereotypedElementEditHelperAd /** Default constructor */
public ViewEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(ModelelementsPackage.eINSTANCE));
+ requiredProfiles.add(ModelelementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java index 0d5c790883e..bd83a71bdf2 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.service.types/src/org/eclipse/papyrus/sysml/service/types/helper/ViewPointEditHelperAdvice.java @@ -22,7 +22,6 @@ import org.eclipse.papyrus.sysml.modelelements.ViewPoint; import org.eclipse.papyrus.uml.service.types.helper.advice.AbstractStereotypedElementEditHelperAdvice;
import org.eclipse.papyrus.uml.service.types.utils.NamedElementHelper;
import org.eclipse.uml2.uml.NamedElement;
-import org.eclipse.uml2.uml.util.UMLUtil;
import org.eclipse.uml2.uml.util.UMLUtil.StereotypeApplicationHelper;
/** SysML {@link ViewPoint} edit helper advice */
@@ -30,7 +29,7 @@ public class ViewPointEditHelperAdvice extends AbstractStereotypedElementEditHel /** Default constructor */
public ViewPointEditHelperAdvice() {
- requiredProfiles.add(UMLUtil.getProfile(ModelelementsPackage.eINSTANCE));
+ requiredProfiles.add(ModelelementsPackage.eINSTANCE);
}
/** Complete creation process by applying the expected stereotype */
|