diff options
| author | ytanguy | 2012-01-26 18:10:43 +0000 |
|---|---|---|
| committer | ytanguy | 2012-01-26 18:10:43 +0000 |
| commit | 493a70a2e1a3897f4a6535bd5be4b1bf93acb237 (patch) | |
| tree | 8e2dbabd940670b9224d71cf2793ab7494aff6cd | |
| parent | 61e7cc81e349c534326038039e973c131f074694 (diff) | |
| download | org.eclipse.papyrus-493a70a2e1a3897f4a6535bd5be4b1bf93acb237.tar.gz org.eclipse.papyrus-493a70a2e1a3897f4a6535bd5be4b1bf93acb237.tar.xz org.eclipse.papyrus-493a70a2e1a3897f4a6535bd5be4b1bf93acb237.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
40 files changed, 384 insertions, 228 deletions
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java index c7f8d8297e4..fee9a09f7d9 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ContinuousItemProvider.java @@ -33,11 +33,11 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.papyrus.sysml.activities.Continuous;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Continuous} object.
@@ -115,9 +115,8 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTINUOUS_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Continuous steApplication = UMLUtil.getStereotypeApplication(element, Continuous.class);
+ if(steApplication != null) {
}
return itemPropertyDescriptorsForparameter;
@@ -139,9 +138,8 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTINUOUS_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Continuous steApplication = UMLUtil.getStereotypeApplication(element, Continuous.class);
+ if(steApplication != null) {
}
return itemPropertyDescriptorsForactivityEdge;
@@ -183,7 +181,8 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing Continuous continuous_ = null;
if(object instanceof org.eclipse.uml2.uml.Parameter) {
- Stereotype ste = ((org.eclipse.uml2.uml.Parameter)object).getAppliedStereotype(SysmlResource.CONTINUOUS_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Parameter)object, Continuous.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
String result = ite.getText(object);
@@ -194,7 +193,8 @@ public class ContinuousItemProvider extends RateItemProvider implements IEditing }
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
- Stereotype ste = ((org.eclipse.uml2.uml.ActivityEdge)object).getAppliedStereotype(SysmlResource.CONTINUOUS_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ActivityEdge)object, Continuous.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java index 357cb8e6798..241d3582861 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ControlOperatorItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.activities.ControlOperator; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.ControlOperator} object.
@@ -121,9 +121,8 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForoperation.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTROL_OPERATOR_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ControlOperator steApplication = UMLUtil.getStereotypeApplication(element, ControlOperator.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForoperation.add(createBase_OperationPropertyDescriptorForOperation(steApplication));
@@ -153,9 +152,8 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForbehavior.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONTROL_OPERATOR_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ControlOperator steApplication = UMLUtil.getStereotypeApplication(element, ControlOperator.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForbehavior.add(createBase_OperationPropertyDescriptorForOperation(steApplication));
@@ -319,7 +317,8 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem ControlOperator controlOperator_ = null;
if(object instanceof org.eclipse.uml2.uml.Operation) {
- Stereotype ste = ((org.eclipse.uml2.uml.Operation)object).getAppliedStereotype(SysmlResource.CONTROL_OPERATOR_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Operation)object, ControlOperator.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OPERATION);
String result = ite.getText(object);
@@ -330,7 +329,8 @@ public class ControlOperatorItemProvider extends SysMLItemProviderAdapter implem }
if(object instanceof org.eclipse.uml2.uml.Behavior) {
- Stereotype ste = ((org.eclipse.uml2.uml.Behavior)object).getAppliedStereotype(SysmlResource.CONTROL_OPERATOR_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Behavior)object, ControlOperator.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.BEHAVIOR);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java index b149ff7913c..c5705add00d 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/DiscreteItemProvider.java @@ -33,11 +33,11 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.papyrus.sysml.activities.Discrete;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Discrete} object.
@@ -115,9 +115,8 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.DISCRETE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Discrete steApplication = UMLUtil.getStereotypeApplication(element, Discrete.class);
+ if(steApplication != null) {
}
return itemPropertyDescriptorsForparameter;
@@ -139,9 +138,8 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.DISCRETE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Discrete steApplication = UMLUtil.getStereotypeApplication(element, Discrete.class);
+ if(steApplication != null) {
}
return itemPropertyDescriptorsForactivityEdge;
@@ -183,7 +181,8 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo Discrete discrete_ = null;
if(object instanceof org.eclipse.uml2.uml.Parameter) {
- Stereotype ste = ((org.eclipse.uml2.uml.Parameter)object).getAppliedStereotype(SysmlResource.DISCRETE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Parameter)object, Discrete.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
String result = ite.getText(object);
@@ -194,7 +193,8 @@ public class DiscreteItemProvider extends RateItemProvider implements IEditingDo }
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
- Stereotype ste = ((org.eclipse.uml2.uml.ActivityEdge)object).getAppliedStereotype(SysmlResource.DISCRETE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ActivityEdge)object, Discrete.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java index da6ec3e6f57..33de0354066 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/NoBufferItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.activities.NoBuffer; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.NoBuffer} object.
@@ -112,9 +112,8 @@ public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForobjectNode.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.NO_BUFFER_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ NoBuffer steApplication = UMLUtil.getStereotypeApplication(element, NoBuffer.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForobjectNode.add(createBase_ObjectNodePropertyDescriptorForObjectNode(steApplication));
@@ -192,7 +191,8 @@ public class NoBufferItemProvider extends SysMLItemProviderAdapter implements IE NoBuffer noBuffer_ = null;
if(object instanceof org.eclipse.uml2.uml.ObjectNode) {
- Stereotype ste = ((org.eclipse.uml2.uml.ObjectNode)object).getAppliedStereotype(SysmlResource.NO_BUFFER_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ObjectNode)object, NoBuffer.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OBJECT_NODE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java index 7d4ef060910..216192dd8c6 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OptionalItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.activities.Optional; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Optional} object.
@@ -112,9 +112,8 @@ public class OptionalItemProvider extends SysMLItemProviderAdapter implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.OPTIONAL_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Optional steApplication = UMLUtil.getStereotypeApplication(element, Optional.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForparameter.add(createBase_ParameterPropertyDescriptorForParameter(steApplication));
@@ -192,7 +191,8 @@ public class OptionalItemProvider extends SysMLItemProviderAdapter implements IE Optional optional_ = null;
if(object instanceof org.eclipse.uml2.uml.Parameter) {
- Stereotype ste = ((org.eclipse.uml2.uml.Parameter)object).getAppliedStereotype(SysmlResource.OPTIONAL_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Parameter)object, Optional.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java index 1a23f0bb06b..d422ae768f2 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/OverwriteItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.activities.Overwrite; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Overwrite} object.
@@ -112,9 +112,8 @@ public class OverwriteItemProvider extends SysMLItemProviderAdapter implements I final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForobjectNode.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.OVERWRITE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Overwrite steApplication = UMLUtil.getStereotypeApplication(element, Overwrite.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForobjectNode.add(createBase_ObjectNodePropertyDescriptorForObjectNode(steApplication));
@@ -192,7 +191,8 @@ public class OverwriteItemProvider extends SysMLItemProviderAdapter implements I Overwrite overwrite_ = null;
if(object instanceof org.eclipse.uml2.uml.ObjectNode) {
- Stereotype ste = ((org.eclipse.uml2.uml.ObjectNode)object).getAppliedStereotype(SysmlResource.OVERWRITE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ObjectNode)object, Overwrite.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OBJECT_NODE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java index 8f01e74babf..7a23a34414f 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/ProbabilityItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.activities.Probability; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Probability} object.
@@ -122,9 +122,8 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROBABILITY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Probability steApplication = UMLUtil.getStereotypeApplication(element, Probability.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForactivityEdge.add(createBase_ActivityEdgePropertyDescriptorForActivityEdge(steApplication));
@@ -158,9 +157,8 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameterSet.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROBABILITY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Probability steApplication = UMLUtil.getStereotypeApplication(element, Probability.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForparameterSet.add(createBase_ActivityEdgePropertyDescriptorForActivityEdge(steApplication));
@@ -385,7 +383,8 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements Probability probability_ = null;
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
- Stereotype ste = ((org.eclipse.uml2.uml.ActivityEdge)object).getAppliedStereotype(SysmlResource.PROBABILITY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ActivityEdge)object, Probability.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
String result = ite.getText(object);
@@ -396,7 +395,8 @@ public class ProbabilityItemProvider extends SysMLItemProviderAdapter implements }
if(object instanceof org.eclipse.uml2.uml.ParameterSet) {
- Stereotype ste = ((org.eclipse.uml2.uml.ParameterSet)object).getAppliedStereotype(SysmlResource.PROBABILITY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ParameterSet)object, Probability.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER_SET);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java index 4a43a46fad6..9f1ec0e4ee8 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/activities/provider/RateItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.activities.Rate; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.activities.Rate} object.
@@ -122,9 +122,8 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForparameter.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.RATE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Rate steApplication = UMLUtil.getStereotypeApplication(element, Rate.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForparameter.add(createBase_ParameterPropertyDescriptorForParameter(steApplication));
@@ -158,9 +157,8 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityEdge.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.RATE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Rate steApplication = UMLUtil.getStereotypeApplication(element, Rate.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForactivityEdge.add(createBase_ParameterPropertyDescriptorForParameter(steApplication));
@@ -385,7 +383,8 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi Rate rate_ = null;
if(object instanceof org.eclipse.uml2.uml.Parameter) {
- Stereotype ste = ((org.eclipse.uml2.uml.Parameter)object).getAppliedStereotype(SysmlResource.RATE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Parameter)object, Rate.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PARAMETER);
String result = ite.getText(object);
@@ -396,7 +395,8 @@ public class RateItemProvider extends SysMLItemProviderAdapter implements IEditi }
if(object instanceof org.eclipse.uml2.uml.ActivityEdge) {
- Stereotype ste = ((org.eclipse.uml2.uml.ActivityEdge)object).getAppliedStereotype(SysmlResource.RATE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ActivityEdge)object, Rate.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_EDGE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java index 14992c9bf96..e7d6f18ee79 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateActivityPartitionItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.AllocateActivityPartition} object.
@@ -112,9 +112,8 @@ public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdap final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForactivityPartition.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.ALLOCATE_ACTIVITY_PARTITION_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ AllocateActivityPartition steApplication = UMLUtil.getStereotypeApplication(element, AllocateActivityPartition.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForactivityPartition.add(createBase_ActivityPartitionPropertyDescriptorForActivityPartition(steApplication));
@@ -192,7 +191,8 @@ public class AllocateActivityPartitionItemProvider extends SysMLItemProviderAdap AllocateActivityPartition allocateActivityPartition_ = null;
if(object instanceof org.eclipse.uml2.uml.ActivityPartition) {
- Stereotype ste = ((org.eclipse.uml2.uml.ActivityPartition)object).getAppliedStereotype(SysmlResource.ALLOCATE_ACTIVITY_PARTITION_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ActivityPartition)object, AllocateActivityPartition.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ACTIVITY_PARTITION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java index 4a79853e426..d22a8898ae6 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocateItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocate} object.
@@ -112,9 +112,8 @@ public class AllocateItemProvider extends SysMLItemProviderAdapter implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.ALLOCATE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Allocate steApplication = UMLUtil.getStereotypeApplication(element, Allocate.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForabstraction.add(createBase_AbstractionPropertyDescriptorForAbstraction(steApplication));
@@ -192,7 +191,8 @@ public class AllocateItemProvider extends SysMLItemProviderAdapter implements IE Allocate allocate_ = null;
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
- Stereotype ste = ((org.eclipse.uml2.uml.Abstraction)object).getAppliedStereotype(SysmlResource.ALLOCATE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Abstraction)object, Allocate.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java index a537045b5ad..2b1797dd901 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/allocations/provider/AllocatedItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.allocations.AllocationsPackage; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.allocations.Allocated} object.
@@ -114,9 +114,8 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFornamedElement.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.ALLOCATED_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Allocated steApplication = UMLUtil.getStereotypeApplication(element, Allocated.class);
+ if(steApplication != null) {
itemPropertyDescriptorsFornamedElement.add(createBase_NamedElementPropertyDescriptorForNamedElement(steApplication));
@@ -266,7 +265,8 @@ public class AllocatedItemProvider extends SysMLItemProviderAdapter implements I Allocated allocated_ = null;
if(object instanceof org.eclipse.uml2.uml.NamedElement) {
- Stereotype ste = ((org.eclipse.uml2.uml.NamedElement)object).getAppliedStereotype(SysmlResource.ALLOCATED_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.NamedElement)object, Allocated.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.NAMED_ELEMENT);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java index fe773a451ee..11fbfc6988f 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BindingConnectorItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.BlocksPackage; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.BindingConnector} object.
@@ -112,9 +112,8 @@ public class BindingConnectorItemProvider extends SysMLItemProviderAdapter imple final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForconnector.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.BINDING_CONNECTOR_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ BindingConnector steApplication = UMLUtil.getStereotypeApplication(element, BindingConnector.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForconnector.add(createBase_ConnectorPropertyDescriptorForConnector(steApplication));
@@ -192,7 +191,8 @@ public class BindingConnectorItemProvider extends SysMLItemProviderAdapter imple BindingConnector bindingConnector_ = null;
if(object instanceof org.eclipse.uml2.uml.Connector) {
- Stereotype ste = ((org.eclipse.uml2.uml.Connector)object).getAppliedStereotype(SysmlResource.BINDING_CONNECTOR_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Connector)object, BindingConnector.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CONNECTOR);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java index 92e60e504b5..8c26c3c92c0 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/BlockItemProvider.java @@ -40,10 +40,10 @@ import org.eclipse.papyrus.sysml.blocks.BlocksPackage; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Block} object.
@@ -115,9 +115,8 @@ public class BlockItemProvider extends SysMLItemProviderAdapter implements IEdit final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.BLOCK_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Block steApplication = UMLUtil.getStereotypeApplication(element, Block.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForclass.add(createIsEncapsulatedPropertyDescriptorForClass(steApplication));
@@ -231,7 +230,8 @@ public class BlockItemProvider extends SysMLItemProviderAdapter implements IEdit Block block_ = null;
if(object instanceof org.eclipse.uml2.uml.Class) {
- Stereotype ste = ((org.eclipse.uml2.uml.Class)object).getAppliedStereotype(SysmlResource.BLOCK_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Class)object, Block.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java index 70c035e1c85..bde4d0d6324 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ConnectorPropertyItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.ConnectorProperty; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ConnectorProperty} object.
@@ -113,9 +113,8 @@ public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter impl final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONNECTOR_PROPERTY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ConnectorProperty steApplication = UMLUtil.getStereotypeApplication(element, ConnectorProperty.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForproperty.add(createBase_PropertyPropertyDescriptorForProperty(steApplication));
@@ -229,7 +228,8 @@ public class ConnectorPropertyItemProvider extends SysMLItemProviderAdapter impl ConnectorProperty connectorProperty_ = null;
if(object instanceof org.eclipse.uml2.uml.Property) {
- Stereotype ste = ((org.eclipse.uml2.uml.Property)object).getAppliedStereotype(SysmlResource.CONNECTOR_PROPERTY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Property)object, ConnectorProperty.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java index cdfb7718736..c4c4b856d6a 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DimensionItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.Dimension; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Dimension} object.
@@ -112,9 +112,8 @@ public class DimensionItemProvider extends SysMLItemProviderAdapter implements I final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinstanceSpecification.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.DIMENSION_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Dimension steApplication = UMLUtil.getStereotypeApplication(element, Dimension.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForinstanceSpecification.add(createBase_InstanceSpecificationPropertyDescriptorForInstanceSpecification(steApplication));
@@ -192,7 +191,8 @@ public class DimensionItemProvider extends SysMLItemProviderAdapter implements I Dimension dimension_ = null;
if(object instanceof org.eclipse.uml2.uml.InstanceSpecification) {
- Stereotype ste = ((org.eclipse.uml2.uml.InstanceSpecification)object).getAppliedStereotype(SysmlResource.DIMENSION_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.InstanceSpecification)object, Dimension.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INSTANCE_SPECIFICATION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java index 881bd26ff71..018f57e47ca 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/DistributedPropertyItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.DistributedProperty; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.DistributedProperty} object.
@@ -112,9 +112,8 @@ public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter im final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.DISTRIBUTED_PROPERTY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ DistributedProperty steApplication = UMLUtil.getStereotypeApplication(element, DistributedProperty.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForproperty.add(createBase_PropertyPropertyDescriptorForProperty(steApplication));
@@ -192,7 +191,8 @@ public class DistributedPropertyItemProvider extends SysMLItemProviderAdapter im DistributedProperty distributedProperty_ = null;
if(object instanceof org.eclipse.uml2.uml.Property) {
- Stereotype ste = ((org.eclipse.uml2.uml.Property)object).getAppliedStereotype(SysmlResource.DISTRIBUTED_PROPERTY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Property)object, DistributedProperty.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java index 7748d795a98..91426238027 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/NestedConnectorEndItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.NestedConnectorEnd} object.
@@ -113,9 +113,8 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForconnectorEnd.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.NESTED_CONNECTOR_END_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ NestedConnectorEnd steApplication = UMLUtil.getStereotypeApplication(element, NestedConnectorEnd.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForconnectorEnd.add(createPropertyPathPropertyDescriptorForConnectorEnd(steApplication));
@@ -229,7 +228,8 @@ public class NestedConnectorEndItemProvider extends SysMLItemProviderAdapter imp NestedConnectorEnd nestedConnectorEnd_ = null;
if(object instanceof org.eclipse.uml2.uml.ConnectorEnd) {
- Stereotype ste = ((org.eclipse.uml2.uml.ConnectorEnd)object).getAppliedStereotype(SysmlResource.NESTED_CONNECTOR_END_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.ConnectorEnd)object, NestedConnectorEnd.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CONNECTOR_END);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java index 1a91b86b818..92ba7198ef1 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ParticipantPropertyItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.ParticipantProperty; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ParticipantProperty} object.
@@ -113,9 +113,8 @@ public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter im final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.PARTICIPANT_PROPERTY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ParticipantProperty steApplication = UMLUtil.getStereotypeApplication(element, ParticipantProperty.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForproperty.add(createBase_PropertyPropertyDescriptorForProperty(steApplication));
@@ -229,7 +228,8 @@ public class ParticipantPropertyItemProvider extends SysMLItemProviderAdapter im ParticipantProperty participantProperty_ = null;
if(object instanceof org.eclipse.uml2.uml.Property) {
- Stereotype ste = ((org.eclipse.uml2.uml.Property)object).getAppliedStereotype(SysmlResource.PARTICIPANT_PROPERTY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Property)object, ParticipantProperty.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java index 31c4a5ad063..b81ea82fda4 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/PropertySpecificTypeItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.PropertySpecificType; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.PropertySpecificType} object.
@@ -112,9 +112,8 @@ public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter i final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclassifier.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROPERTY_SPECIFIC_TYPE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ PropertySpecificType steApplication = UMLUtil.getStereotypeApplication(element, PropertySpecificType.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForclassifier.add(createBase_ClassifierPropertyDescriptorForClassifier(steApplication));
@@ -192,7 +191,8 @@ public class PropertySpecificTypeItemProvider extends SysMLItemProviderAdapter i PropertySpecificType propertySpecificType_ = null;
if(object instanceof org.eclipse.uml2.uml.Classifier) {
- Stereotype ste = ((org.eclipse.uml2.uml.Classifier)object).getAppliedStereotype(SysmlResource.PROPERTY_SPECIFIC_TYPE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Classifier)object, PropertySpecificType.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASSIFIER);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java index 4dccdca3159..eecad0e1047 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/UnitItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.Unit; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.Unit} object.
@@ -113,9 +113,8 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinstanceSpecification.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.UNIT_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Unit steApplication = UMLUtil.getStereotypeApplication(element, Unit.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForinstanceSpecification.add(createBase_InstanceSpecificationPropertyDescriptorForInstanceSpecification(steApplication));
@@ -229,7 +228,8 @@ public class UnitItemProvider extends SysMLItemProviderAdapter implements IEditi Unit unit_ = null;
if(object instanceof org.eclipse.uml2.uml.InstanceSpecification) {
- Stereotype ste = ((org.eclipse.uml2.uml.InstanceSpecification)object).getAppliedStereotype(SysmlResource.UNIT_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.InstanceSpecification)object, Unit.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INSTANCE_SPECIFICATION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java index b513728ea2a..e56ae7c4ceb 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/blocks/provider/ValueTypeItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.blocks.ValueType; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.blocks.ValueType} object.
@@ -114,9 +114,8 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFordataType.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.VALUE_TYPE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ValueType steApplication = UMLUtil.getStereotypeApplication(element, ValueType.class);
+ if(steApplication != null) {
itemPropertyDescriptorsFordataType.add(createBase_DataTypePropertyDescriptorForDataType(steApplication));
@@ -266,7 +265,8 @@ public class ValueTypeItemProvider extends SysMLItemProviderAdapter implements I ValueType valueType_ = null;
if(object instanceof org.eclipse.uml2.uml.DataType) {
- Stereotype ste = ((org.eclipse.uml2.uml.DataType)object).getAppliedStereotype(SysmlResource.VALUE_TYPE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.DataType)object, ValueType.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.DATA_TYPE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java index 6b696bd0df9..3bbe43db02b 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintBlockItemProvider.java @@ -36,11 +36,11 @@ import org.eclipse.papyrus.sysml.constraints.ConstraintBlock; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintBlock} object.
@@ -110,9 +110,8 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONSTRAINT_BLOCK_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ConstraintBlock steApplication = UMLUtil.getStereotypeApplication(element, ConstraintBlock.class);
+ if(steApplication != null) {
}
return itemPropertyDescriptorsForclass;
@@ -154,7 +153,8 @@ public class ConstraintBlockItemProvider extends BlockItemProvider implements IE ConstraintBlock constraintBlock_ = null;
if(object instanceof org.eclipse.uml2.uml.Class) {
- Stereotype ste = ((org.eclipse.uml2.uml.Class)object).getAppliedStereotype(SysmlResource.CONSTRAINT_BLOCK_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Class)object, ConstraintBlock.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java index d3a4aa25b6b..cb51584ab0d 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/constraints/provider/ConstraintPropertyItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.constraints.ConstraintsPackage; import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.constraints.ConstraintProperty} object.
@@ -112,9 +112,8 @@ public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter imp final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONSTRAINT_PROPERTY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ConstraintProperty steApplication = UMLUtil.getStereotypeApplication(element, ConstraintProperty.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForproperty.add(createBase_PropertyPropertyDescriptorForProperty(steApplication));
@@ -192,7 +191,8 @@ public class ConstraintPropertyItemProvider extends SysMLItemProviderAdapter imp ConstraintProperty constraintProperty_ = null;
if(object instanceof org.eclipse.uml2.uml.Property) {
- Stereotype ste = ((org.eclipse.uml2.uml.Property)object).getAppliedStereotype(SysmlResource.CONSTRAINT_PROPERTY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Property)object, ConstraintProperty.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java index d13be493a6f..96c67107a5c 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ConformItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.modelelements.Conform;
import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Conform} object.
@@ -112,9 +112,8 @@ public class ConformItemProvider extends SysMLItemProviderAdapter implements IEd final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFordependency.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.CONFORM_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Conform steApplication = UMLUtil.getStereotypeApplication(element, Conform.class);
+ if(steApplication != null) {
itemPropertyDescriptorsFordependency.add(createBase_DependencyPropertyDescriptorForDependency(steApplication));
@@ -192,7 +191,8 @@ public class ConformItemProvider extends SysMLItemProviderAdapter implements IEd Conform conform_ = null;
if(object instanceof org.eclipse.uml2.uml.Dependency) {
- Stereotype ste = ((org.eclipse.uml2.uml.Dependency)object).getAppliedStereotype(SysmlResource.CONFORM_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Dependency)object, Conform.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.DEPENDENCY);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java index 906a2acf0ef..44166841e8a 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ProblemItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
import org.eclipse.papyrus.sysml.modelelements.Problem;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Problem} object.
@@ -112,9 +112,8 @@ public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEd final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForcomment.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.PROBLEM_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Problem steApplication = UMLUtil.getStereotypeApplication(element, Problem.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForcomment.add(createBase_CommentPropertyDescriptorForComment(steApplication));
@@ -192,7 +191,8 @@ public class ProblemItemProvider extends SysMLItemProviderAdapter implements IEd Problem problem_ = null;
if(object instanceof org.eclipse.uml2.uml.Comment) {
- Stereotype ste = ((org.eclipse.uml2.uml.Comment)object).getAppliedStereotype(SysmlResource.PROBLEM_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Comment)object, Problem.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.COMMENT);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java index 7fa9451fdb2..dcb824f05d2 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/RationaleItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
import org.eclipse.papyrus.sysml.modelelements.Rationale;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.Rationale} object.
@@ -112,9 +112,8 @@ public class RationaleItemProvider extends SysMLItemProviderAdapter implements I final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForcomment.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.RATIONALE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Rationale steApplication = UMLUtil.getStereotypeApplication(element, Rationale.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForcomment.add(createBase_CommentPropertyDescriptorForComment(steApplication));
@@ -192,7 +191,8 @@ public class RationaleItemProvider extends SysMLItemProviderAdapter implements I Rationale rationale_ = null;
if(object instanceof org.eclipse.uml2.uml.Comment) {
- Stereotype ste = ((org.eclipse.uml2.uml.Comment)object).getAppliedStereotype(SysmlResource.RATIONALE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Comment)object, Rationale.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.COMMENT);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java index baf1c88825c..dfb5917551f 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
import org.eclipse.papyrus.sysml.modelelements.View;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.View} object.
@@ -113,9 +113,8 @@ public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditi final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForpackage.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.VIEW_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ View steApplication = UMLUtil.getStereotypeApplication(element, View.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForpackage.add(createViewPointPropertyDescriptorForPackage(steApplication));
@@ -229,7 +228,8 @@ public class ViewItemProvider extends SysMLItemProviderAdapter implements IEditi View view_ = null;
if(object instanceof org.eclipse.uml2.uml.Package) {
- Stereotype ste = ((org.eclipse.uml2.uml.Package)object).getAppliedStereotype(SysmlResource.VIEW_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Package)object, View.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PACKAGE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java index 57d442a7cbc..28275ddccb2 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/modelelements/provider/ViewPointItemProvider.java @@ -40,10 +40,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.modelelements.ModelelementsPackage;
import org.eclipse.papyrus.sysml.modelelements.ViewPoint;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.modelelements.ViewPoint} object.
@@ -119,9 +119,8 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.VIEW_POINT_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ViewPoint steApplication = UMLUtil.getStereotypeApplication(element, ViewPoint.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForclass.add(createBase_ClassPropertyDescriptorForClass(steApplication));
@@ -379,7 +378,8 @@ public class ViewPointItemProvider extends SysMLItemProviderAdapter implements I ViewPoint viewPoint_ = null;
if(object instanceof org.eclipse.uml2.uml.Class) {
- Stereotype ste = ((org.eclipse.uml2.uml.Class)object).getAppliedStereotype(SysmlResource.VIEW_POINT_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Class)object, ViewPoint.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java index e12ab4818fd..011fa211e5a 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPortItemProvider.java @@ -40,10 +40,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.portandflows.FlowPort;
import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowPort} object.
@@ -117,9 +117,8 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForport.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.FLOW_PORT_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ FlowPort steApplication = UMLUtil.getStereotypeApplication(element, FlowPort.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForport.add(createBase_PortPropertyDescriptorForPort(steApplication));
@@ -305,7 +304,8 @@ public class FlowPortItemProvider extends SysMLItemProviderAdapter implements IE FlowPort flowPort_ = null;
if(object instanceof org.eclipse.uml2.uml.Port) {
- Stereotype ste = ((org.eclipse.uml2.uml.Port)object).getAppliedStereotype(SysmlResource.FLOW_PORT_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Port)object, FlowPort.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PORT);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java index 15d5202d9e9..06e912042d4 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowPropertyItemProvider.java @@ -41,10 +41,10 @@ import org.eclipse.papyrus.sysml.portandflows.FlowDirection; import org.eclipse.papyrus.sysml.portandflows.FlowProperty;
import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowProperty} object.
@@ -116,9 +116,8 @@ public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implement final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForproperty.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.FLOW_PROPERTY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ FlowProperty steApplication = UMLUtil.getStereotypeApplication(element, FlowProperty.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForproperty.add(createBase_PropertyPropertyDescriptorForProperty(steApplication));
@@ -232,7 +231,8 @@ public class FlowPropertyItemProvider extends SysMLItemProviderAdapter implement FlowProperty flowProperty_ = null;
if(object instanceof org.eclipse.uml2.uml.Property) {
- Stereotype ste = ((org.eclipse.uml2.uml.Property)object).getAppliedStereotype(SysmlResource.FLOW_PROPERTY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Property)object, FlowProperty.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.PROPERTY);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java index b11fd9cc261..b85898ec80e 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/FlowSpecificationItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.portandflows.FlowSpecification;
import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.FlowSpecification} object.
@@ -112,9 +112,8 @@ public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter impl final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinterface.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.FLOW_SPECIFICATION_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ FlowSpecification steApplication = UMLUtil.getStereotypeApplication(element, FlowSpecification.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForinterface.add(createBase_InterfacePropertyDescriptorForInterface(steApplication));
@@ -192,7 +191,8 @@ public class FlowSpecificationItemProvider extends SysMLItemProviderAdapter impl FlowSpecification flowSpecification_ = null;
if(object instanceof org.eclipse.uml2.uml.Interface) {
- Stereotype ste = ((org.eclipse.uml2.uml.Interface)object).getAppliedStereotype(SysmlResource.FLOW_SPECIFICATION_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Interface)object, FlowSpecification.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INTERFACE);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java index 9b447356b75..c6b3f1be6c5 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/portandflows/provider/ItemFlowItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.portandflows.ItemFlow;
import org.eclipse.papyrus.sysml.portandflows.PortandflowsPackage;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.portandflows.ItemFlow} object.
@@ -113,9 +113,8 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForinformationFlow.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.ITEM_FLOW_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ ItemFlow steApplication = UMLUtil.getStereotypeApplication(element, ItemFlow.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForinformationFlow.add(createBase_InformationFlowPropertyDescriptorForInformationFlow(steApplication));
@@ -229,7 +228,8 @@ public class ItemFlowItemProvider extends SysMLItemProviderAdapter implements IE ItemFlow itemFlow_ = null;
if(object instanceof org.eclipse.uml2.uml.InformationFlow) {
- Stereotype ste = ((org.eclipse.uml2.uml.InformationFlow)object).getAppliedStereotype(SysmlResource.ITEM_FLOW_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.InformationFlow)object, ItemFlow.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.INFORMATION_FLOW);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java index 3f1e46d0f22..4d38d92746b 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/provider/SysmlEditPlugin.java @@ -50,7 +50,7 @@ public final class SysmlEditPlugin extends EMFPlugin { * @generated
*/
public SysmlEditPlugin() {
- super(new ResourceLocator[]{ EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });
+ super(new ResourceLocator[]{ UMLEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, });
}
/**
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java index 6e2c1bd53cd..63235bc0077 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/CopyItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,17 +31,18 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
-import org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
import org.eclipse.papyrus.sysml.requirements.Copy;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+import org.eclipse.uml2.uml.profile.l2.L2Package;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Copy} object.
@@ -49,7 +51,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin; *
* @generated
*/
-public class CopyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+public class CopyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
@@ -92,6 +94,7 @@ public class CopyItemProvider extends SysMLItemProviderAdapter implements IEditi if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addBase_AbstractionPropertyDescriptor(object);
}
}
@@ -110,9 +113,10 @@ public class CopyItemProvider extends SysMLItemProviderAdapter implements IEditi final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.COPY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Copy steApplication = UMLUtil.getStereotypeApplication(element, Copy.class);
+ if(steApplication != null) {
+
+ itemPropertyDescriptorsForabstraction.add(createBase_AbstractionPropertyDescriptorForAbstraction(steApplication));
}
return itemPropertyDescriptorsForabstraction;
@@ -123,6 +127,40 @@ public class CopyItemProvider extends SysMLItemProviderAdapter implements IEditi }
/**
+ * This adds a property descriptor for the Base Abstraction feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_AbstractionPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));
+ }
+
+ /**
+ * This adds a property descriptor for the Base Abstraction feature for the UML element Abstraction.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected ItemPropertyDescriptorDecorator createBase_AbstractionPropertyDescriptorForAbstraction(Object object) {
+
+ return new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"),
+
+ L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true,
+
+ null,
+
+ null,
+
+ null));
+
+ }
+
+ /**
* This returns Copy.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -154,7 +192,8 @@ public class CopyItemProvider extends SysMLItemProviderAdapter implements IEditi Copy copy_ = null;
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
- Stereotype ste = ((org.eclipse.uml2.uml.Abstraction)object).getAppliedStereotype(SysmlResource.COPY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Abstraction)object, Copy.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java index c59a55e6618..38c0b4424b6 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/DeriveReqtItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,17 +31,18 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
-import org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
import org.eclipse.papyrus.sysml.requirements.DeriveReqt;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+import org.eclipse.uml2.uml.profile.l2.L2Package;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.DeriveReqt} object.
@@ -49,7 +51,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin; *
* @generated
*/
-public class DeriveReqtItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+public class DeriveReqtItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
@@ -92,6 +94,7 @@ public class DeriveReqtItemProvider extends SysMLItemProviderAdapter implements if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addBase_AbstractionPropertyDescriptor(object);
}
}
@@ -110,9 +113,10 @@ public class DeriveReqtItemProvider extends SysMLItemProviderAdapter implements final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.DERIVE_REQT_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ DeriveReqt steApplication = UMLUtil.getStereotypeApplication(element, DeriveReqt.class);
+ if(steApplication != null) {
+
+ itemPropertyDescriptorsForabstraction.add(createBase_AbstractionPropertyDescriptorForAbstraction(steApplication));
}
return itemPropertyDescriptorsForabstraction;
@@ -123,6 +127,40 @@ public class DeriveReqtItemProvider extends SysMLItemProviderAdapter implements }
/**
+ * This adds a property descriptor for the Base Abstraction feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_AbstractionPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));
+ }
+
+ /**
+ * This adds a property descriptor for the Base Abstraction feature for the UML element Abstraction.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected ItemPropertyDescriptorDecorator createBase_AbstractionPropertyDescriptorForAbstraction(Object object) {
+
+ return new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"),
+
+ L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true,
+
+ null,
+
+ null,
+
+ null));
+
+ }
+
+ /**
* This returns DeriveReqt.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -154,7 +192,8 @@ public class DeriveReqtItemProvider extends SysMLItemProviderAdapter implements DeriveReqt deriveReqt_ = null;
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
- Stereotype ste = ((org.eclipse.uml2.uml.Abstraction)object).getAppliedStereotype(SysmlResource.DERIVE_REQT_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Abstraction)object, DeriveReqt.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java index 619b40809c1..f47789fd928 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementItemProvider.java @@ -40,10 +40,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
import org.eclipse.papyrus.sysml.requirements.Requirement;
import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Requirement} object.
@@ -123,9 +123,8 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForclass.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.REQUIREMENT_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Requirement steApplication = UMLUtil.getStereotypeApplication(element, Requirement.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForclass.add(createTextPropertyDescriptorForClass(steApplication));
@@ -527,7 +526,8 @@ public class RequirementItemProvider extends SysMLItemProviderAdapter implements Requirement requirement_ = null;
if(object instanceof org.eclipse.uml2.uml.Class) {
- Stereotype ste = ((org.eclipse.uml2.uml.Class)object).getAppliedStereotype(SysmlResource.REQUIREMENT_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Class)object, Requirement.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.CLASS);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java index 77cbe8807b2..9593b1510b9 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/RequirementRelatedItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
import org.eclipse.papyrus.sysml.requirements.RequirementRelated;
import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.RequirementRelated} object.
@@ -116,9 +116,8 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsFornamedElement.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.REQUIREMENT_RELATED_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ RequirementRelated steApplication = UMLUtil.getStereotypeApplication(element, RequirementRelated.class);
+ if(steApplication != null) {
itemPropertyDescriptorsFornamedElement.add(createBase_NamedElementPropertyDescriptorForNamedElement(steApplication));
@@ -340,7 +339,8 @@ public class RequirementRelatedItemProvider extends SysMLItemProviderAdapter imp RequirementRelated requirementRelated_ = null;
if(object instanceof org.eclipse.uml2.uml.NamedElement) {
- Stereotype ste = ((org.eclipse.uml2.uml.NamedElement)object).getAppliedStereotype(SysmlResource.REQUIREMENT_RELATED_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.NamedElement)object, RequirementRelated.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.NAMED_ELEMENT);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java index 6d038f5cd12..088b96d5d5b 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/SatisfyItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,17 +31,18 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
-import org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
import org.eclipse.papyrus.sysml.requirements.Satisfy;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+import org.eclipse.uml2.uml.profile.l2.L2Package;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Satisfy} object.
@@ -49,7 +51,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin; *
* @generated
*/
-public class SatisfyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+public class SatisfyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
@@ -92,6 +94,7 @@ public class SatisfyItemProvider extends SysMLItemProviderAdapter implements IEd if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addBase_AbstractionPropertyDescriptor(object);
}
}
@@ -110,9 +113,10 @@ public class SatisfyItemProvider extends SysMLItemProviderAdapter implements IEd final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.SATISFY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Satisfy steApplication = UMLUtil.getStereotypeApplication(element, Satisfy.class);
+ if(steApplication != null) {
+
+ itemPropertyDescriptorsForabstraction.add(createBase_AbstractionPropertyDescriptorForAbstraction(steApplication));
}
return itemPropertyDescriptorsForabstraction;
@@ -123,6 +127,40 @@ public class SatisfyItemProvider extends SysMLItemProviderAdapter implements IEd }
/**
+ * This adds a property descriptor for the Base Abstraction feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_AbstractionPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));
+ }
+
+ /**
+ * This adds a property descriptor for the Base Abstraction feature for the UML element Abstraction.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected ItemPropertyDescriptorDecorator createBase_AbstractionPropertyDescriptorForAbstraction(Object object) {
+
+ return new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"),
+
+ L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true,
+
+ null,
+
+ null,
+
+ null));
+
+ }
+
+ /**
* This returns Satisfy.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -154,7 +192,8 @@ public class SatisfyItemProvider extends SysMLItemProviderAdapter implements IEd Satisfy satisfy_ = null;
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
- Stereotype ste = ((org.eclipse.uml2.uml.Abstraction)object).getAppliedStereotype(SysmlResource.SATISFY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Abstraction)object, Satisfy.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java index 306579b390d..5ce6f69a7cd 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/TestCaseItemProvider.java @@ -38,10 +38,10 @@ import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter; import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
import org.eclipse.papyrus.sysml.requirements.RequirementsPackage;
import org.eclipse.papyrus.sysml.requirements.TestCase;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.TestCase} object.
@@ -122,9 +122,8 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForbehavior.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.TEST_CASE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ TestCase steApplication = UMLUtil.getStereotypeApplication(element, TestCase.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForbehavior.add(createBase_BehaviorPropertyDescriptorForBehavior(steApplication));
@@ -158,9 +157,8 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForoperation.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.TEST_CASE_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ TestCase steApplication = UMLUtil.getStereotypeApplication(element, TestCase.class);
+ if(steApplication != null) {
itemPropertyDescriptorsForoperation.add(createBase_BehaviorPropertyDescriptorForBehavior(steApplication));
@@ -385,7 +383,8 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE TestCase testCase_ = null;
if(object instanceof org.eclipse.uml2.uml.Behavior) {
- Stereotype ste = ((org.eclipse.uml2.uml.Behavior)object).getAppliedStereotype(SysmlResource.TEST_CASE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Behavior)object, TestCase.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.BEHAVIOR);
String result = ite.getText(object);
@@ -396,7 +395,8 @@ public class TestCaseItemProvider extends SysMLItemProviderAdapter implements IE }
if(object instanceof org.eclipse.uml2.uml.Operation) {
- Stereotype ste = ((org.eclipse.uml2.uml.Operation)object).getAppliedStereotype(SysmlResource.TEST_CASE_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Operation)object, TestCase.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.OPERATION);
String result = ite.getText(object);
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java index e4eeb2f4581..90589d495cf 100644 --- a/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java +++ b/plugins/sysml/org.eclipse.papyrus.sysml.edit/src/org/eclipse/papyrus/sysml/requirements/provider/VerifyItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.ComposedImage;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -30,17 +31,18 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.IItemPropertySource;
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptorDecorator;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.papyrus.sysml.edit.provider.IComposableAdapterFactory;
-import org.eclipse.papyrus.sysml.edit.provider.IVisibilityOverlayImage;
import org.eclipse.papyrus.sysml.edit.provider.SysMLItemProviderAdapter;
import org.eclipse.papyrus.sysml.provider.SysmlEditPlugin;
import org.eclipse.papyrus.sysml.requirements.Verify;
-import org.eclipse.papyrus.sysml.util.SysmlResource;
import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Stereotype;
import org.eclipse.uml2.uml.UMLPackage;
import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+import org.eclipse.uml2.uml.profile.l2.L2Package;
+import org.eclipse.uml2.uml.util.UMLUtil;
/**
* This is the item provider adapter for a {@link org.eclipse.papyrus.sysml.requirements.Verify} object.
@@ -49,7 +51,7 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin; *
* @generated
*/
-public class VerifyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IVisibilityOverlayImage
+public class VerifyItemProvider extends SysMLItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource
{
@@ -92,6 +94,7 @@ public class VerifyItemProvider extends SysMLItemProviderAdapter implements IEdi if(itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
+ addBase_AbstractionPropertyDescriptor(object);
}
}
@@ -110,9 +113,10 @@ public class VerifyItemProvider extends SysMLItemProviderAdapter implements IEdi final List<IItemPropertyDescriptor> propertyDescriptors = ite.getPropertyDescriptors(this);
itemPropertyDescriptorsForabstraction.addAll(propertyDescriptors);
- Stereotype ste = (element).getAppliedStereotype(SysmlResource.VERIFY_ID);
- if(ste != null) {
- EObject steApplication = (element).getStereotypeApplication(ste);
+ Verify steApplication = UMLUtil.getStereotypeApplication(element, Verify.class);
+ if(steApplication != null) {
+
+ itemPropertyDescriptorsForabstraction.add(createBase_AbstractionPropertyDescriptorForAbstraction(steApplication));
}
return itemPropertyDescriptorsForabstraction;
@@ -123,6 +127,40 @@ public class VerifyItemProvider extends SysMLItemProviderAdapter implements IEdi }
/**
+ * This adds a property descriptor for the Base Abstraction feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void addBase_AbstractionPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"), L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true, null, null, null));
+ }
+
+ /**
+ * This adds a property descriptor for the Base Abstraction feature for the UML element Abstraction.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected ItemPropertyDescriptorDecorator createBase_AbstractionPropertyDescriptorForAbstraction(Object object) {
+
+ return new ItemPropertyDescriptorDecorator(object, createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Trace_base_Abstraction_feature"),
+
+ getString("_UI_PropertyDescriptor_description", "_UI_Trace_base_Abstraction_feature", "_UI_Trace_type"),
+
+ L2Package.Literals.TRACE__BASE_ABSTRACTION, true, false, true,
+
+ null,
+
+ null,
+
+ null));
+
+ }
+
+ /**
* This returns Verify.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -154,7 +192,8 @@ public class VerifyItemProvider extends SysMLItemProviderAdapter implements IEdi Verify verify_ = null;
if(object instanceof org.eclipse.uml2.uml.Abstraction) {
- Stereotype ste = ((org.eclipse.uml2.uml.Abstraction)object).getAppliedStereotype(SysmlResource.VERIFY_ID);
+ EObject steApplication = UMLUtil.getStereotypeApplication((org.eclipse.uml2.uml.Abstraction)object, Verify.class);
+ Stereotype ste = UMLUtil.getStereotype(steApplication);
if(ste != null) {
IItemLabelProvider ite = (IItemLabelProvider)((IComposableAdapterFactory)adapterFactory).getIRootAdapterFactory().getItemProvider(UMLPackage.Literals.ABSTRACTION);
String result = ite.getText(object);
|